diff --git a/common/modules/gnome/default.nix b/common/modules/gnome/default.nix index 67a6c14..fce7cfe 100644 --- a/common/modules/gnome/default.nix +++ b/common/modules/gnome/default.nix @@ -54,7 +54,7 @@ in { atomix # puzzle game epiphany # web browser geary # email reader - gedit # text editor + pkgs.gedit # text editor gnome-calendar gnome-clocks gnome-contacts diff --git a/flake.lock b/flake.lock index 5041902..3348c85 100644 --- a/flake.lock +++ b/flake.lock @@ -1435,11 +1435,11 @@ }, "nur": { "locked": { - "lastModified": 1704279261, - "narHash": "sha256-0A0MZ6mC/uQmX0qY0Rtwh4UsepkKktv+hwo/U53MBSw=", + "lastModified": 1704295202, + "narHash": "sha256-p/0PCouilKVM1q3hzqGk3Ct0jLpK+E/9eXbjHXEoxuE=", "owner": "nix-community", "repo": "NUR", - "rev": "bf390c044dfeeb7471fc931f5953c723028ce0fe", + "rev": "66f8fbded8a9b9a6f4e17a5d8105bcd29d4ec7f8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8b43d32..b0d82a1 100644 --- a/flake.nix +++ b/flake.nix @@ -54,7 +54,7 @@ }; outputs = { self, nixpkgs, nixpkgs_stable, flake-utils-plus, nur, attic - , deploy, home-manager, gnome-autounlock-keyring, ... }@inputs: + , deploy, home-manager, gnome-autounlock-keyring, lanzaboote, ... }@inputs: let # fast-repl = pkgs.writeShellScriptBin "fast-repl" '' # source /etc/set-environment @@ -81,27 +81,46 @@ gnome-autounlock-keyring.nixosModules.default ./common ]; + + specialArgs = { inherit inputs; }; }; # hosts + hosts = { - hosts."bastion.olympus" = { - modules = [ ./common/generic-vm.nix ./hosts/olympus/bastion ]; + "bastion.olympus" = { + modules = [ ./common/generic-vm.nix ./hosts/olympus/bastion ]; + }; + + aoife = { + modules = + [ lanzaboote.nixosModules.lanzaboote ./hosts/thalassa/aoife ]; + }; }; # deploy-rs deploy = { user = "root"; - nodes."bastion.olympus" = { - hostname = "olympus.0x76.dev"; - fastConnection = true; - remoteBuild = true; - profiles = { - system = { - path = deploy.lib.x86_64-linux.activate.nixos - self.nixosConfigurations."bastion.olympus"; + nodes = { + "bastion.olympus" = { + hostname = "olympus.0x76.dev"; + fastConnection = true; + remoteBuild = true; + profiles = { + system = { + path = deploy.lib.x86_64-linux.activate.nixos + self.nixosConfigurations."bastion.olympus"; + }; }; }; + + aoife = { + remoteBuild = true; + fastConnection = true; + hostname = "localhost"; + profiles.system.path = deploy.lib.x86_64-linux.activate.nixos + self.nixosConfigurations.aoife; + }; }; }; diff --git a/nixos/hosts/thalassa/aoife/README.md b/hosts/thalassa/aoife/README.md similarity index 100% rename from nixos/hosts/thalassa/aoife/README.md rename to hosts/thalassa/aoife/README.md diff --git a/nixos/hosts/thalassa/aoife/configuration.nix b/hosts/thalassa/aoife/default.nix similarity index 100% rename from nixos/hosts/thalassa/aoife/configuration.nix rename to hosts/thalassa/aoife/default.nix diff --git a/nixos/hosts/thalassa/aoife/hardware-configuration.nix b/hosts/thalassa/aoife/hardware-configuration.nix similarity index 100% rename from nixos/hosts/thalassa/aoife/hardware-configuration.nix rename to hosts/thalassa/aoife/hardware-configuration.nix diff --git a/nixos/hosts/thalassa/aoife/hardware.nix b/hosts/thalassa/aoife/hardware.nix similarity index 100% rename from nixos/hosts/thalassa/aoife/hardware.nix rename to hosts/thalassa/aoife/hardware.nix diff --git a/nixos/hosts/thalassa/aoife/home/.gitignore b/hosts/thalassa/aoife/home/.gitignore similarity index 100% rename from nixos/hosts/thalassa/aoife/home/.gitignore rename to hosts/thalassa/aoife/home/.gitignore diff --git a/nixos/hosts/thalassa/aoife/home/default.nix b/hosts/thalassa/aoife/home/default.nix similarity index 100% rename from nixos/hosts/thalassa/aoife/home/default.nix rename to hosts/thalassa/aoife/home/default.nix diff --git a/nixos/hosts/thalassa/null/README.md b/hosts/thalassa/null/README.md similarity index 100% rename from nixos/hosts/thalassa/null/README.md rename to hosts/thalassa/null/README.md diff --git a/nixos/hosts/thalassa/null/configuration.nix b/hosts/thalassa/null/configuration.nix similarity index 100% rename from nixos/hosts/thalassa/null/configuration.nix rename to hosts/thalassa/null/configuration.nix diff --git a/nixos/hosts/thalassa/null/hardware-configuration.nix b/hosts/thalassa/null/hardware-configuration.nix similarity index 100% rename from nixos/hosts/thalassa/null/hardware-configuration.nix rename to hosts/thalassa/null/hardware-configuration.nix diff --git a/nixos/hosts/thalassa/null/home/default.nix b/hosts/thalassa/null/home/default.nix similarity index 100% rename from nixos/hosts/thalassa/null/home/default.nix rename to hosts/thalassa/null/home/default.nix diff --git a/nixos/hosts/thalassa/null/home/eww/default.nix b/hosts/thalassa/null/home/eww/default.nix similarity index 100% rename from nixos/hosts/thalassa/null/home/eww/default.nix rename to hosts/thalassa/null/home/eww/default.nix diff --git a/nixos/hosts/thalassa/null/home/eww/eww.scss b/hosts/thalassa/null/home/eww/eww.scss similarity index 100% rename from nixos/hosts/thalassa/null/home/eww/eww.scss rename to hosts/thalassa/null/home/eww/eww.scss diff --git a/nixos/hosts/thalassa/null/home/eww/eww.yuck b/hosts/thalassa/null/home/eww/eww.yuck similarity index 100% rename from nixos/hosts/thalassa/null/home/eww/eww.yuck rename to hosts/thalassa/null/home/eww/eww.yuck diff --git a/nixos/hosts/thalassa/null/home/eww/scripts/do-not-disturb.sh b/hosts/thalassa/null/home/eww/scripts/do-not-disturb.sh similarity index 100% rename from nixos/hosts/thalassa/null/home/eww/scripts/do-not-disturb.sh rename to hosts/thalassa/null/home/eww/scripts/do-not-disturb.sh diff --git a/nixos/hosts/thalassa/null/home/eww/scripts/volume.sh b/hosts/thalassa/null/home/eww/scripts/volume.sh similarity index 100% rename from nixos/hosts/thalassa/null/home/eww/scripts/volume.sh rename to hosts/thalassa/null/home/eww/scripts/volume.sh diff --git a/nixos/hosts/thalassa/null/home/eww/scripts/wifi.sh b/hosts/thalassa/null/home/eww/scripts/wifi.sh similarity index 100% rename from nixos/hosts/thalassa/null/home/eww/scripts/wifi.sh rename to hosts/thalassa/null/home/eww/scripts/wifi.sh diff --git a/nixos/hosts/thalassa/null/home/eww/scripts/workspaces.lua b/hosts/thalassa/null/home/eww/scripts/workspaces.lua similarity index 100% rename from nixos/hosts/thalassa/null/home/eww/scripts/workspaces.lua rename to hosts/thalassa/null/home/eww/scripts/workspaces.lua diff --git a/nixos/hosts/thalassa/null/home/eww/scripts/workspaces.sh b/hosts/thalassa/null/home/eww/scripts/workspaces.sh similarity index 100% rename from nixos/hosts/thalassa/null/home/eww/scripts/workspaces.sh rename to hosts/thalassa/null/home/eww/scripts/workspaces.sh diff --git a/nixos/hosts/thalassa/null/home/hyprland.nix b/hosts/thalassa/null/home/hyprland.nix similarity index 100% rename from nixos/hosts/thalassa/null/home/hyprland.nix rename to hosts/thalassa/null/home/hyprland.nix diff --git a/nixos/hosts/thalassa/null/home/neovim.nix b/hosts/thalassa/null/home/neovim.nix similarity index 100% rename from nixos/hosts/thalassa/null/home/neovim.nix rename to hosts/thalassa/null/home/neovim.nix diff --git a/nixos/hosts/thalassa/null/home/theme.nix b/hosts/thalassa/null/home/theme.nix similarity index 100% rename from nixos/hosts/thalassa/null/home/theme.nix rename to hosts/thalassa/null/home/theme.nix diff --git a/nixos/hosts/thalassa/null/networking.nix b/hosts/thalassa/null/networking.nix similarity index 100% rename from nixos/hosts/thalassa/null/networking.nix rename to hosts/thalassa/null/networking.nix diff --git a/nixos/hosts/thalassa/null/rescue-boot.nix b/hosts/thalassa/null/rescue-boot.nix similarity index 100% rename from nixos/hosts/thalassa/null/rescue-boot.nix rename to hosts/thalassa/null/rescue-boot.nix diff --git a/nixos/hosts/thalassa/default.nix b/nixos/hosts/thalassa/default.nix deleted file mode 100644 index 5b1e1db..0000000 --- a/nixos/hosts/thalassa/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - "aoife" = { - type = "local"; - mac = "04:7b:cb:b6:2d:88"; - }; -}