officially cooked

hosts/common.nix

@@ -1,13 +1,19 @@
 { config, pkgs, ... }:
 
 {
+  system.stateVersion = "24.05";
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix.settings.auto-optimise-store = true;
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 7d";
+  };
 
+  console.keyMap = "sv-latin1";
   networking.networkmanager.enable = true;
-
   time.timeZone = "Europe/Stockholm";
   i18n.defaultLocale = "en_US.UTF-8";
-
   i18n.extraLocaleSettings = {
     LC_ADDRESS = "sv_SE.UTF-8";
     LC_IDENTIFICATION = "sv_SE.UTF-8";
@@ -19,16 +25,29 @@
     LC_TELEPHONE = "sv_SE.UTF-8";
     LC_TIME = "sv_SE.UTF-8";
   };
+  security.sudo.wheelNeedsPassword = false;
 
-
-  services.displayManager = {
-    gdm.enable = true;
-    gdm.wayland = true;
-  };
-  services.desktopManager.gnome.enable = true;
-  services.xserver.xkb.layout = "se";
+  services = {
+    printing.enable = true;
+    pulseaudio.enable = false;
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      pulse.enable = true;
+      jack.enable = true;
+    };
+    xserver.xkb.layout = "se";
+    displayManager = {
+      gdm.enable = true;
+      gdm.wayland = true;
+    };
+    desktopManager.gnome.enable = true;
+    gnome = {
+      gnome-keyring.enable = true;
+      gnome-initial-setup.enable = false;
+    };
+  }; # end services
   
-  services.gnome.gnome-keyring.enable = true;
   environment.gnome.excludePackages = with pkgs; [
     evolution
     geary
@@ -43,32 +62,15 @@
     gnome-clocks
   ];
 
-  nix.settings.auto-optimise-store = true;
-  nix.gc = {
-    automatic = true;
-    dates = "weekly";
-    options = "--delete-older-than 7d";
-  };
-
-  console.keyMap = "sv-latin1";
-
-  services.printing.enable = true;
-  services.pulseaudio.enable = false;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    pulse.enable = true;
-    jack.enable = true;
-  };
-
   services.fwupd.enable = true;
   programs = {
+    dconf.enable = true;
     fish.enable = true;
     steam = {
       enable = true;
       remotePlay.openFirewall = true;
     };
-  };
+  }; # end programs
 
   environment.systemPackages = with pkgs; [
     # CLI tools
@@ -104,7 +106,10 @@
     # Other
     syncthing
     steam
+    krita
+    edk2-uefi-shell
   ];
+  environment.shells = with pkgs; [ fish ];
 
   virtualisation.podman = {
     enable = true;
@@ -117,11 +122,5 @@
     extraGroups = [ "wheel" "networkmanager" "podman" ];
     shell = pkgs.fish;
   };
-
-  security.sudo.wheelNeedsPassword = false;
-  programs.dconf.enable = true;
-
-  environment.shells = with pkgs; [ fish ];
-
-  system.stateVersion = "24.05";
+  
 }

hosts/electra/configuration.nix

@@ -14,7 +14,6 @@
       verbose = false;
     };
 
-  
     plymouth = {
       enable = true;
       theme = "rings";

hosts/tower/configuration.nix

@@ -4,10 +4,40 @@
   imports =
     [ ./hardware-configuration.nix ];
   networking.hostName = "tower";
-  
-  boot = {
-    loader.systemd-boot.enable = true;
-    loader.efi.canTouchEfiVariables = true;
-    initrd.enable = true;
+  networking.interfaces.enp10s0.wakeOnLan = {
+    enable = true;
   };
-}
+  boot.initrd.enable = true;
+  boot.loader = {
+    efi.canTouchEfiVariables = true;
+    systemd-boot = {
+      enable = true;
+      windows = {
+        "nvme0n1p1" = {
+          title = "Windows";
+          efiDeviceHandle = "FS0";
+          sortKey = "1";
+        };
+      }; #end windows
+      edk2-uefi-shell = {
+        enable = true;
+        sortKey = "0";
+      }; # end edk2-uefi-shell
+    }; # end loader.systemd-boot
+  }; # end boot
+  hardware = {
+    graphics.enable = true;
+    nvidia = {
+      modesetting.enable = true;
+      powerManagement.enable = false;
+      powerManagement.finegrained = false;
+      open = true;
+      nvidiaSettings = true;
+      package = config.boot.kernelPackages.nvidiaPackages.stable;
+    }; # end nvidia
+  }; # end hardware
+  services = {
+    xserver.videoDrivers = [ "nvidia" ];
+    openssh.enable = true;
+  }; # end services
+} # end file