flake.nix

@@ -111,12 +111,6 @@
           inherit inputs outputs;
         };
       };
-      builder = lib.nixosSystem {
-        modules = [./hosts/builder];
-        specialArgs = {
-          inherit inputs outputs;
-        };
-      };
     };
 
     # Standalone HM

homes/julian/features/nix-helper/default.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  lib,
+  pkgs,
+  ...
+}: {
   home.sessionVariables = {
     FLAKE = "/home/julian/.dotfiles";
   };

homes/julian/features/suites/desktop/default.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  lib,
+  pkgs,
+  ...
+}: {
   imports = [../../gtk];
 
   services.blueman-applet.enable = true;

homes/julian/pianonix.nix

@@ -7,7 +7,8 @@
     ./features/neovim
     ./features/wezterm
     ./features/yazi
-    ./features/gtk
+    ./features/nix-helper
+    ./features/desktop
   ];
 
   hostName = "pianonix";

hosts/builder/default.nix

@@ -1,15 +1,47 @@
 # sudo nixos-rebuild switch --flake .#builder --target-host root@192.168.3.118
 # or
 # deploy .#builder
-{config, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     ./hardware-configuration.nix
 
     ../common/global
   ];
 
+  # hardware.graphics = {
+  #   enable = true;
+  #   extraPackages = with pkgs; [
+  #     rocmPackages.clr.icd
+  #     linuxPackages.amdgpu-pro
+  #   ];
+  # };
+
+  # boot.kernelParams = [
+  #   "radeon.si_support=0"
+  #   "radeon.cik_support=1"
+  #   "amdgpu.si_support=0"
+  #   "amdgpu.cik_support=1"
+  # ];
+  # boot.extraModulePackages = with config.boot.kernelPackages; [ amdgpu-pro ];
+  # boot.blacklistedKernelModules = [ "radeon" ];
+
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "/dev/sda";
+
+  # Emulated systems used as alternative to cross-compiling
+  boot.binfmt.emulatedSystems = ["aarch64-linux"];
+
   networking.hostName = "builder";
-  system.stateVersion = "23.11";
+
+  modules = {
+    keymap.enable = true;
+    locales.enable = true;
+    sops.enable = true;
+  };
 
   users.users.nix = {
     isNormalUser = true;
@@ -55,6 +87,17 @@
     max-free = ${toString (100 * 1024 * 1024 * 1024)}
   '';
 
+  environment.systemPackages = with pkgs; [
+    vim
+    htop
+    mc
+
+    # # AMD GPU tools
+    # pciutils
+    # nvtopPackages.amd
+    # linuxPackages.amdgpu-pro
+  ];
+
   nix.nrBuildUsers = 64;
 
   # prevent memory to get filled
@@ -197,7 +240,7 @@
 
   sops.secrets."gitea_token" = {
     owner = config.users.users.nix.name;
-    sopsFile = ./secrets.yaml;
+    sopsFile = ../../../secrets/secrets-builder.yaml;
   };
 
   # =========== Binary Cache ==========
@@ -207,7 +250,7 @@
   };
 
   # =========== Binary Cache with attic ==========
-  sops.secrets."attic_token".sopsFile = ./secrets.yaml;
+  sops.secrets."attic_token".sopsFile = ../../../secrets/secrets-builder.yaml;
 
   services.atticd = {
     enable = true;
@@ -241,4 +284,8 @@
       };
     };
   };
+
+  # ======================== DO NOT CHANGE THIS ========================
+  system.stateVersion = "23.11";
+  # ======================== DO NOT CHANGE THIS ========================
 }

hosts/builder/hardware-configuration.nix

@@ -1,4 +1,15 @@
-{lib, ...}: {
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [(modulesPath + "/profiles/qemu-guest.nix")];
+
   boot.initrd.availableKernelModules = [
     "ata_piix"
     "uhci_hcd"
@@ -24,27 +35,4 @@
   # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  # hardware.graphics = {
-  #   enable = true;
-  #   extraPackages = with pkgs; [
-  #     rocmPackages.clr.icd
-  #     linuxPackages.amdgpu-pro
-  #   ];
-  # };
-
-  # boot.kernelParams = [
-  #   "radeon.si_support=0"
-  #   "radeon.cik_support=1"
-  #   "amdgpu.si_support=0"
-  #   "amdgpu.cik_support=1"
-  # ];
-  # boot.extraModulePackages = with config.boot.kernelPackages; [ amdgpu-pro ];
-  # boot.blacklistedKernelModules = [ "radeon" ];
-
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/sda";
-
-  # Emulated systems used as alternative to cross-compiling
-  boot.binfmt.emulatedSystems = ["aarch64-linux"];
 }

hosts/pianonix/default.nix

@@ -16,11 +16,19 @@
     ../common/global
     ../common/users/julian
 
+    # ../common/optional/openssh.nix
+    # ../common/optional/greetd.nix
     ../common/optional/pipewire.nix
     ../common/optional/remote-builder.nix
+    # ../common/optional/boot-efi.nix
     ../common/optional/pcmanfm.nix
+    # ../common/optional/i3.nix
+    # ../common/optional/gdm.nix
     ../common/optional/redshift.nix
-    ../common/optional/authentication.nix
+    # ../common/optional/virtualbox.nix
+    ../common/optional/xdg-portal.nix
+    ../common/optional/polkit.nix # TODO: maybe not needed!
+    ../common/optional/keyring.nix # TODO: maybe not needed!
   ];
 
   # disko.devices.disk.main.device = "/dev/mmcblk1";
@@ -31,7 +39,6 @@
   #   "@SSID@".psk = "@PSK@";
   # };
   networking.hostName = "pianonix";
-  system.stateVersion = "22.11";
 
   sops.secrets."vnc-passwd" = {
     owner = config.users.users.julian.name;
@@ -128,7 +135,15 @@
     };
   };
 
+  # Packages needed as root
+  environment.systemPackages = with pkgs; [
+    vim
+    htop
+    mc
+  ];
+
   networking.firewall.enable = true;
+
   networking.firewall.allowedTCPPorts = [
     5900 # for vnc
   ];
@@ -155,4 +170,8 @@
   # boot.loader.raspberryPi.firmwareConfig = ''
   #   dtparam=audio=on
   # '';
+
+  # ======================== DO NOT CHANGE THIS ========================
+  system.stateVersion = "22.11";
+  # ======================== DO NOT CHANGE THIS ========================
 }