diff --git a/.sops.yaml b/.sops.yaml deleted file mode 100644 index edf9919..0000000 --- a/.sops.yaml +++ /dev/null @@ -1,7 +0,0 @@ -keys: - - &age age18uvtlgx442kkufwp6g42lfxk2ft3e4ksjhumdugjcc7uclyzj9vqk9f8fw -creation_rules: - - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$ - key_groups: - - age: - - *age diff --git a/common.nix b/common.nix index e7c64c4..759a349 100644 --- a/common.nix +++ b/common.nix @@ -50,7 +50,6 @@ amneziawg-go amneziawg-tools sbctl - sops ]; services = { logind.settings.Login.HandleLidSwitch = "ignore"; diff --git a/server/flake.lock b/server/flake.lock index 0c03c52..0a16ff3 100644 --- a/server/flake.lock +++ b/server/flake.lock @@ -40,28 +40,7 @@ "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "sops-nix": "sops-nix" - } - }, - "sops-nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1788914643, - "narHash": "sha256-4GuMPW90JSxXWDPUB9M+1m7fYbe3H0apOd86/zBQ2Kw=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "13616fff713a9f94055c66f15687ebdc17a335df", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" + "nixpkgs": "nixpkgs" } } }, diff --git a/server/flake.nix b/server/flake.nix index 6000b63..8cd93c6 100644 --- a/server/flake.nix +++ b/server/flake.nix @@ -1,22 +1,16 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; - sops-nix = { - url = "github:Mic92/sops-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; home-manager = { url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = inputs@{ self, nixpkgs, sops-nix, home-manager, ... }: { + outputs = inputs@{ self, nixpkgs, home-manager, ... }: { nixosConfigurations.nixos-server = nixpkgs.lib.nixosSystem { modules = [ ./configuration.nix - sops-nix.nixosModules.sops - home-manager.nixosModules.home-manager - { + home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs; };