Overhaul luna complete

machines/luna/configuration.nix

@@ -7,68 +7,11 @@
   ...
 }: {
   imports = [
-    inputs.home-manager.nixosModules.home-manager
     ./hardware-configuration.nix
-    ../../pkgs/firefox.nix
-    ../common/configuration.nix
+    ./modules.nix
   ];
 
-  home-manager = {
-    extraSpecialArgs = { inherit inputs outputs; };
-    users = {
-      horseman = import ../../home-manager/apps.nix;
-    };
-  };
-
   networking.hostName = "luna";
-  networking.networkmanager.enable = true;
-  networking.extraHosts = ''
-    127.0.0.1 koala.rails.local members.rails.local leden.rails.local intro.rails.local
-  '';
-
-  services.xserver.enable = true;
-  services.desktopManager.plasma6.enable = true;
-  services.displayManager.sddm.enable = true;
-  services.displayManager.sddm.autoNumlock = true;
-  services.displayManager.defaultSession = "plasma";
-  boot.loader.systemd-boot.enable = true;  
-  boot.kernelModules = [ "snd-seq" "snd-rawmidi" ];
-
-  hardware.bluetooth.enable = true;
-  hardware.pulseaudio.enable = false;
-  services.jack = {
-    jackd.enable = false;
-    alsa.enable = true;
-    loopback.enable = false;
-  };
-
-  environment.plasma6.excludePackages = with pkgs.kdePackages; [
-    kate
-    konsole
-  ];
-  environment.gnome.excludePackages = with pkgs; [
-    gnome-calendar
-    gnome-characters
-    nautilus
-    gnome-clocks
-    gnome-contacts
-    evince
-    file-roller
-    geary
-    gnome-system-monitor
-    eog
-    gnome-logs
-    gnome-maps
-    gnome-music
-    seahorse
-    gnome-text-editor
-  ];
-
-
-  virtualisation.docker.enable = true;
-
-  virtualisation.virtualbox.host.enable = true;
-  users.extraGroups.vboxusers.members = [ "horseman" ];
-
-  users.extraUsers.horseman.extraGroups = [ "jackaudio" ];
+  
+  system.stateVersion = "24.11";
 }

machines/luna/hardware-configuration.nix

@@ -1,29 +1,33 @@
 # 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 + "/installer/scan/not-detected.nix")
-    ];
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/c1447573-eee5-48ea-9937-84330065628b";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/c1447573-eee5-48ea-9937-84330065628b";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/B516-99F1";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/B516-99F1";
+    fsType = "vfat";
+  };
 
-  swapDevices = [ ];
+  swapDevices = [];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

machines/luna/modules.nix

@@ -0,0 +1,44 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [../../modules];
+
+  config.horseman = {
+    users.horseman.enable = true;
+
+    base = {
+      nix.enable = true;
+    };
+
+    boot = {
+      loader.systemd.enable = true;
+      greeter.sddm.enable = true;
+    };
+
+    wm = {
+      plasma.enable = true;
+    };
+
+    hardware = {
+      audio.enable = true;
+      bluetooth.enable = true;
+      wifi.enable = true;
+    };
+
+    network = {
+      mullvad.enable = true;
+      ssh.enable = true;
+      syncthing.enable = true;
+      tailscale.enable = true;
+    };
+
+    apps = {
+      dev.enable = true;
+    };
+  };
+}