Update sirius host

flake.nix

@@ -52,8 +52,7 @@
             inherit inputs pkgs-unstable;
           };
           modules = [
-            ./hosts/unspecific
-            ./hosts/vega
+            ./hosts/specific/vega
 
             home-manager.nixosModules.home-manager
 
@@ -69,12 +68,8 @@
             inherit inputs pkgs-unstable;
           };
           modules = [
-            ./hosts/unspecific
-            ./hosts/sirius
+            ./hosts/specific/sirius
 
-            home-manager.nixosModules.home-manager
-
-            catppuccin.nixosModules.catppuccin
             nix-ld.nixosModules.nix-ld
           ];
         };

hosts/base/desktop/default.nix

@@ -0,0 +1,19 @@
+{ inputs, pkgs-unstable, ... }:
+
+{
+  imports = [ ../unspecific ];
+
+  home-manager = {
+    extraSpecialArgs = {
+      inherit inputs pkgs-unstable;
+    };
+    useGlobalPkgs = true;
+    useUserPackages = true;
+  };
+
+  catppuccin = {
+    enable = true;
+
+    flavor = "mocha";
+  };
+}

hosts/unspecific/default.nix → hosts/base/unspecific/default.nix

@@ -7,8 +7,8 @@
     ./users.nix
     ./shell.nix
 
-    ../../modules/docker.nix
-    ../../modules/nix-ld.nix
+    ../../../modules/docker.nix
+    ../../../modules/nix-ld.nix
   ];
 
   system.stateVersion = "24.05";
@@ -30,12 +30,6 @@
 
   networking.firewall.enable = true;
 
-  catppuccin = {
-    enable = true;
-
-    flavor = "mocha";
-  };
-
   environment.systemPackages = with pkgs; [
     # nix language server
     nixd

hosts/base/unspecific/shell.nix

@@ -0,0 +1,7 @@
+{
+  programs.zsh = {
+    enable = true;
+  };
+
+  environment.pathsToLink = [ "/share/zsh" ];
+}

hosts/base/unspecific/users.nix

@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+
+{
+  users.users = {
+    root = {
+      openssh.authorizedKeys.keys = [ (builtins.readFile ../../../dots/ssh/id_ed25519.pub) ];
+    };
+
+    lukas = {
+      isNormalUser = true;
+      description = "Lukas Leeb";
+      initialPassword = "lukas";
+      extraGroups = [
+        "networkmanager"
+        "wheel"
+        "docker"
+      ];
+      shell = pkgs.nushell;
+      openssh.authorizedKeys.keys = [ (builtins.readFile ../../../dots/ssh/id_ed25519.pub) ];
+    };
+  };
+}

hosts/sirius/default.nix → hosts/specific/sirius/default.nix

@@ -1,4 +1,12 @@
 {
+  imports = [
+    ./hardware-configuration.nix
+    ../../base/unspecific
+
+    ./packages.nix
+    ./ssh.nix
+  ];
+
   boot = {
     tmp.cleanOnBoot = true;
   };
@@ -8,10 +16,4 @@
     hostName = "sirius";
     domain = "contaboserver.net";
   };
-
-  services.openssh.enable = true;
-
-  networking.firewall = {
-    allowedTCPPorts = [ 22 ];
-  };
 }

hosts/specific/sirius/packages.nix

@@ -0,0 +1,24 @@
+{ inputs, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    git
+    htop
+    wget
+    curl
+    just
+  ];
+
+  programs.neovim = {
+    enable = true;
+    package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
+
+    defaultEditor = true;
+    viAlias = true;
+    vimAlias = true;
+  };
+
+  environment.pathsToLink = {
+    "/root/.config/nvim" = ../../../dots/nvim;
+  };
+}

hosts/specific/sirius/ssh.nix

@@ -0,0 +1,7 @@
+{
+  services.openssh.enable = true;
+
+  networking.firewall = {
+    allowedTCPPorts = [ 22 ];
+  };
+}

hosts/vega/default.nix → hosts/specific/vega/default.nix

@@ -8,28 +8,29 @@
 {
   imports = [
     ./hardware-configuration.nix
+    ../../base/desktop
 
-    ../../modules/bluetooth.nix
-    ../../modules/cloudflare_dns.nix
-    ../../modules/onepassword.nix
-    ../../modules/localsend.nix
-    ../../modules/udiskie.nix
-    ../../modules/nvidia-containers.nix
-    ../../modules/gnome-keyring.nix
-    ../../modules/seahorse.nix
-    ../../modules/nautilus.nix
-    ../../modules/hyprland.nix
-    ../../modules/nvidia.nix
-    ../../modules/opengl.nix
-    ../../modules/ollama.nix
-    ../../modules/pipewire.nix
-    ../../modules/polkit.nix
-    ../../modules/qt.nix
-    ../../modules/steam.nix
-    ../../modules/looking-glass.nix
-    ../../modules/xserver.nix
-    ../../modules/sddm.nix
-    ../../modules/uxplay.nix
+    ../../../modules/bluetooth.nix
+    ../../../modules/cloudflare_dns.nix
+    ../../../modules/onepassword.nix
+    ../../../modules/localsend.nix
+    ../../../modules/udiskie.nix
+    ../../../modules/nvidia-containers.nix
+    ../../../modules/gnome-keyring.nix
+    ../../../modules/seahorse.nix
+    ../../../modules/nautilus.nix
+    ../../../modules/hyprland.nix
+    ../../../modules/nvidia.nix
+    ../../../modules/opengl.nix
+    ../../../modules/ollama.nix
+    ../../../modules/pipewire.nix
+    ../../../modules/polkit.nix
+    ../../../modules/qt.nix
+    ../../../modules/steam.nix
+    ../../../modules/looking-glass.nix
+    ../../../modules/xserver.nix
+    ../../../modules/sddm.nix
+    ../../../modules/uxplay.nix
   ];
 
   networking.hostName = "vega";
@@ -45,7 +46,7 @@
   };
 
   home-manager.users = {
-    lukas = import ../../home/lukas {
+    lukas = import ../../../home/lukas {
       inherit inputs pkgs pkgs-unstable;
 
       host = {