boxes/mainsail.nix

@@ -1,5 +1,15 @@
 { lib, config, pkgs, ...}:
 {
+  imports = [
+    ../common/steam.nix
+    ../common/desktop.nix
+  ];
+
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "/dev/sda";
+
+  networking.hostName = "mainsail";
+
   services.paperless = {
     enable = true;
     passwordFile = "/etc/paperless-password";
@@ -36,6 +46,34 @@
   systemd.targets.hibernate.enable = false;
   systemd.targets.hybrid-sleep.enable = false;
 
+  services.getty.greetingLine = "
+    welcome to mainsail    |`-:_
+  ,----....____            |    `+.
+ (             ````----....|___   |
+  \\     _                      ````----....____
+   \\    _)                                     ```---.._
+    \\                                                   \\
+  )`.\\  )`.   )`.   )`.   )`.   )`.   )`.   )`.   )`.   )`.   )`.
+-'   `-'   `-'   `-'   `-'   `-'   `-'   `-'   `-'   `-'   `-'   `
+  ";
+
+  environment.systemPackages = with pkgs; [
+    vscodium-fhs
+    libreoffice
+
+    anki-bin
+    ytfzf
+    kdenlive
+    libreoffice
+    i3
+    gcc
+    gnumake
+
+    scrcpy
+    thunderbird
+    mepo
+  ];
+
   systemd.services.paperless-web-bridge = {
     script = ''
       ${pkgs.openssh}/bin/ssh -v -NR 3004:localhost:3004 -oExitOnForwardFailure=yes -p 55555 useracc@beepboop.systems

boxes/mainsail/default.nix

@@ -1,46 +0,0 @@
-{ lib, config, pkgs, ...}:
-{
-  imports = [
-    ./hardware-configuration.nix
-    ./server.nix
-    ../../modules/bootstrap.nix
-    ../../modules/common.nix
-    ../../modules/x11.nix
-    ../../modules/discord.nix
-  ];
-
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/sda";
-
-  networking.hostName = "mainsail";
-
-  services.getty.greetingLine = "
-    welcome to mainsail    |`-:_
-  ,----....____            |    `+.
- (             ````----....|___   |
-  \\     _                      ````----....____
-   \\    _)                                     ```---.._
-    \\                                                   \\
-  )`.\\  )`.   )`.   )`.   )`.   )`.   )`.   )`.   )`.   )`.   )`.
--'   `-'   `-'   `-'   `-'   `-'   `-'   `-'   `-'   `-'   `-'   `
-  ";
-
-  environment.systemPackages = with pkgs; [
-    vscodium-fhs
-    libreoffice
-
-    anki-bin
-    ytfzf
-    kdenlive
-    libreoffice
-    i3
-    gcc
-    gnumake
-
-    scrcpy
-    thunderbird
-    mepo
-  ];
-
-  system.stateVersion = "23.11";
-}

boxes/mainsail/hardware-configuration.nix

@@ -1,31 +0,0 @@
-# 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 = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/7b70ab88-296c-4737-90b2-267cb2432dc1";
-      fsType = "ext4";
-    };
-
-  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
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-}

flake.lock

@@ -92,11 +92,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-xCQE9SSKWjmoYOaIkzdlGULeGbEF9Gau5TPgYJxalmw=",
-        "path": "/nix/store/ngxkaia0jmb6bfn1i5blvqaggxb8sy3f-source/builds",
+        "path": "/nix/store/khgahixmjd7zvvv541crbibjwg3wbshv-source/builds",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/ngxkaia0jmb6bfn1i5blvqaggxb8sy3f-source/builds",
+        "path": "/nix/store/khgahixmjd7zvvv541crbibjwg3wbshv-source/builds",
         "type": "path"
       }
     }

flake.nix

@@ -33,20 +33,6 @@
           }
         ];
       };
-      mainsail = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
-        modules = [
-          ./boxes/mainsail
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit inputs; };
-            home-manager.users.usr = import ./boxes/mainsail/home.nix;
-          }
-        ];
-      };
     };
   };
 }