flake.nix

@@ -183,16 +183,6 @@
             modules = defaultModules { inherit system username hostName; };
           };
         ## Personal
-        Vanguard =
-          let
-            system = "x86_64-linux";
-            username = "pixelifytica";
-            hostName = "Vanguard";
-          in
-          nixpkgs.lib.nixosSystem {
-            specialArgs = defaultSpecialArgs { inherit system; };
-            modules = defaultModules { inherit system username hostName; };
-          };
         Northstar =
           let
             system = "x86_64-linux";
@@ -203,6 +193,16 @@
             specialArgs = defaultSpecialArgs { inherit system; };
             modules = defaultModules { inherit system username hostName; };
           };
+        Vanguard =
+          let
+            system = "x86_64-linux";
+            username = "pixelifytica";
+            hostName = "Vanguard";
+          in
+          nixpkgs.lib.nixosSystem {
+            specialArgs = defaultSpecialArgs { inherit system; };
+            modules = defaultModules { inherit system username hostName; };
+          };
         ## Work
         Tone =
           let
@@ -214,11 +214,11 @@
             specialArgs = defaultSpecialArgs { inherit system; };
             modules = defaultModules { inherit system username hostName; };
           };
-        Ronin =
+        Scorch =
           let
             system = "x86_64-linux";
             username = "elitherl";
-            hostName = "Ronin";
+            hostName = "Scorch";
           in
           nixpkgs.lib.nixosSystem {
             specialArgs = defaultSpecialArgs { inherit system; };

home/Northstar.nix

@@ -1,12 +1,24 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 {
   imports = [
     ./personal.nix
     ./desktop/plasma/default.nix
   ];
+  home.packages = with pkgs; [ prusa-slicer ];
   programs.plasma = lib.mkIf config.programs.plasma.enable {
-    configFile = {
+    configFile.kcminputrc."Libinput/1739/52759/SYNA32AA:00 06CB:CE17 Touchpad".NaturalScroll = true;
-      kcminputrc."Libinput/1739/52759/SYNA32AA:00 06CB:CE17 Touchpad".NaturalScroll = true;
   };
+  wayland.windowManager.sway = lib.mkIf config.wayland.windowManager.sway.enable {
+    config.workspaceOutputAssign = [
+      {
+        output = "eDP-1";
+        workspace = "1";
+      }
+    ];
   };
 }

home/Ronin.nix

@@ -1,12 +0,0 @@
-{ config, lib, ... }:
-{
-  imports = [
-    ./work.nix
-    ./desktop/plasma/default.nix
-  ];
-  programs.plasma = lib.mkIf config.programs.plasma.enable {
-    configFile = {
-      kcminputrc."Libinput/1160/4132/DELL0A21:00 0488:1024 Touchpad".NaturalScroll = true;
-    };
-  };
-}

home/Scorch.nix

@@ -0,0 +1,10 @@
+{ config, lib, ... }:
+{
+  imports = [
+    ./work.nix
+    ./desktop/plasma/default.nix
+  ];
+  wayland.windowManager.sway = lib.mkIf config.wayland.windowManager.sway.enable {
+    config.output."Dell Inc. DELL P3223QE CCG8YN3".scale = "1.5";
+  };
+}

home/Tone.nix

@@ -1,13 +1,56 @@
-{ pkgs, ... }:
+{ config, lib, ... }:
 {
   imports = [
     ./work.nix
     ./desktop/plasma/default.nix
   ];
-  xdg.configFile = {
+  programs.plasma = lib.mkIf config.programs.plasma.enable {
-    "autostart/twinkle.desktop".source = "${pkgs.twinkle}/share/applications/twinkle.desktop";
+    configFile = {
-    "autostart/teams-for-linux.desktop".source = "${pkgs.teams-for-linux}/share/applications/teams-for-linux.desktop";
+      kcminputrc."Libinput/1160/4132/DELL0A21:00 0488:1024 Touchpad".NaturalScroll = true;
-    "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
+    };
-    "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source = "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop";
+  };
+  wayland.windowManager.sway = lib.mkIf config.wayland.windowManager.sway.enable {
+    config = {
+      output."eDP-1".scale = "1.25";
+      workspaceOutputAssign = [
+        {
+          output = "eDP-1";
+          workspace = "1";
+        }
+      ];
+    };
+  };
+  services.kanshi = lib.mkIf config.wayland.windowManager.sway.enable {
+    enable = true;
+    settings =
+      let
+        laptopScreen = {
+          criteria = "eDP-1";
+          scale = 1.25;
+          position = "2560,576";
+        };
+        monitor = {
+          criteria = "Dell Inc. DELL P3223QE CCG8YN3";
+          scale = 1.5;
+          position = "0,0";
+        };
+      in
+      [
+        {
+          profile = {
+            name = "undocked";
+            outputs = [ laptopScreen ];
+          };
+        }
+        {
+          profile = {
+            name = "docked";
+            outputs = [
+              laptopScreen
+              monitor
+            ];
+          };
+        }
+      ];
   };
 }

home/Vanguard.nix

@@ -1,4 +1,9 @@
-{ pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 {
   imports = [
     ./personal.nix
@@ -7,9 +12,6 @@
     ./desktop/plasma/default.nix
   ];
   xdg.configFile = {
-    "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
-    "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source = "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop";
-    "autostart/webcord.desktop".source = "${pkgs.webcord}/share/applications/webcord.desktop";
     "autostart/org.kde.ktorrent.desktop".source = "${pkgs.kdePackages.ktorrent}/share/applications/org.kde.ktorrent.desktop";
   };
 }

home/default.nix

@@ -23,7 +23,10 @@
     whatsapp-for-linux
     teams-for-linux
   ];
-  xdg.configFile."teams-for-linux/config.json".text = builtins.toJSON {
+  xdg.configFile = {
+    "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
+    "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source = "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop";
+    "teams-for-linux/config.json".text = builtins.toJSON {
       awayOnSystemIdle = true;
       closeAppOnCross = true;
       followSystemTheme = true;
@@ -31,4 +34,5 @@
       optInTeamsV2 = true;
       spellCheckerLanguages = [ "en_GB" ];
     };
+  };
 }

home/personal.nix

@@ -8,4 +8,7 @@
     openscad
     kicad-small
   ];
+  xdg.configFile = {
+    "autostart/webcord.desktop".source = "${pkgs.webcord}/share/applications/webcord.desktop";
+  };
 }

home/work.nix

@@ -6,8 +6,8 @@
 }:
 {
   imports = [ ./default.nix ];
-  home.packages = [
+  home.packages = with pkgs; [
-    pkgs.twinkle
+    twinkle
     (import ./scripts/ukaea-vpn.nix pkgs)
   ];
   programs.git.userEmail = config.accounts.email.accounts.outlook.address;
@@ -15,4 +15,8 @@
     proton.primary = lib.mkForce false;
     outlook.primary = lib.mkForce true;
   };
+  xdg.configFile = {
+    "autostart/twinkle.desktop".source = "${pkgs.twinkle}/share/applications/twinkle.desktop";
+    "autostart/teams-for-linux.desktop".source = "${pkgs.teams-for-linux}/share/applications/teams-for-linux.desktop";
+  };
 }

