diff --git a/.sops.yaml b/.sops.yaml index b86e610..b7b946b 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,7 +1,7 @@ keys: - &primary age1pj9v44sqvsk06jjs0jx092cdjwtm93nzk83875dw8nume88xnd9sevw75d creation_rules: - - path_regex: secrets/secrets.yaml$ + - path_regex: secret/secret.yaml$ key_groups: - age: - *primary \ No newline at end of file diff --git a/module/aspect/base/home-manager.nix b/module/aspect/base/home-manager.nix index d575ead..a03163b 100644 --- a/module/aspect/base/home-manager.nix +++ b/module/aspect/base/home-manager.nix @@ -1,4 +1,9 @@ { + flake-file.inputs = { + home-manager.url = "github:nix-community/home-manager"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; + }; + den.aspects = { base = { homeManager = diff --git a/module/aspect/sops.nix b/module/aspect/sops.nix index a8de9d4..e187500 100644 --- a/module/aspect/sops.nix +++ b/module/aspect/sops.nix @@ -16,7 +16,7 @@ pkgs.sops pkgs.age ]; - sops.defaultSopsFile = ./../../secrets/secrets.yaml; + sops.defaultSopsFile = ./../../secret/secret.yaml; sops.defaultSopsFormat = "yaml"; }; homeManager = diff --git a/module/system/flake-input.nix b/module/system/flake-input.nix index c023135..99eebb7 100644 --- a/module/system/flake-input.nix +++ b/module/system/flake-input.nix @@ -3,29 +3,23 @@ flake-file = { inputs = { # ----- flake-system (with dendritic) - den.url = "path:./flake/den"; + den.url = "path:./flake/den"; #"github:vic/den" fork; flake-aspects.url = "github:vic/flake-aspects"; flake-file.url = "github:vic/flake-file"; flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; import-tree.url = "github:vic/import-tree"; # ----- - agenix.url = "github:ryantm/agenix"; - deploy-rs.url = "github:serokell/deploy-rs"; - deploy-rs.inputs.nixpkgs.follows = "nixpkgs"; disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; git-hooks.url = "github:cachix/git-hooks.nix"; git-hooks.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; lazy-apps.inputs.nixpkgs.follows = "nixpkgs"; lazy-apps.url = "sourcehut:~rycee/lazy-apps"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; nixos-generators.url = "github:nix-community/nixos-generators"; nixos-generators.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - nur.url = "github:nix-community/NUR"; }; }; } \ No newline at end of file diff --git a/module/system/package-system.nix b/module/system/package-system.nix index edca61a..36c7a96 100644 --- a/module/system/package-system.nix +++ b/module/system/package-system.nix @@ -7,6 +7,7 @@ nixkpgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; pkgs-by-name-for-flake-parts.url = "github:drupol/pkgs-by-name-for-flake-parts"; nix-webapps.url = "github:TLATER/nix-webapps"; + nur.url = "github:nix-community/NUR"; }; imports = [ diff --git a/module/user/kirbara-private.md b/module/user/kirbara-private.md index 5953efc..6da8e45 100644 --- a/module/user/kirbara-private.md +++ b/module/user/kirbara-private.md @@ -13,5 +13,4 @@ in } ``` -That's gitignored `kirbara.nix` -ome people are uncomfortable with showing their email and fullname on public repo \ No newline at end of file +That's gitignored `kirbara.nix`, some people are uncomfortable with showing their email and fullname on public repo \ No newline at end of file diff --git a/secrets/secrets.yaml b/secret/secret.yaml similarity index 100% rename from secrets/secrets.yaml rename to secret/secret.yaml