diff options
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/by-name/apzu/configuration.nix | 32 | ||||
| -rw-r--r-- | hosts/by-name/tiamat/configuration.nix | 43 |
2 files changed, 37 insertions, 38 deletions
diff --git a/hosts/by-name/apzu/configuration.nix b/hosts/by-name/apzu/configuration.nix index a27688ba..fe5be0af 100644 --- a/hosts/by-name/apzu/configuration.nix +++ b/hosts/by-name/apzu/configuration.nix @@ -10,8 +10,23 @@ {...}: { imports = [ ./hardware.nix + ../../../modules/common/soispha ]; + vhack.users = { + enable = true; + users = [ + { + name = "soispha"; + groups = ["wheel" "audio"]; + enableDeprecatedPlugdev = true; + uid = 1000; + sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIME4ZVa+IoZf6T3U08JG93i6QIAJ4amm7mkBzO14JSkz"; + hashedPassword = "$y$jFT$3qI9MYLDHPUdGKsVa8skV0$TOjX0SFHWuj52zd7/kmkNtG5EqQwYcqv0FKXWbLaro6"; + } + ]; + }; + soispha = { bluetooth.enable = true; @@ -20,10 +35,6 @@ enable = true; }; - impermanence.directories = [ - "/var/log" - ]; - power.enable = true; programs = { @@ -55,19 +66,6 @@ enable = true; systemName = "x86_64-linux"; }; - users = { - enable = true; - users = [ - { - name = "soispha"; - groups = ["wheel" "audio"]; - enableDeprecatedPlugdev = true; - uid = 1000; - sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIME4ZVa+IoZf6T3U08JG93i6QIAJ4amm7mkBzO14JSkz"; - hashedPassword = "$y$jFT$3qI9MYLDHPUdGKsVa8skV0$TOjX0SFHWuj52zd7/kmkNtG5EqQwYcqv0FKXWbLaro6"; - } - ]; - }; }; system.stateVersion = "23.05"; diff --git a/hosts/by-name/tiamat/configuration.nix b/hosts/by-name/tiamat/configuration.nix index 35378aa9..462bbe9a 100644 --- a/hosts/by-name/tiamat/configuration.nix +++ b/hosts/by-name/tiamat/configuration.nix @@ -10,13 +10,33 @@ { lib, system, - externalBinaries, + sources, ... }: { imports = [ ./hardware.nix ]; + vhack = { + # TODO: Hard-code all the uids/gids <2025-05-13> + persist.directories = [ + "/var/lib/nixos" + ]; + users = { + enable = true; + users = [ + { + name = "soispha"; + groups = ["wheel" "audio"]; + enableDeprecatedPlugdev = true; + uid = 1000; + sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIME4ZVa+IoZf6T3U08JG93i6QIAJ4amm7mkBzO14JSkz"; + hashedPassword = "$y$jFT$qi3wS9njrMl2y55b3NOBI0$j40Qt6AAkMSfZ82KPhqMaUaPztWtPps1wOqaXaF/L.6"; + } + ]; + }; + }; + soispha = { bluetooth = {enable = true;}; networking = { @@ -29,12 +49,6 @@ systemName = "x86_64-linux"; }; - # TODO: Hard-code all the uids/gids <2025-05-13> - impermanence.directories = [ - "/var/lib/nixos" - "/var/log" - ]; - services = { unison.foreign.address = "apzu.fritz.box"; }; @@ -48,7 +62,7 @@ # Support Unicode input "<Alt+Ctrl+Meta+Shift-Z>" = [ "spawn" - "${lib.getExe externalBinaries.qmk_firmware.packages.${system}.qmk_unicode_type} 106 65377" + "${lib.getExe sources.qmk_firmware.packages.${system}.qmk_unicode_type} 106 65377" ]; }; }; @@ -66,19 +80,6 @@ enable = true; keyMap = "us"; }; - users = { - enable = true; - users = [ - { - name = "soispha"; - groups = ["wheel" "audio"]; - enableDeprecatedPlugdev = true; - uid = 1000; - sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIME4ZVa+IoZf6T3U08JG93i6QIAJ4amm7mkBzO14JSkz"; - hashedPassword = "$y$jFT$qi3wS9njrMl2y55b3NOBI0$j40Qt6AAkMSfZ82KPhqMaUaPztWtPps1wOqaXaF/L.6"; - } - ]; - }; }; system.stateVersion = "23.05"; |