system/Ronin.nix

@@ -1,26 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [
-    ./laptop.nix
-    ./desktop/plasma.nix
-  ];
-  boot.initrd = {
-    secrets = {
-      "/crypto_keyfile.bin" = null;
-    };
-    luks.devices."luks-761eeb11-3091-4142-9232-4fb33165eccd" = {
-      device = "/dev/disk/by-uuid/761eeb11-3091-4142-9232-4fb33165eccd";
-      keyFile = "/crypto_keyfile.bin";
-    };
-  };
-  environment = {
-    etc."ppp/options".text = ''
-      ipcp-accept-remote
-    '';
-    systemPackages = with pkgs; [ openfortivpn ];
-  };
-  services = {
-    samba.enable = true;
-    hardware.bolt.enable = true;
-  };
-}

system/Scorch.nix

@@ -0,0 +1,25 @@
+{ pkgs, ... }:
+{
+  imports = [ ./desktop/plasma.nix ];
+  boot = {
+    loader.efi.efiSysMountPoint = "/boot/efi";
+    initrd = {
+      secrets = {
+        "/crypto_keyfile.bin" = null;
+      };
+      luks.devices."luks-47d34268-5100-4eba-b34d-220f4239c1cb" = {
+        device = "/dev/disk/by-uuid/47d34268-5100-4eba-b34d-220f4239c1cb";
+        keyFile = "/crypto_keyfile.bin";
+      };
+    };
+  };
+  environment = {
+    etc."ppp/options".text = ''
+      ipcp-accept-remote
+    '';
+    systemPackages = with pkgs; [
+      openfortivpn
+      samba
+    ];
+  };
+}

system/Tone.nix

