change many thing

graphical/browser.nix

@@ -22,8 +22,7 @@ let
     Status = "locked";
   };
 in
-(scope "apps.browser" <| pkgs.firefox)
-// scope "programs.firefox" {
+scope "programs.firefox" {
   enable = true;
 
   policies = {
@@ -93,4 +92,3 @@ in
   # };
 }
 // (scope "apps.browser" <| pkgs.firefox)
-# )

graphical/desktop/quickshell/shell.qml

@@ -162,7 +162,7 @@ ShellRoot {
             }
 
             implicitHeight: 22
-            implicitWidth: Tags.keys.length * 13 + 24
+            implicitWidth: (Tags.keys.length !== undefined) ? Tags.keys.length * 13 + 24 : 37;
             // implicitWidth:.width + 24
             color: "transparent"
 

graphical/desktop/shell.nix

@@ -4,35 +4,24 @@
   inputs,
   mainUser,
   getPkgs,
-  getFlakePkg',
   ...
 }:
 let
-  inherit (lib) getExe getExe';
-  stable = inputs.nixpkgs-stable;
-  inherit (stable.legacyPackages.x86_64-linux) quickshell;
+  inherit (lib) getExe;
 in
 {
   user.packages = getPkgs {
     # quickshell stuff
     inherit (pkgs.kdePackages) qtbase qtdeclarative;
-    inherit (pkgs) wl-clipboard;
-    inherit quickshell;
+    inherit (pkgs) wl-clipboard quickshell;
   };
 
+  imports = [ inputs.stasis.nixosModules.default ];
+  services.stasis.enable = true;
+
   quick.services = {
     swaync = "${getExe pkgs.swaynotificationcenter}";
-    quickshell = "${getExe quickshell}";
-    swayidle =
-      let
-        niri = getFlakePkg' inputs.niri "niri-unstable";
-        systemctl = getExe' pkgs.systemd "systemctl";
-      in
-      ''
-        ${lib.getExe pkgs.swayidle} -w \
-          timeout 1800 '${systemctl} suspend' \
-          timeout 600 '${niri} msg action power-off-monitors'
-      '';
+    quickshell = "${getExe pkgs.quickshell}";
   };
 
   environment.files."/home/${mainUser}/.config/quickshell" = {

graphical/desktop/wm.nix

@@ -15,7 +15,9 @@ in
   imports = [
     inputs.niri.nixosModules.niri
     inputs.niri-tag.nixosModules.niri-tag
+    inputs.niri-s76.nixosModules.default
   ];
+
   user.desktops.niri = {
     enable = true;
     config =
@@ -70,5 +72,6 @@ in
     package = niri;
   };
   services.niri-tag.enable = true;
+  services.niri-s76-bridge.enable = true;
 
 }

graphical/dev.nix

@@ -24,7 +24,7 @@ scope "user" {
         };
         url = {
           "https://github.com/".insteadOf = "github:";
-          "https://git.atagen.co/atagen/".insteadOf = "atagen:";
+          "https://git.lobotomise.me/atagen/".insteadOf = "atagen:";
           "https://codeberg.org/".insteadOf = "codeberg:";
         };
         credential.helper = "rbw";
@@ -35,8 +35,4 @@ scope "user" {
     };
   };
 
-  packages = [
-    localPkgs.rbw-helper
-    (getFlakePkg' inputs.angrr "angrr-direnv")
-  ];
 }

graphical/input.nix

@@ -1,5 +1,4 @@
 _: {
   services.libinput.enable = true;
   console.useXkbConfig = true;
-  services.xserver.xkb.options = "caps:swapescape";
 }

graphical/kernel.nix

@@ -1,12 +1,37 @@
-{ pkgs, inputs, ... }:
+{ inputs, ... }:
 {
+
   imports = [
-    inputs.nyx.nixosModules.default
+    inputs.bunker.nixosModules.default
   ];
+
+  services.system76-scheduler.enable = true;
+
+  bunker.kernel = {
+    enable = true;
+    hardened = false;
+    cpuArch = "MZEN3";
+    version = "6.18";
+    lto = "none";
+    trimmed = true;
+  };
+
   services.scx = {
     enable = true;
     scheduler = "scx_bpfland";
   };
-  # boot.kernelPackages = pkgs.linuxPackages_cachyos-gcc;
-  boot.kernelPackages = pkgs.linuxPackages_xanmod;
+
+  # nixpkgs.overlays = [
+  #   (final: prev: {
+  #     nvidia-open = prev.nvidia-open.override {
+  #       patches = [
+  #         (pkgs.fetchpatch {
+  #           url = "https://github.com/CachyOS/CachyOS-PKGBUILDS/raw/refs/heads/master/nvidia/nvidia-utils/kernel-6.19.patch";
+  #           hash = "";
+  #         })
+  #       ];
+  #     };
+  #   })
+  # ];
+
 }

graphical/password-manager.nix

@@ -4,8 +4,8 @@
     generator = lib.generators.toJSON { };
     value = {
       email = "boss@atagen.co";
-      pinentry = lib.getExe pkgs.pinentry-qt;
-      base_url = "https://vault.atagen.co";
+      pinentry = lib.getExe pkgs.pinentry-qt; # TODO this is fugly
+      base_url = "https://vault.lobotomise.me";
     };
   };
 

graphical/platform-themes.nix

@@ -6,7 +6,7 @@
 
   qt = {
     enable = true;
-    style = "adwaita-dark";
+    # style = "adwaita-dark";
     # platformTheme = "gnome"; # broken in unstable ?
   };
 

graphical/rice.nix

@@ -59,10 +59,11 @@
     };
 
     plymouth = {
-      theme = "starship";
+      theme = "colorful_loop";
       font = "${config.rice.fonts.sans.package}/share/fonts/truetype/MSW98UI-Regular.ttf";
       themePackages = [
-        (getFlakePkg inputs.hudcore)
+        pkgs.adi1090x-plymouth-themes
+        # (getFlakePkg inputs.hudcore)
       ];
     };
   };

graphical/startup.nix

@@ -0,0 +1,5 @@
+{ pkgs, lib, ... }:
+{
+  quick.services.startup-sound = "${lib.getExe' pkgs.alsa-utils "aplay"} " + ../assets/startup.wav;
+  # FIXME broken , maybe use niri exec-once ..
+}