byteio/nixos-config
1
0
Fork 0
mirror of https://github.com/librephoenix/nixos-config synced 2025-01-18 22:55:52 +05:30
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: byteio:95e3002ce7e5519f8692d1903b7cff7110d99c00
Branches Tags
byteio:main
...
compare: byteio:3d3bea67cd5bd19fd8919525c4195655363af190
Branches Tags
byteio:main

2 commits
95e3002ce7 ... 3d3bea67cd

Author SHA1 Message Date
Emmet 3d3bea67cd Updated system, rm flatpak, pinned kdenlive 2024-03-16 14:15:10 -05:00
Emmet b999972b3c kdenlive broke again.. 2024-03-16 10:56:48 -05:00
4 changed files with 52 additions and 31 deletions
Show stats Expand all files Collapse all files

64
flake.lock
View file

@ -150,11 +150,11 @@
"blocklist-hosts": { "blocklist-hosts": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1709598696, "lastModified": 1710515083,
"narHash": "sha256-jVrCuInshwebh+cAf1CV5zB8s/uW3oevrxLvhJ0X5vg=", "narHash": "sha256-3ve+IZzSpMigIIIW7x/WVSkm/5IyKb0ggFLcanbzskU=",
"owner": "StevenBlack", "owner": "StevenBlack",
"repo": "hosts", "repo": "hosts",
"rev": "7e350cd634572851d9abe36783fa78f132221851", "rev": "7c0ba20a0a205e3bf89a34d6fa5776980b3bec27",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -199,11 +199,11 @@
"eaf": { "eaf": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1708834876, "lastModified": 1710401124,
"narHash": "sha256-12gVfkWhoc9y4UKfhp2n+iM8nyCetVgviyShm4mhmDA=", "narHash": "sha256-9aIf/OEryv1gJ8oC1jX5dbPy0ZPhDgSfaan3PEVwwQc=",
"owner": "emacs-eaf", "owner": "emacs-eaf",
"repo": "emacs-application-framework", "repo": "emacs-application-framework",
"rev": "ac135be35220786df1e0bcb4f1a1a95d7c0c7183", "rev": "c71bf1fe0206964153a0b2e49149244c6b96f875",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -466,11 +466,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709938482, "lastModified": 1710532761,
"narHash": "sha256-2Vw2WOFmEXWQH8ziFNOr0U48Guh5FacuD6BOEIcE99s=", "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "17431970b4ebc75a92657101ccffcfc9e1f9d8f0", "rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -504,11 +504,11 @@
"hyprland-plugins": { "hyprland-plugins": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1709512528, "lastModified": 1710512163,
"narHash": "sha256-4haLTurWZgPkzASTIWPqyb7zJhFprBjXPUkdqXAgg4s=", "narHash": "sha256-bj3waHL6vTBWPw4f+vUdJ1MC5I8UWv2mNX3v/FPHBKQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-plugins", "repo": "hyprland-plugins",
"rev": "8d3a0701a26d51c9931b3583f93e7fb3fbcd5110", "rev": "50758aa0244372af3d6f058dce39970a8d96ce2d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -517,6 +517,21 @@
"type": "github" "type": "github"
} }
}, },
"kdenlive-pin-nixpkgs": {
"locked": {
"lastModified": 1709012981,
"narHash": "sha256-/D10ohogluwFIl5NXQxJx6ag6fuwA1KEAO8Ia5GDhhM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cfec6d9203a461d9d698d8a60ef003cac6d0da94",
"type": "github"
},
"original": {
"id": "nixpkgs",
"rev": "cfec6d9203a461d9d698d8a60ef003cac6d0da94",
"type": "indirect"
}
},
"nix-doom-emacs": { "nix-doom-emacs": {
"inputs": { "inputs": {
"doom-emacs": "doom-emacs", "doom-emacs": "doom-emacs",
@ -582,11 +597,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1709703039, "lastModified": 1710451336,
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "rev": "d691274a972b3165335d261cc4671335f5c67de9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -597,11 +612,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1709677081, "lastModified": 1710420202,
"narHash": "sha256-tix36Y7u0rkn6mTm0lA45b45oab2cFLqAzDbJxeXS+c=", "narHash": "sha256-MvFKESbq4rUWuaf2RKPNYENaSZEw/jaCLo2gU6oREcM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "880992dcc006a5e00dd0591446fdf723e6a51a64", "rev": "878ef7d9721bee9f81f8a80819f9211ad1f993da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -841,6 +856,7 @@
"eaf-browser": "eaf-browser", "eaf-browser": "eaf-browser",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland-plugins": "hyprland-plugins", "hyprland-plugins": "hyprland-plugins",
"kdenlive-pin-nixpkgs": "kdenlive-pin-nixpkgs",
"nix-doom-emacs": "nix-doom-emacs", "nix-doom-emacs": "nix-doom-emacs",
"nix-straight": "nix-straight", "nix-straight": "nix-straight",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
@ -876,11 +892,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1709950089, "lastModified": 1710555016,
"narHash": "sha256-JjZINymxtnDY9EDdxnVPideZvHPR2Cm/GdKAptCWLI4=", "narHash": "sha256-Lbdq3/TH4VrrR7A6FxIYwu5tFOcprYh8Q49Nc9s/i6c=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "d3a05d053b145349b8ad395741c5951f332280ef", "rev": "42baa9e2e4713572d7481f917243b07dffdf54b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -922,11 +938,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1708896938, "lastModified": 1710420453,
"narHash": "sha256-oMjkMjeNhDUEpKIofo9+9RdUnmmZ4h0sm+kf6XKdy6k=", "narHash": "sha256-F/JfpPRpIkFqvYEtt55lZyaFd+/vhn9SrcQrXIZCkOU=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "fcff15ac5ffbe81f1c66e352f3167c270d79cdab", "rev": "eb64377e66122de7a36ca7a611aa97ddf4c8e5e8",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View file

@ -1,7 +1,7 @@
{ {
description = "Flake of LibrePhoenix"; description = "Flake of LibrePhoenix";
outputs = inputs@{ self, nixpkgs, nixpkgs-stable, home-manager, nix-doom-emacs, outputs = inputs@{ self, nixpkgs, nixpkgs-stable, kdenlive-pin-nixpkgs, home-manager, nix-doom-emacs,
nix-straight, stylix, blocklist-hosts, hyprland-plugins, rust-overlay, nix-straight, stylix, blocklist-hosts, hyprland-plugins, rust-overlay,
org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, ... }: org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, ... }:
let let
@ -74,6 +74,10 @@
}; };
}; };
pkgs-kdenlive = import kdenlive-pin-nixpkgs {
system = systemSettings.system;
};
# configure lib # configure lib
lib = nixpkgs.lib; lib = nixpkgs.lib;
@ -99,6 +103,7 @@
extraSpecialArgs = { extraSpecialArgs = {
# pass config variables from above # pass config variables from above
inherit pkgs-stable; inherit pkgs-stable;
inherit pkgs-kdenlive;
inherit systemSettings; inherit systemSettings;
inherit userSettings; inherit userSettings;
inherit (inputs) nix-doom-emacs; inherit (inputs) nix-doom-emacs;
@ -156,6 +161,7 @@
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
nixpkgs-stable.url = "nixpkgs/nixos-23.11"; nixpkgs-stable.url = "nixpkgs/nixos-23.11";
kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94";
home-manager.url = "github:nix-community/home-manager/master"; home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";

9
profiles/work/home.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, nix-doom-emacs, stylix, userSettings, ... }: { config, pkgs, pkgs-kdenlive, nix-doom-emacs, stylix, userSettings, ... }:
{ {
# Home Manager needs a bit of information about you and the paths it should # Home Manager needs a bit of information about you and the paths it should
@ -31,7 +31,7 @@
home.stateVersion = "22.11"; # Please read the comment before changing. home.stateVersion = "22.11"; # Please read the comment before changing.
home.packages = with pkgs; [ home.packages = (with pkgs; [
# Core # Core
zsh zsh
alacritty alacritty
@ -84,7 +84,7 @@
}) })
# Media # Media
gimp-with-plugins gimp
pinta pinta
krita krita
inkscape inkscape
@ -118,7 +118,6 @@
]; ];
}) })
obs-studio obs-studio
kdenlive
ffmpeg ffmpeg
(pkgs.writeScriptBin "kdenlive-accel" '' (pkgs.writeScriptBin "kdenlive-accel" ''
#!/bin/sh #!/bin/sh
@ -134,7 +133,7 @@
texinfo texinfo
libffi zlib libffi zlib
nodePackages.ungit nodePackages.ungit
]; ]) ++ ([ pkgs-kdenlive.kdenlive ]);
services.syncthing.enable = true; services.syncthing.enable = true;

2
user/wm/hyprland/hyprland.nix
View file

@ -283,7 +283,7 @@
fnott fnott
fuzzel fuzzel
keepmenu keepmenu
pinentry-gnome pinentry-gnome3
wev wev
grim grim
slurp slurp