@@ -1,25 +1,26 @@
 { pkgs, ... }:
 {
-  imports = [ ./desktop/plasma.nix ];
+  imports = [
-  boot = {
+    ./laptop.nix
-    loader.efi.efiSysMountPoint = "/boot/efi";
+    ./desktop/plasma.nix
-    initrd = {
+  ];
+  boot.initrd = {
     secrets = {
       "/crypto_keyfile.bin" = null;
     };
-      luks.devices."luks-47d34268-5100-4eba-b34d-220f4239c1cb" = {
+    luks.devices."luks-761eeb11-3091-4142-9232-4fb33165eccd" = {
-        device = "/dev/disk/by-uuid/47d34268-5100-4eba-b34d-220f4239c1cb";
+      device = "/dev/disk/by-uuid/761eeb11-3091-4142-9232-4fb33165eccd";
       keyFile = "/crypto_keyfile.bin";
     };
   };
-  };
   environment = {
     etc."ppp/options".text = ''
       ipcp-accept-remote
     '';
-    systemPackages = with pkgs; [
+    systemPackages = with pkgs; [ openfortivpn ];
-      openfortivpn
+  };
-      samba
+  services = {
-    ];
+    samba.enable = true;
+    hardware.bolt.enable = true;
   };
 }

system/Vanguard.nix

@@ -15,6 +15,7 @@
     };
     steam-hardware.enable = true;
   };
+
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;

system/hardware-configuration/Scorch.nix

@@ -14,40 +14,35 @@
 
   boot.initrd.availableKernelModules = [
     "xhci_pci"
-    "thunderbolt"
+    "ahci"
-    "vmd"
-    "nvme"
-    "usbhid"
     "usb_storage"
+    "usbhid"
     "sd_mod"
-    "rtsx_pci_sdmmc"
   ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/44c11386-0af8-4954-93bc-963a8e071672";
+    device = "/dev/disk/by-uuid/0c6931d0-50c3-47b0-98c8-d295ddeb2004";
     fsType = "ext4";
   };
 
-  boot.initrd.luks.devices."luks-bf1eab3a-6d92-430d-a282-8dd4c9efe2c7".device = "/dev/disk/by-uuid/bf1eab3a-6d92-430d-a282-8dd4c9efe2c7";
+  boot.initrd.luks.devices."luks-08822b9c-e9d6-424c-bc75-373f8667526d".device = "/dev/disk/by-uuid/08822b9c-e9d6-424c-bc75-373f8667526d";
 
-  fileSystems."/boot" = {
+  fileSystems."/boot/efi" = {
-    device = "/dev/disk/by-uuid/85D5-B6EC";
+    device = "/dev/disk/by-uuid/6009-89FC";
     fsType = "vfat";
   };
 
-  swapDevices = [ { device = "/dev/disk/by-uuid/e65e5e4d-2084-4e6b-9255-3b36cba1529f"; } ];
+  swapDevices = [ { device = "/dev/disk/by-uuid/ff9627a7-820c-4628-a040-2b665688b893"; } ];
 
   # 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.enp0s13f0u1u2.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";

system/hardware-configuration/Tone.nix

@@ -14,35 +14,40 @@
 
   boot.initrd.availableKernelModules = [
     "xhci_pci"
-    "ahci"
+    "thunderbolt"
-    "usb_storage"
+    "vmd"
+    "nvme"
     "usbhid"
+    "usb_storage"
     "sd_mod"
+    "rtsx_pci_sdmmc"
   ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/0c6931d0-50c3-47b0-98c8-d295ddeb2004";
+    device = "/dev/disk/by-uuid/44c11386-0af8-4954-93bc-963a8e071672";
     fsType = "ext4";
   };
 
-  boot.initrd.luks.devices."luks-08822b9c-e9d6-424c-bc75-373f8667526d".device = "/dev/disk/by-uuid/08822b9c-e9d6-424c-bc75-373f8667526d";
+  boot.initrd.luks.devices."luks-bf1eab3a-6d92-430d-a282-8dd4c9efe2c7".device = "/dev/disk/by-uuid/bf1eab3a-6d92-430d-a282-8dd4c9efe2c7";
 
-  fileSystems."/boot/efi" = {
+  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/6009-89FC";
+    device = "/dev/disk/by-uuid/85D5-B6EC";
     fsType = "vfat";
   };
 
-  swapDevices = [ { device = "/dev/disk/by-uuid/ff9627a7-820c-4628-a040-2b665688b893"; } ];
+  swapDevices = [ { device = "/dev/disk/by-uuid/e65e5e4d-2084-4e6b-9255-3b36cba1529f"; } ];
 
   # 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.enp0s13f0u1u2.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";