diff --git a/configuration.nix b/configuration.nix index d7b35ec..e360bb4 100755 --- a/configuration.nix +++ b/configuration.nix @@ -6,14 +6,6 @@ }: { - - age.enable = true; - age.identityPaths = [ "/var/lib/misc/key.age" ]; - age.secrets.easyroam.file = ./secrets/easyroam.age; - services.easyroam = { - enable = true; - pkcsFile = config.age.secrets.easyroam.path; - }; hardware.graphics.enable = true; services.xserver.videoDrivers = lib.mkIf (config.networking.hostName == "nerv") [ "nvidia" ]; hardware.nvidia = lib.mkIf (config.networking.hostName == "nerv") { diff --git a/flake.lock b/flake.lock index f58a526..9218c1a 100755 --- a/flake.lock +++ b/flake.lock @@ -1,23 +1,5 @@ { "nodes": { - "agenix": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1790734419, - "narHash": "sha256-n7wew722m1OTBT9DOIMxNX/NF4zfsSUABAO5eW3wikE=", - "owner": "ryantm", - "repo": "agenix", - "rev": "3daa710894355fa2fad8243380af373a2b4046ef", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -124,24 +106,6 @@ "type": "github" } }, - "nix-easyroam": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1784038797, - "narHash": "sha256-td6Ko5RV/TFw7ALmYP9YUVXMS1b7hW7vDqabrGXyzUo=", - "owner": "0x5a4", - "repo": "nix-easyroam", - "rev": "a6c72d25edc3b210bf6b2b46395c88be7efac147", - "type": "github" - }, - "original": { - "owner": "0x5a4", - "repo": "nix-easyroam", - "type": "github" - } - }, "nix-maid": { "locked": { "lastModified": 1790770868, @@ -184,16 +148,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1790340521, - "narHash": "sha256-cRrWlIjVRJ6BHDr9caUdXsZ3owzWIKYHpNmGPHBInIU=", + "lastModified": 1790689126, + "narHash": "sha256-ilerN1WLSvF+HMjziC/Wv99J5y02maDH+6hZPwsORKg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5c082a40f7571c266e74e80ae2e68aadd8a9fc7", + "rev": "b4fd65b198c599cbe814fcb9f42d25d021595ec9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-26.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -245,46 +209,12 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1735268880, - "narHash": "sha256-7QEFnKkzD13SPxs+UFR5bUFN2fRw+GlL0am72ZjNre4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7cc0bff31a3a705d3ac4fdceb030a17239412210", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1790689126, - "narHash": "sha256-ilerN1WLSvF+HMjziC/Wv99J5y02maDH+6hZPwsORKg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b4fd65b198c599cbe814fcb9f42d25d021595ec9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { - "agenix": "agenix", "mangowm": "mangowm", - "nix-easyroam": "nix-easyroam", "nix-maid": "nix-maid", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs" } }, "scenefx": { diff --git a/flake.nix b/flake.nix index 4a497a3..e81f003 100755 --- a/flake.nix +++ b/flake.nix @@ -3,15 +3,13 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - agenix.url = "github:ryantm/agenix"; - nix-easyroam.url = "github:0x5a4/nix-easyroam"; - nix-maid.url = "git+https://codeberg.org/viperML/nix-maid"; - nixcord = { url = "github:4evy/nixcord"; inputs.nixpkgs.follows = "nixpkgs"; }; - + nix-maid = { + url = "git+https://codeberg.org/viperML/nix-maid"; + }; mangowm = { url = "github:mangowm/mango"; inputs.nixpkgs.follows = "nixpkgs"; @@ -25,16 +23,12 @@ nixcord, nix-maid, mangowm, - agenix, - nix-easyroam, }: let mods = [ nix-maid.nixosModules.default nixcord.nixosModules.nixcord mangowm.nixosModules.mango - agenix.nixosModules.default - nix-easyroam.nixosModules.nix-easyroam ./configuration.nix ./maid.nix ]; diff --git a/secrets/agenix-rules.nix b/secrets/agenix-rules.nix deleted file mode 100644 index d70a660..0000000 --- a/secrets/agenix-rules.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config }: -let - main = "age17hvac3hn79mwttel9snw87a20x4vguh7y7ys43xmvlhrl3mqs3wswuzlt6"; -in -{ - "easyroam.age".publicKeys = [ main ]; -} diff --git a/secrets/easyroam.age b/secrets/easyroam.age deleted file mode 100644 index e91d869..0000000 Binary files a/secrets/easyroam.age and /dev/null differ