recombine laptop+pc config

graphical/boot.nix

@@ -1,40 +1,9 @@
-{ config, scope, ... }:
-let
-  inherit (config) rice;
-in
+{
+  config,
+  scope,
+  ...
+}:
 scope "boot" {
   tmp.useTmpfs = true;
-
   initrd.systemd.enable = true;
-
-  loader.limine = {
-    enable = true;
-    style =
-      let
-        pal = rice.palette.shortHex;
-      in
-      {
-        wallpapers = [ rice.bg.src ];
-        interface = {
-          brandingColor = 1;
-          branding = "welcome to quiver";
-        };
-        graphicalTerminal =
-          let
-            getPal = p: builtins.attrValues p |> builtins.concatStringsSep ";";
-          in
-          {
-            palette = getPal pal.normal;
-            brightPalette = getPal pal.bright;
-            marginGradient = 0;
-            margin = 256;
-            foreground = pal.util.fg;
-            background = "20" + pal.util.bg;
-            brightForeground = pal.bright.yellow;
-            brightBackground = pal.util.bg;
-          };
-        backdrop = pal.util.bg;
-      };
-    maxGenerations = 5;
-  };
 }

graphical/desktop/quickshell/shell.qml

@@ -15,7 +15,7 @@ ShellRoot {
 
     // bg
     Variants {
-        model: Quickshell.screens.filter(s => s.name == "DP-2")
+        model: Quickshell.screens
         delegate: PanelWindow {
             id: bg
             anchors {
@@ -29,8 +29,8 @@ ShellRoot {
 
             Image {
                 asynchronous: true
-                width: 2560
-                height: 1440
+                width: bg.width
+                height: bg.height
                 source: "assets/pathway-m-rework.png"
             }
         }
@@ -38,7 +38,7 @@ ShellRoot {
     
     // rhs main
     Variants {
-        model: Quickshell.screens.filter(s => s.name == "DP-2")
+        model: Quickshell.screens
         delegate: PanelWindow {
             id: bink
             property var modelData
@@ -80,7 +80,7 @@ ShellRoot {
 
     // centre main
     Variants {
-        model: Quickshell.screens.filter(s => s.name == "DP-2")
+        model: Quickshell.screens
         delegate: PanelWindow {
             id: windowTitle
             property var modelData
@@ -144,7 +144,7 @@ ShellRoot {
 
     // bottom middle main
     Variants {
-        model: Quickshell.screens.filter(s => s.name == "DP-2")
+        model: Quickshell.screens
         delegate: PanelWindow {
             id: tags
             property var modelData

graphical/network.nix

@@ -13,8 +13,4 @@
   };
   services.mullvad-vpn.enable = true;
 
-  environment.systemPackages = [ pkgs.ciscoPacketTracer8 ];
-  nixpkgs.config.permittedInsecurePackages = [
-    "libxml2-2.13.8"
-  ];
 }

graphical/shell.nix

@@ -12,17 +12,10 @@ let
 in
 {
   # quickshell stuff
-  user.packages =
-    getPkgs {
-      inherit (pkgs.kdePackages) qtbase qtdeclarative;
-      inherit (pkgs) wl-clipboard;
-    }
-    ++ [
-      (inputs.quickshell.packages.${pkgs.system}.default.override {
-        withHyprland = false;
-        withI3 = false;
-      })
-    ];
+  user.packages = getPkgs {
+    inherit (pkgs.kdePackages) qtbase qtdeclarative;
+    inherit (pkgs) wl-clipboard quickshell;
+  };
 
   systemd.user.services.quickshell = {
     path = [ inputs.niri.packages.${pkgs.system}.niri-unstable ];
@@ -37,10 +30,7 @@ in
       ];
     };
     wantedBy = [ "graphical-session.target" ];
-    serviceConfig.ExecStart = "${getExe' (inputs.quickshell.packages.${pkgs.system}.default.override {
-      withHyprland = false;
-      withI3 = false;
-    }) "qs"}";
+    serviceConfig.ExecStart = "${getExe pkgs.quickshell}";
   };
 
   quick.services = {