diff --git a/flake.lock b/flake.lock index e353458..1feb971 100644 --- a/flake.lock +++ b/flake.lock @@ -1,48 +1,5 @@ { "nodes": { - "agenix": { - "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "systems": "systems" - }, - "locked": { - "lastModified": 1762618334, - "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", - "owner": "ryantm", - "repo": "agenix", - "rev": "fcdea223397448d35d9b31f798479227e80183f6", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, - "darwin": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744478979, - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -67,16 +24,15 @@ "home-manager": { "inputs": { "nixpkgs": [ - "agenix", - "nixpkgs" + "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1745494811, - "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "owner": "nix-community", "repo": "home-manager", - "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "type": "github" }, "original": { @@ -92,11 +48,11 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1763992789, + "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", "type": "github" }, "original": { @@ -106,49 +62,29 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1763963090, - "narHash": "sha256-zR7uDZdQUUC+gBOi4byefMvIZuSBeMC6GswGNsTgQlM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "7702d14879e8f0148fa168e38f3eaa2650fa0d85", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1754028485, - "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", - "owner": "NixOS", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "59e69648d345d6e8fef86158c555730fa12af9de", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-25.05", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1764836381, + "narHash": "sha256-8jemYbbW9EBttQKHep7Rj8kzXaxsrk/lACdXA2DN5Xk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "ff06bd3398fb1bea6c937039ece7e7c8aa396ebf", "type": "github" }, "original": { @@ -160,11 +96,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -176,27 +112,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1763806073, - "narHash": "sha256-FHsEKDvfWpzdADWj99z7vBk4D716Ujdyveo5+A048aI=", + "lastModified": 1764947035, + "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "878e468e02bfabeda08c79250f7ad583037f2227", + "rev": "a672be65651c80d3f592a89b3945466584a22069", "type": "github" }, "original": { @@ -207,14 +127,14 @@ "nur": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1763983952, - "narHash": "sha256-nSWNqQezb6bhu5eYxF+lqzXj8h/sVD2C/CMV/JXK7Bw=", + "lastModified": 1765011107, + "narHash": "sha256-+rq5RAEM0PmsaISD5F5jCmq3y2lDJxB9932WvaPTe+8=", "owner": "nix-community", "repo": "NUR", - "rev": "3f55dad0778bfaa302e87d87326ec02e7100ff98", + "rev": "010c4c63702e16598d44b38a7e97ac336b1c20cd", "type": "github" }, "original": { @@ -225,7 +145,7 @@ }, "nvim-config": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1761113802, @@ -243,29 +163,13 @@ }, "root": { "inputs": { - "agenix": "agenix", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "home-manager-stable": "home-manager-stable", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "nvim-config": "nvim-config" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e81df2e..49172ca 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,6 @@ inputs.nixpkgs.follows = "nixpkgs-unstable"; }; nur.url = "github:nix-community/NUR"; - agenix.url = "github:ryantm/agenix"; nvim-config.url = "git+https://govel.porzh.me/DuN0z/neovim-config.git"; }; @@ -23,7 +22,6 @@ home-manager-stable, home-manager, nur, - agenix, nvim-config, ... }: let @@ -62,7 +60,7 @@ }; terre-neuvas = nixpkgs-stable.lib.nixosSystem { - specialArgs = { inherit agenix; inherit nvim-config; }; + specialArgs = { inherit nvim-config; }; system = "x86_64-linux"; modules = [ ./hosts/terre-neuvas/configuration.nix @@ -74,7 +72,6 @@ extraSpecialArgs = {inherit nvim-config; }; }; } - agenix.nixosModules.default ]; }; @@ -99,7 +96,6 @@ extraSpecialArgs = {inherit nvim-config; }; }; } - agenix.nixosModules.default ]; }; diff --git a/hm/desktop/bspwm.nix b/hm/desktop/bspwm.nix index a8d371c..87591ec 100644 --- a/hm/desktop/bspwm.nix +++ b/hm/desktop/bspwm.nix @@ -130,7 +130,7 @@ schedule = watch_directory,5,5,load.start=~/Téléchargements/*.torrent pieces.hash.on_completion.set = no network.max_open_files.set = 8192 - session = /home/lomig/.cache/rtorrent/session + session = /home/dunoz/.cache/rtorrent/session ''; }; }; diff --git a/hm/users/dunoz.nix b/hm/users/dunoz.nix index b32120c..d20bcfe 100644 --- a/hm/users/dunoz.nix +++ b/hm/users/dunoz.nix @@ -2,6 +2,7 @@ imports = [ ../../hm/common/git.nix ../../hm/common/zsh.nix + ../../hm/desktop/bspwm.nix ]; home = { username = "dunoz"; diff --git a/hosts/pennsardin/configuration.nix b/hosts/pennsardin/configuration.nix index dd1a899..cd0cab3 100644 --- a/hosts/pennsardin/configuration.nix +++ b/hosts/pennsardin/configuration.nix @@ -69,41 +69,53 @@ in { fileSystems = { "/" = { - device = "/dev/disk/by-uuid/b1a1ae71-4277-45d5-a3d2-f49354f263d4"; - fsType = "ext4"; + device = "/dev/disk/by-uuid/0a56ba55-15c5-4171-b253-52d4614799ae"; + fsType = "btrfs"; }; "/boot" = { - device = "/dev/disk/by-uuid/1DB2-7A0F"; + device = "/dev/disk/by-uuid/C3B4-DE51"; fsType = "vfat"; options = ["fmask=0077" "dmask=0077"]; }; + "/var" = { + device = "/dev/disk/by-uuid/59407d5c-04d6-46f1-b41c-f50642367711"; + fsType = "btrfs"; + }; + "/home" = { + device = "/dev/disk/by-uuid/faef7263-1d0b-4b96-be9d-33d5076b31aa"; + fsType = "btrfs"; + }; + "/nix" = { + device = "/dev/disk/by-uuid/5c916f79-314f-4bae-bafc-c3d204285fbc"; + fsType = "btrfs"; + }; "/proc" = { device = "proc"; fsType = "proc"; options = ["defaults" "hidepid=2"]; neededForBoot = true; }; - "/home/lomig/Documents" = { + "/home/dunoz/Documents" = { device = "/srv/raid/home-data/Documents"; options = [ "bind" ]; }; - "/home/lomig/Images" = { + "/home/dunoz/Images" = { device = "/srv/raid/home-data/Images"; options = [ "bind" ]; }; - "/home/lomig/Musique" = { + "/home/dunoz/Musique" = { device = "/srv/raid/home-data/Musique"; options = [ "bind" ]; }; - "/home/lomig/Téléchargements" = { + "/home/dunoz/Téléchargements" = { device = "/srv/raid/home-data/Téléchargements"; options = [ "bind" ]; }; - "/home/lomig/Vidéos" = { + "/home/dunoz/Vidéos" = { device = "/srv/raid/home-data/Vidéos"; options = [ "bind" ]; }; - "/home/lomig/nixos-config" = { + "/home/dunoz/nixos-config" = { device = "/srv/raid/home-data/nixos-config"; options = [ "bind" ]; }; @@ -116,7 +128,7 @@ in { swapDevices = []; - users.users.lomig = { + users.users.dunoz = { isNormalUser = true; extraGroups = [ "lp" "wheel"]; shell = pkgs.zsh; @@ -124,7 +136,7 @@ in { home-manager = { useGlobalPkgs = true; - users.lomig = import ../../hm/users/lomig-desktop.nix; + users.dunoz = import ../../hm/users/dunoz-desktop.nix; }; networking = { diff --git a/modules/common/gaming.nix b/modules/common/gaming.nix index 58da8c1..58e6641 100644 --- a/modules/common/gaming.nix +++ b/modules/common/gaming.nix @@ -1,4 +1,3 @@ _: { programs.steam.enable = true; - hardware.xpadneo.enable = true; } diff --git a/modules/common/qemu.nix b/modules/common/qemu.nix index c86e61c..f439d98 100644 --- a/modules/common/qemu.nix +++ b/modules/common/qemu.nix @@ -37,7 +37,7 @@ }; }; - users.users.lomig.extraGroups = ["libvirtd" "kvm" "input"]; + users.users.dunoz.extraGroups = ["libvirtd" "kvm" "input"]; environment.etc."qemu/bridge.conf".text = '' allow br0 diff --git a/secrets/agenix/pennsardin.pub b/secrets/agenix/pennsardin.pub deleted file mode 100644 index e16be5e..0000000 --- a/secrets/agenix/pennsardin.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICZto2/k9ZiYzWxWM6sfZLq/fIUVDc3BwPb+00dOahkk root@pennsardin diff --git a/secrets/dunoz-password-penduick.age b/secrets/dunoz-password-penduick.age deleted file mode 100644 index 69cddd9..0000000 --- a/secrets/dunoz-password-penduick.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> X25519 t5/4zFfNo5Hq/EacMKriedzv9je2ThBpq/WLegedg2A -sq35AzCE5HVTgqi0cNOcbW5C50sLeCAw4SIR6fbMg2M --> X25519 yHHx+6CF7VEf331RchlwC9povVUwZBTq9cgAfo3gqjQ -RUsB7tMZRJYGy5Ggw+pnaNPOEiFYwAJn+gquCcNUnQo ---- jJVkAQ9fNSwyrWiyvIVzuTuJuudhL3zv29PI5pdKDz4 -ш.f=5IWiNPlSwwM* \ No newline at end of file diff --git a/secrets/goaccess-password.age b/secrets/goaccess-password.age deleted file mode 100644 index 20d710c..0000000 Binary files a/secrets/goaccess-password.age and /dev/null differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix deleted file mode 100644 index bc436c2..0000000 --- a/secrets/secrets.nix +++ /dev/null @@ -1,11 +0,0 @@ -let - serveur = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPRVxB7usThGHf8cuSPE4sjdqSaPNlwWAZPEo1wUgHz6 root@terre-neuvas"; - admin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAxranFaz3jRfvYE2M6FvRUWjzviIWjWd1mucgKeuSK2 lomig@nixos"; - penduick = "age1rnyey8shjxyaq43dzlnhtfkcm3ra4hy3ygh6c46w4xmr7fe9fe3s00nh2r"; - dunoz = "age1ppu60aw0v5wxhrc0gyqmgrukh2a5uaxwqxxmuy0w3fv4tnt02ycqrrgmue"; -in -{ - "goaccess-password.age".publicKeys = [ serveur admin ]; - "dunoz-password-penduick.age".publicKeys = [ penduick dunoz ]; -} -