diff options
Diffstat (limited to '')
| -rw-r--r-- | system/default.nix | 3 | ||||
| -rw-r--r-- | system/font/default.nix | 5 | ||||
| -rw-r--r-- | system/secrets/default.nix (renamed from secrets/default.nix) | 0 | ||||
| -rw-r--r-- | system/secrets/nheko/conf.apzu (renamed from secrets/nheko/conf.apzu) | 0 | ||||
| -rw-r--r-- | system/secrets/nheko/conf.isimud (renamed from secrets/nheko/conf.isimud) | 0 | ||||
| -rw-r--r-- | system/secrets/nheko/conf.tiamat (renamed from secrets/nheko/conf.tiamat) | 0 | ||||
| -rw-r--r-- | system/secrets/secrets.nix (renamed from secrets/secrets.nix) | 0 | ||||
| -rw-r--r-- | system/secrets/serverphone/ca.key (renamed from secrets/serverphone/ca.key) | 0 | ||||
| -rw-r--r-- | system/secrets/serverphone/server.key (renamed from secrets/serverphone/server.key) | 0 | ||||
| -rw-r--r-- | system/services/nix/default.nix | 6 | ||||
| l--------- | system/services/serverphone/keys/key_1 | 2 | ||||
| l--------- | system/services/serverphone/keys/key_2 | 2 |
12 files changed, 7 insertions, 11 deletions
diff --git a/system/default.nix b/system/default.nix index 17ed00bc..5faa402d 100644 --- a/system/default.nix +++ b/system/default.nix @@ -4,7 +4,7 @@ ./disks ./font ./hardware - #./impermanence already at flake level imported + ./impermanence ./libvirtd ./locale ./network @@ -13,6 +13,7 @@ ./polkit ./power ./services + ./secrets ./sound ./tempfiles ./users # the position of this item is fully arbitrary diff --git a/system/font/default.nix b/system/font/default.nix index 484db7e7..3864b60e 100644 --- a/system/font/default.nix +++ b/system/font/default.nix @@ -1,7 +1,4 @@ -{ - pkgs, - ... -}: let +{pkgs, ...}: let nerdFont = pkgs.nerdfonts.override { fonts = [ "SourceCodePro" diff --git a/secrets/default.nix b/system/secrets/default.nix index d1fc1714..d1fc1714 100644 --- a/secrets/default.nix +++ b/system/secrets/default.nix diff --git a/secrets/nheko/conf.apzu b/system/secrets/nheko/conf.apzu index a5437a95..a5437a95 100644 --- a/secrets/nheko/conf.apzu +++ b/system/secrets/nheko/conf.apzu diff --git a/secrets/nheko/conf.isimud b/system/secrets/nheko/conf.isimud index ef6c52b6..ef6c52b6 100644 --- a/secrets/nheko/conf.isimud +++ b/system/secrets/nheko/conf.isimud diff --git a/secrets/nheko/conf.tiamat b/system/secrets/nheko/conf.tiamat index 51cab7df..51cab7df 100644 --- a/secrets/nheko/conf.tiamat +++ b/system/secrets/nheko/conf.tiamat diff --git a/secrets/secrets.nix b/system/secrets/secrets.nix index 36757546..36757546 100644 --- a/secrets/secrets.nix +++ b/system/secrets/secrets.nix diff --git a/secrets/serverphone/ca.key b/system/secrets/serverphone/ca.key index d49c5395..d49c5395 100644 --- a/secrets/serverphone/ca.key +++ b/system/secrets/serverphone/ca.key diff --git a/secrets/serverphone/server.key b/system/secrets/serverphone/server.key index a2720406..a2720406 100644 --- a/secrets/serverphone/server.key +++ b/system/secrets/serverphone/server.key diff --git a/system/services/nix/default.nix b/system/services/nix/default.nix index 1477be1b..491b6a4d 100644 --- a/system/services/nix/default.nix +++ b/system/services/nix/default.nix @@ -1,12 +1,10 @@ { - config, - lib, pkgs, - nixpkgs-as-input, + nixpkgs_as_input, templates, ... }: let - nixpkgs = nixpkgs-as-input; + nixpkgs = nixpkgs_as_input; in { nix = { package = pkgs.nixStable; diff --git a/system/services/serverphone/keys/key_1 b/system/services/serverphone/keys/key_1 index a3496d00..67720882 120000 --- a/system/services/serverphone/keys/key_1 +++ b/system/services/serverphone/keys/key_1 @@ -1 +1 @@ -../../../../home-manager/config/gpg/keys/key_1 \ No newline at end of file +../../../../home-manager/soispha/config/gpg/keys/key_1 \ No newline at end of file diff --git a/system/services/serverphone/keys/key_2 b/system/services/serverphone/keys/key_2 index ff3dd5b6..24df7207 120000 --- a/system/services/serverphone/keys/key_2 +++ b/system/services/serverphone/keys/key_2 @@ -1 +1 @@ -../../../../home-manager/config/gpg/keys/key_2 \ No newline at end of file +../../../../home-manager/soispha/config/gpg/keys/key_2 \ No newline at end of file |