meow

.sops.yaml

@@ -9,3 +9,5 @@ creation_rules:
       - "age1x3lahhkefkap67cdmdjcqaxan9hp62er78akr79v9m73nvgugpeqk0y32a" # laptop-user-doloro
       - "age1exzngtk4d9vcsmcq6ap5xx3ca9qacqjkrv86ymged7msx9z6vfyqsf5sjq" # laptop-system
       - "age1fw4xnh2q52juce94ffn54js708cr6umfwpv0mykuddkea7kr4f0q7a9h05" # rpi5
+      - "age1pa8cecxaw4y4zea6zjnt0k0mz38g4qunmp6trwy5fvdvw88ttcgsv2dgrv" # laptop-surface-user-doloro
+      - "age1kc0xu0ue2nrrr7w4gam7wlzackv8jv243rxwwndgxjqklgtnp5csdtpgzp" # laptop-surface-system

config/hosts/aspects/doloro-desktop/home.nix

@@ -30,6 +30,11 @@
       modules.stylix
       modules.quickshell
       modules.nix-ld
+      modules.spotify
+      modules.easyeffects
+      modules.lavd
+      modules.ai
+      <modules/ai/ollama-cuda>
     ];
     nixos =
       { config, pkgs, ... }:
@@ -38,8 +43,6 @@
           shell = pkgs.fish;
           hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path;
         };
-        boot.kernelPackage =
-          inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-lts-lto;
       };
     homeManager =
       { home, pkgs, ... }:
@@ -65,10 +68,11 @@
           equibop
           telegram-desktop
           obsidian
-          pear-desktop
+          # pear-desktop
           prismlauncher
           deadlock-mod-manager
           gamescope
+          android-studio
         ];
         nixpkgs.config.allowUnfree = true;
         programs.home-manager.enable = true;

config/hosts/aspects/doloro-desktop/host.nix

@@ -2,7 +2,9 @@
   den,
   modules,
   pkgs,
+  inputs,
   __findFile,
+  lib,
   ...
 }:
 {
@@ -25,6 +27,7 @@
         networking.hostName = "doloroo-main"; # Define your hostname.
 
         boot.kernelPackages = pkgs.linuxPackages_latest;
+
         boot.initrd.verbose = false;
         boot.kernelParams = [
           "boot.shell_on_fail"
@@ -80,14 +83,14 @@
           # supported GPUs is at:
           # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
           # Only available from driver 515.43.04+
-          open = false;
+          open = true;
 
           # Enable the Nvidia settings menu,
           # accessible via `nvidia-settings`.
           nvidiaSettings = true;
 
           # Optionally, you may need to select the appropriate driver version for your specific GPU.
-          package = config.boot.kernelPackages.nvidiaPackages.latest;
+          package = config.boot.kernelPackages.nvidiaPackages.stable;
         };
 
       };

config/hosts/aspects/doloro-laptop/disko.nix

@@ -35,7 +35,7 @@
                     };
                   };
                   plainSwap = {
-                    size = "48G";
+                    size = "24G";
                     content = {
                       type = "swap";
                       discardPolicy = "both"; # Both "once" and page discard policies

config/hosts/aspects/doloro-laptop/hardware.nix

@@ -16,20 +16,22 @@
       }:
       {
         imports = [
-          (modulesPath + "/installer/scan/not-detected.nix")
+          # (modulesPath + "/hardware/cpu/intel-npu.nix")
-        ];
+          # (modulesPath + "/installer/scan/not-detected.nix")
-        boot.initrd.availableKernelModules = [
-          "xhci_pci"
-          "thunderbolt"
-          "vmd"
-          "nvme"
         ];
+        # boot.initrd.availableKernelModules = [
+        #   "xhci_pci"
+        #   "thunderbolt"
+        #   "vmd"
+        #   "nvme"
+        # ];
         boot.initrd.kernelModules = [ ];
-        boot.kernelModules = [ "kvm-intel" ];
+        # boot.kernelModules = [ "kvm-intel" ];
         boot.extraModulePackages = [ ];
 
-        nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+        nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
-        hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+        # hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+        # hardware.cpu.intel.npu.enable = true;
       };
   };
 }

config/hosts/aspects/doloro-laptop/home.nix

@@ -20,6 +20,9 @@
       modules.kitty
       modules.stylix
       modules.quickshell
+      modules.lavd
+      # modules.podman
+      # modules.openvivo
     ];
     nixos =
       { config, pkgs, ... }:
@@ -34,9 +37,9 @@
       { pkgs, ... }:
       {
         wayland.windowManager.hyprland.settings = {
-          monitor = [
+          # monitor = [
-            "eDP-1, 2880x1800@120, 0x0, 2"
+          #   "eDP-1, 2880x1800@120, 0x0, 2"
-          ];
+          # ];
           input = {
             kb_layout = "gb";
             follow_mouse = 2;
@@ -55,6 +58,9 @@
           telegram-desktop
           equibop
           obsidian
+          # intel-gpu-tools
+          brightnessctl
+          surface-control
         ];
         nixpkgs.config.allowUnfree = true;
       };

config/hosts/aspects/doloro-laptop/host.nix

@@ -2,6 +2,7 @@
   den,
   modules,
   __findFile,
+  inputs,
   lib,
   ...
 }:
@@ -10,22 +11,34 @@
     includes = [
       modules.nix
       modules.tuigreet
-      <modules/common/laptop-power-management>
+      # <modules/common/laptop-power-management>
       modules.fonts
-      (modules.tdp {
+      modules.surface-patches
-        batt = {
+      modules.nikpkgs
-          cpu = {
+      modules.auto-cpufreq
-            long-term = 10;
+      modules.tlp
-            short-term = 15;
+      # (modules.tdp {
-          };
+      #   batt = {
-        };
+      #     cpu = {
-        ac = {
+      #       long-term = 13;
-          cpu = {
+      #       short-term = 7;
-            long-term = 120;
+      #     };
-            short-term = 120;
+      #     mmio = {
-          };
+      #       long-term = 10;
-        };
+      #       short-term = 7;
-      })
+      #     };
+      #   };
+      #   ac = {
+      #     cpu = {
+      #       long-term = 120;
+      #       short-term = 120;
+      #     };
+      #     mmio = {
+      #       long-term = 40;
+      #       short-term = 20;
+      #     };
+      #   };
+      # })
     ];
     nixos =
       { pkgs, config, ... }:
@@ -33,17 +46,31 @@
         # Use the systemd-boot EFI boot loader.
         boot.loader.systemd-boot.enable = true;
         boot.loader.efi.canTouchEfiVariables = true;
+        services.upower.enable = true;
         # boot.kernelPackages = pkgs.linuxPackages_6_12; # Hibernate works on 6.12 but not on latest
-        boot.kernelPackages = pkgs.linuxPackages_latest; # Unpinned the linux version for now.. as i am not using hibernate that often
+        # boot.kernelPackages = pkgs.linuxPackages_latest; # Unpinned the linux version for now.. as i am not using hibernate that often
+        # boot.kernelPackages =
+        #   inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-latest-lto-x86_64-v3;
         networking.hostName = "doloro-nixos-laptop"; # Define your hostname.
-        security.rtkit.enable = true;
+        # security.rtkit.enable = true;
 
         # Configure network connections interactively with nmcli or nmtui.
         networking.networkmanager.enable = true;
 
+        boot.initrd = {
+          systemd = {
+            enable = true;
+            emergencyAccess = true;
+            tpm2.enable = false;
+          };
+        };
+        systemd.units."dev-tpm0.device".enable = false;
+        systemd.units."dev-tpmrm0.device".enable = false;
+
         # Set your time zone.
         # time.timeZone = "Europe/London";
         services.automatic-timezoned.enable = true;
+        networking.wireless.iwd.enable = false;
 
         nix.settings = {
           substituters = [
@@ -64,25 +91,27 @@
           ];
         };
 
-        services.gnome.gnome-keyring.enable = true;
+        # services.gnome.gnome-keyring.enable = true;
 
+        nixpkgs.config.packageOverrides = pkgs: {
+          intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
+        };
         hardware = {
           # firmware = [ pkgs.intel-npu-driver ];
-          cpu.intel = {
-            # npu.enable = true;
-          };
           graphics = {
             enable = true;
-            # https://github.com/intel/libvpl?tab=readme-ov-file#dispatcher-behavior-when-targeting-intel-gpus
             extraPackages = with pkgs; [
-              vpl-gpu-rt
-              intel-media-driver # VA-API (iHD) userspace
-              intel-vaapi-driver
-              # vpl-gpu-rt # oneVPL (QSV) runtime
-              intel-compute-runtime # OpenCL (NEO) + Level Zero for Arc/Xe
             ];
           };
         };
+        environment.sessionVariables = {
+          LIBVA_DRIVER_NAME = "iHD";
+        }; # Force intel-media-driver
+
+        # services.fwupd = {
+        #   enable = true;
+        # };
+
         services.openssh = {
           enable = true;
           settings = {
@@ -112,7 +141,7 @@
 
         services.libinput.enable = true;
 
-        boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+        # boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
         # Define a user account. Don't forget to set a password with ‘passwd’.
         # users.users.doloro = {
         # isNormalUser = true;
@@ -141,15 +170,23 @@
         boot.kernelParams = [
           # "mem_sleep_default=deep"
           # "i915.fastboot=1"
-          "ahci.mobile_lpm_policy=1"
+          # "i915.modeset=1"
-          "intel_idle.max_cstate=11"
+          # "ahci.mobile_lpm_policy=1"
+          # "intel_idle.max_cstate=10"
+          "processor.max_cstate=10"
+          "pci=noaer"
+          # "quiet"
+          # "splash"
           # "idle=halt"
         ];
+        boot.binfmt.emulatedSystems = [
+          "x86_64-linux"
+        ];
 
         services.logind.settings.Login = {
-          HandleLidSwitch = "suspend";
+          # HandleLidSwitch = "suspend";
-          HandleLidSwitchExternalPower = "suspend";
+          # HandleLidSwitchExternalPower = "suspend";
-          HandleLidSwitchDocked = "ignore";
+          # HandleLidSwitchDocked = "ignore";
         };
         # systemd.sleep.extraConfig = ''
         #       HibernateDelaySec=30min

config/hosts/computers.nix

@@ -7,10 +7,11 @@
 {
   # Homes
   den.homes.x86_64-linux.doloro-desktop = {
+    aspect = "doloro-desktop";
     userName = "doloro";
   };
   # TODO
-  den.homes.x86_64-linux.doloro-laptop = {
+  den.homes.aarch64-linux.doloro-laptop = {
     userName = "doloro";
   };
   # Machines
@@ -21,7 +22,7 @@
     };
   };
   # TODO
-  den.hosts.x86_64-linux.laptop = {
+  den.hosts.aarch64-linux.laptop = {
     users.doloro = {
       aspect = "doloro-laptop";
       home-manager.enable = true;

config/inputs.nix

@@ -5,6 +5,6 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    den.url = "github:vic/den";
+    den.url = "github:vic/den?ref=8101ec865c0bf4027d40b9fd8951e3e435a86d64";
   };
 }

config/modules/ai/ai.nix

@@ -0,0 +1,19 @@
+{ den, modules, ... }:
+{
+  modules.ai = {
+    provides = {
+      ollama-cuda = {
+        homeManager =
+          { pkgs, ... }:
+          {
+            home.packages = [ pkgs.ollama-cuda ];
+          };
+      };
+    };
+    homeManager =
+      { pkgs, ... }:
+      {
+        home.packages = [ pkgs.opencode ];
+      };
+  };
+}

config/modules/cachyos-kernel.nix

@@ -9,4 +9,11 @@
     nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
   };
   # inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-lts-lto;
+  modules.cachyos-kernel = {
+    nixos = {
+      nixpkgs.overlays = [
+        inputs.nix-cachyos-kernel.overlays.pinned
+      ];
+    };
+  };
 }

config/modules/easyeffects.nix

@@ -0,0 +1,8 @@
+{ den, modules, ... }:
+{
+  modules.easyeffects = {
+    homeManager = {
+      services.easyeffects.enable = true;
+    };
+  };
+}

config/modules/helium.nix

@@ -3,6 +3,7 @@
   modules,
   inputs,
   lib,
+  stdenv,
   ...
 }:
 {
@@ -14,10 +15,10 @@
   };
   modules.helium = settings: {
     homeManager =
-      { pkgs, home, ... }:
+      { pkgs, ... }:
       {
         home.packages = [
-          inputs.heliumFlake.packages.x86_64-linux.helium
+          inputs.heliumFlake.packages.${pkgs.stdenv.hostPlatform.system}.helium
         ];
         nixpkgs.config.allowUnfree = true;
         # Gives me widevine support. yay

config/modules/hyprland/doloro-settings.nix

@@ -14,6 +14,9 @@
               pkgs.wlogout
               pkgs.tofi
               pkgs.killall
+              pkgs.grim
+              pkgs.slurp
+              pkgs.wayclip
             ];
             home.pointerCursor = {
               enable = true;
@@ -26,7 +29,6 @@
                 "XCURSOR_THEME,BreezeX-RosePine-Linux"
                 "XCURSOR_SIZE,24"
                 "HYPRCURSOR_SIZE,24"
-                "LIBVA_DRIVER_NAME,nvidia"
                 "__GLX_VENDOR_LIBRARY_NAME,nvidia"
                 "WEBKIT_DISABLE_DMABUF_RENDERER,1" # maybe disable if nixos fixes alcom
               ];
@@ -142,8 +144,12 @@
                 "$mainMod, down, movefocus, d"
                 "$mainMod, L, exec, wlogout"
                 (
-                  "$mainMod, S, exec, "
+                  let
-                  + ''wayfreeze --after-freeze-cmd 'grim -g "$(slurp -d)" - | wl-copy -t image/png;killall wayfreeze' --hide-cursor''
+                    script = pkgs.writeShellScript "meow" ''
+                      										fish -c 'grim -g $(slurp) -t png - &| wl-copy -t image/png; killall wayfreeze'
+                      																																'';
+                  in
+                  "$mainMod, S, exec, " + "wayfreeze --after-freeze-cmd '${script}'"
                 )
                 "$mainMod, F, fullscreen"
                 "$mainMod, mouse_down, workspace, e+1"

config/modules/hyprland/hyprland.nix

@@ -32,9 +32,8 @@
         };
         # gtk.enable = lib.mkForce false;
         xdg.portal = {
-          enable = lib.mkForce false;
+          enable = true;
           extraPortals = [
-            pkgs.xdg-desktop-portal-termfilechooser
             inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland
           ];
         };

config/modules/hyprland/wlsunset.nix

@@ -0,0 +1,14 @@
+{ den, modules, ... }:
+{
+  modules.wlsunset = {
+    homeManager =
+      { pkgs, ... }:
+      {
+        systemd.user.services = {
+          wlsunset = {
+
+          };
+        };
+      };
+  };
+}

config/modules/nikpkgs.nix

@@ -0,0 +1,19 @@
+{
+  den,
+  modules,
+  inputs,
+  ...
+}:
+{
+  flake-file.inputs = {
+    nik-pkgs = {
+      url = "git+https://git.scug.io/nikkuss/pkgs.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+  modules.nikpkgs = {
+    nixos = {
+      nixpkgs.overlays = [ inputs.nik-pkgs.overlays.default ];
+    };
+  };
+}

config/modules/nixvim/default.nix

@@ -1,6 +1,7 @@
 {
   den,
   modules,
+  lib,
   inputs,
   ...
 }:
@@ -9,11 +10,15 @@
   flake-file.inputs = {
     nixvim = {
       url = "github:nix-community/nixvim";
-      inputs.nixpkgs.follows = "nixpkgs";
+      # inputs.nixpkgs.follows = "nixpkgs";
     };
   };
   modules = {
     nixvim = {
+      nixos =
+        { home-manager, ... }:
+        {
+        };
       homeManager =
         { pkgs, ... }:
         {
@@ -23,6 +28,11 @@
           programs.nixvim = {
             enable = true;
             defaultEditor = true;
+            nixpkgs = {
+              config = {
+                allowUnfree = true;
+              };
+            };
             colorschemes.gruvbox-material.enable = true;
             extraPackages = with pkgs; [
               # formatters
@@ -45,6 +55,7 @@
               todo-comments.enable = true;
               lsp-status.enable = true;
               transparent.enable = true;
+              which-key.enable = true;
               conform-nvim = {
                 enable = true;
                 settings = {
@@ -63,6 +74,15 @@
                   };
                 };
               };
+              # efmls-configs = {
+              #   enable = true;
+              #   languages = {
+              #     scss = {
+              #       formatter = "prettier";
+              #       linter = "stylelint";
+              #     };
+              #   };
+              # };
               lsp = {
                 enable = true;
                 servers = {
@@ -86,6 +106,7 @@
                   ts_ls = {
                     enable = true;
                   };
+                  cssls.enable = true;
                   svelte.enable = true;
                 };
               };
@@ -199,6 +220,7 @@
                   vimdoc
                   xml
                   yaml
+                  svelte
                 ];
                 settings = {
                   highlight.enable = true;

config/modules/openvivo.nix

@@ -0,0 +1,35 @@
+{
+  den,
+  modules,
+  lib,
+  ...
+}:
+{
+  modules.openvivo = {
+    nixos =
+      { pkgs, ... }:
+      let
+        llama = pkgs.fetchFromGitHub ({
+          owner = "ravi9";
+          repo = "llama.cpp";
+          rev = "1117e77";
+          hash = "sha256-7NMhKGxfutZ7i16ra3EA4pYEnLl0S23E6TFY7IhVPXU=";
+        });
+      in
+      {
+        virtualisation.oci-containers.backend = "podman";
+        virtualisation.oci-containers.containers = {
+          openvino = {
+            image = "openvino:latest";
+            imageFile = pkgs.dockerTools.buildImage {
+              name = "openvino";
+              tag = "latest";
+              fromImage = "${llama}/.devops/openvino.Dockerfile";
+            };
+            autoStart = true;
+            ports = [ "127.0.0.1:1234:1234" ];
+          };
+        };
+      };
+  };
+}

config/modules/podman.nix

@@ -0,0 +1,22 @@
+{ den, modules, ... }:
+{
+  modules.podman = {
+    nixos =
+      { ... }:
+      {
+        virtualisation = {
+          containers.enable = true;
+          podman = {
+            enable = true;
+            dockerCompat = true;
+            defaultNetwork.settings = {
+              dns_enabled = true;
+            };
+          };
+        };
+        users.users."doloro" = {
+          extraGroups = [ "podman" ];
+        };
+      };
+  };
+}

config/modules/power-management/common.nix

@@ -7,11 +7,12 @@
         modules.battery-ac-targets
         modules.intel-mgm
         modules.tlp
-        modules.lavd
+        modules.rfkill-sleep
         # modules.ppd
       ];
       nixos = {
         services.upower.enable = true;
+        services.thermald.enable = true;
       };
     };
   };

config/modules/power-management/flash.nix

@@ -0,0 +1,22 @@
+{ modules, den, ... }:
+{
+  modules.flash = {
+    nixos = {
+      services.scx = {
+        enable = true;
+        ## Commented out because the service impl is bugged and doesnt actually set these
+        # scheduler = "scx_lavd";
+        # extraArgs = [
+        #   "--cpu-pref-order 20-21,12-19,0-11"
+        #   "--autopilot"
+        # ];
+      };
+      # Most energy efficent scheduler setup..
+      systemd.services.scx.environment = {
+        SCX_SCHEDULER_OVERRIDE = "scx_flash";
+        # Flags are from cachyos sched-ext tutorial
+        SCX_FLAGS_OVERRIDE = "-m powersave -I 10000 -t 1000 -s 10000 -S 1000";
+      };
+    };
+  };
+}

config/modules/power-management/intel-gpu-management.nix

@@ -6,12 +6,12 @@
       { pkgs, ... }:
       let
         batt-gpu = pkgs.writeShellScript "batt-igpu" ''
-              ${pkgs.intel-gpu-tools}/bin/intel_gpu_frequency -e
+                    ${pkgs.intel-gpu-tools}/bin/intel_gpu_frequency -e;
-          		echo "800" > /sys/class/drm/card1/gt_boost_freq_mhz
+          					echo '1250' > /sys/class/drm/card1/gt_boost_freq_mhz;
         '';
         ac-gpu = pkgs.writeShellScript "ac-igpu" ''
-              ${pkgs.intel-gpu-tools}/bin/intel_gpu_frequency -d
+                    ${pkgs.intel-gpu-tools}/bin/intel_gpu_frequency -d;
-          		echo "2350" > /sys/class/drm/card1/gt_boost_freq_mhz
+          					echo '2350' > /sys/class/drm/card1/gt_boost_freq_mhz;
         '';
       in
       {

config/modules/power-management/lavd.nix

@@ -1,21 +1,25 @@
 { modules, den, ... }:
 {
   modules.lavd = {
-    nixos = {
+    nixos =
-      services.scx = {
+      { pkgs, ... }:
-        enable = true;
+      {
-        ## Commented out because the service impl is bugged and doesnt actually set these
+        nixpkgs.config.allowUnsupportedSystem = true;
-        # scheduler = "scx_lavd";
+        services.scx = {
-        # extraArgs = [
+          enable = true;
-        #   "--cpu-pref-order 20-21,12-19,0-11"
+          package = pkgs.scx.rustscheds;
-        #   "--autopilot"
+          ## Commented out because the service impl is bugged and doesnt actually set these
-        # ];
+          # scheduler = "scx_lavd";
+          # extraArgs = [
+          #   "--cpu-pref-order 20-21,12-19,0-11"
+          #   "--autopilot"
+          # ];
+        };
+        # Most energy efficent scheduler setup..
+        systemd.services.scx.environment = {
+          SCX_SCHEDULER_OVERRIDE = "scx_lavd";
+          SCX_FLAGS_OVERRIDE = "--powersave --cpu-pref-order=0-4,5-11";
+        };
       };
-      # Most energy efficent scheduler setup..
-      systemd.services.scx.environment = {
-        SCX_SCHEDULER_OVERRIDE = "scx_lavd";
-        SCX_FLAGS_OVERRIDE = "--powersave --per-cpu-dsq";
-      };
-    };
   };
 }

config/modules/power-management/rfkill-sleep.nix

@@ -0,0 +1,26 @@
+{ den, modules, ... }:
+{
+  modules.rfkill-sleep = {
+    nixos =
+      { pkgs, ... }:
+      {
+        # My laptop doesn't like having connectivity when it goes to sleep, it burns through battery
+        systemd.services.sleep-rfkill = {
+          description = "Custom suspend/resume hook";
+          wantedBy = [ "sleep.target" ];
+          before = [ "sleep.target" ];
+          serviceConfig = {
+            Type = "oneshot";
+            # Command to run BEFORE system suspends
+            ExecStart = "${pkgs.util-linux}/bin/rfkill block all";
+            # Command to run AFTER system resumes
+            ExecStop = "${pkgs.util-linux}/bin/rfkill unblock all";
+            RemainAfterExit = true;
+          };
+          unitConfig = {
+            StopWhenUnneeded = true;
+          };
+        };
+      };
+  };
+}

config/modules/power-management/tdp.nix

@@ -8,16 +8,30 @@
           					${pkgs.powercap}/bin/powercap-set intel-rapl -z 0 -c 0 -l ${
                  toString (settings.batt.cpu.long-term * 1000000)
                }
-          					${pkgs.powercap}/bin/powercap-set intel-rapl -z 0 -c 0 -l ${
+          					${pkgs.powercap}/bin/powercap-set intel-rapl -z 0 -c 1 -l ${
                  toString (settings.batt.cpu.short-term * 1000000)
+               }
+
+          					${pkgs.powercap}/bin/powercap-set intel-rapl-mmio -z 0 -c 0 -l ${
+                 toString (settings.batt.mmio.long-term * 1000000)
+               }
+          					${pkgs.powercap}/bin/powercap-set intel-rapl-mmio -z 0 -c 1 -l ${
+                 toString (settings.batt.mmio.short-term * 1000000)
                }
         '';
         ac-tdp = pkgs.writeShellScript "ac-cpu-tdp" ''
           					${pkgs.powercap}/bin/powercap-set intel-rapl -z 0 -c 0 -l ${
                  toString (settings.ac.cpu.long-term * 1000000)
                }
-          					${pkgs.powercap}/bin/powercap-set intel-rapl -z 0 -c 0 -l ${
+          					${pkgs.powercap}/bin/powercap-set intel-rapl -z 0 -c 1 -l ${
                  toString (settings.ac.cpu.short-term * 1000000)
+               }
+
+          					${pkgs.powercap}/bin/powercap-set intel-rapl-mmio -z 0 -c 0 -l ${
+                 toString (settings.batt.mmio.long-term * 1000000)
+               }
+          					${pkgs.powercap}/bin/powercap-set intel-rapl-mmio -z 0 -c 1 -l ${
+                 toString (settings.batt.mmio.short-term * 1000000)
                }
         '';
       in

config/modules/power-management/tlp.nix

@@ -16,9 +16,6 @@
           # SATA drive power management
           SATA_LINKPWR_ON_BAT = "min_power";
 
-          # PCI Express Active-State Power Management (ASPM)
-          PCIE_ASPM_ON_BAT = "powersupersave";
-
           RUNTIME_PM_ON_AC = "auto";
           RUNTIME_PM_ON_BAT = "auto";
 
@@ -27,17 +24,19 @@
 
           # Restore brightness on battery
           RESTORE_BRIGHTNESS_ON_BAT = "1";
-          PCIE_ASPM_ON_AC = "balanced";
+          PCIE_ASPM_ON_AC = "default";
+          PCIE_ASPM_ON_BAT = "powersave";
           DEVICES_TO_DISABLE_ON_BAT_NOT_IN_USE = "bluetooth";
           INTEL_GPU_MAX_FREQ_ON_AC = 0;
           INTEL_GPU_MAX_FREQ_ON_BAT = 800;
           INTEL_GPU_BOOST_FREQ_ON_AC = 0;
-          INTEL_GPU_BOOST_FREQ_ON_BAT = 800;
+          INTEL_GPU_BOOST_FREQ_ON_BAT = 1250;
+          INTEL_GPU_POWER_PROFILE_ON_BAT = "power_saving";
 
           # CPU_MAX_PERF_ON_BAT = 30;
 
           # CPU_SCALING_GOVERNOR_ON_AC = "performance";
-          # CPU_SCALING_GOVERNOR_ON_BAT = "schedutil";
+          CPU_SCALING_GOVERNOR_ON_BAT = "schedutil";
           # CPU_HWP_DYN_BOOST_ON_AC = "1";
           # CPU_HWP_DYN_BOOST_ON_BAT = "0";
           # CPU_ENERGY_PERF_POLICY_ON_BAT = "power";

config/modules/secrets/content/secrets.yaml

@@ -8,47 +8,65 @@ sops:
         - recipient: age1ykcy2r4kk729e7adqxu8s24ujc60z5eux7ma0ca4ruzydwgm5p6qmdp838
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzdGQ5ZHUxUHE4YXF0bllY
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiZC9ZVlY2T0tXdy90b2hV
-            dTRsYWc4cllmWEgveGVTLzUvRzJuc0FtUEdvCkNURmxmMnhkaExZcVVNRmRNU1p6
+            dDUxUjNyMjllQStaa0tKRy9YVkNIdFJyWTI4CitYNnhxN3JHQ3lsWXp2Tmgwek9n
-            UitMYUxNMXgzZC84S3J0SHR4aFV5TGcKLS0tIFB3Skx6UlFDcVJFSlhTd1NRbUl2
+            Qzk1RUExZk5WcnlvUWptcmFQTFJNbWMKLS0tIFBtSkJOZUovTUxYeFZ3cnJ2Ukw0
-            VGQ3OUpDY0JVaEUyYStHQU83Q1hDYTAKeRgXVA8iWGO8cMMlvBFWGMVIZnaLCpsZ
+            MkVQY3h2OGhGaGNnYkVJUU1kK3F3VWMKs9B74KovGxx8KL5q/lGA/imVRM/i3mo/
-            hBjWlxG6oUlCNnO+cyckU3jSTecc+z+EIuseFt710nN5uRJeKs2MlA==
+            a6Rbxufscp3WWGMbo70w8tWuRsAnIpUGh3EvWCekZ9nOzeMiVA8I2Q==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1e6vws55p0g23qzthm4qa93hpt6lqmck6670gkygph0sc0j7my4uq5wqjfh
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtM0wvV3pHTUZYdlhPWnU0
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0dXJzYndvSC92aElvTVpz
-            VElBbDI2bUJhQUVCMlBPNjNzOE9tTXJGelI0CjBEdmhWTGlyc2VhODRnbHE3ZGdC
+            SUtTOWFzcUJxOHVrTk5scm5tcGkzRmEvK1hVClNVbmp3ZjBRTW5ZNXVNNGh3dSti
-            WUoyWU0zcU5BbXhGdm5sVEZHdS80bkkKLS0tIHhpcFZQdkl6eHRUTGhZYmVOSCtz
+            RzdCcTFlVlBld1kwNnR6dVhtcllVMFkKLS0tIG1YK2dLcWdVU3dLUFFlOUtzb3Ex
-            RE8zeFl2ZVgyWVBsRmhlUElybXEwSEEKEhvMUClOOoN3RdzVOFBIPt7rMrukla1t
+            Tk5Zd0h3OHRpQzZjazJKUStPUVdERzQKGnoKYKq7pPJUrcAWJ4/tm8mSxuthjssz
-            bVWGKX5e3p/EtK7aYzdBxYYvml+TNUD1n5TpTFhcnH2Jwpey8thz2Q==
+            7IsjH4t6VCyug2c7XnLJpcE64yPD+GrXHYixP0r2qj80WMjpv7N7qA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1x3lahhkefkap67cdmdjcqaxan9hp62er78akr79v9m73nvgugpeqk0y32a
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0ODRGRkE3a09MS3Z0QXNm
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLbGQ3MkVCUldqa3dYRTg0
-            OTBlb2JEV28vTmxhcjM5aFpYbVhYM0wyZkd3CmszblZWVEFkVlMwQ1FMZitBd0Rp
+            NjVoUDdIc0RvSU02R0o0ZVk4KzVQMkZmeXpjClJaUUU3WTJVQmJkRzV4UTc3bXFI
-            MkZpZGViSHlHSko4Tk9rZGNHaWpGWncKLS0tIC9xY1dBSncvQnhHTlhhaEpUK3ZI
+            dmJsV0VhNmdvdVNaaUFTNWcwd1l3eGsKLS0tIG1Gc3FlNVduaXUybUFnSGF4T3lu
-            Tjgwd0VuVGtjaTdaSE5ERmRIa1dVNEkKkN0vp7xDWCnu4aq8VQu5y8Q/6xsFKhCQ
+            QzhtM3V3VGFzdk9UenV6akxGNDh5d3cKdIKNPvM0GRJamiS4AXRNU+TbuZUnM6K7
-            ivMqQsqoOBvXSynu7hbNpcGvAsmDHDGcC2b/C9Mkt42OclSYM077bw==
+            FtC1dmHlyU/tXlFHv6TNlMZQtDgIVnE72Jvk48maq3oKiJAXWk11fg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1exzngtk4d9vcsmcq6ap5xx3ca9qacqjkrv86ymged7msx9z6vfyqsf5sjq
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYTmhiUmFWaDFzcnRXcWFp
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoOHlRcnRwWUYwUGRSVW9s
-            VjJ1b3VRSk8xN0FQMk13UDY1a2FEV3ZQY2l3Cnd0SmMvM0JDOFhZdmtOL3g0dmNj
+            cmdDZjN1RGFRVWtlODBudGpaemd3UDBZcnhRCksyWlk3VW91a3pnOGNQQVppM09z
-            UGZleDV1MU1DMXFiYUNmR2htWXZXQnMKLS0tIFBLa3lPL0VieG9ZWFBOU25vZTJ1
+            Wmd3c09LK25OVGpJYWxvcm9XME03RG8KLS0tIEZkdERHZjhFWXkzZWNsM01nQmRs
-            VVVDclBGZTRSVDZOanRwOGNaK3VVUW8KCvt/rcP0rJD5aCNdGaJeABuGZ7huRbGw
+            bWFTMlhCL2IrZjlEOUFydmE4cHBzSmMKhIk8TZtRsIFKzopZCyp27SWYeHmf6jKn
-            7FBvo6TvIRh0MCyvfbzfUon2m9d4yU8ddFejpSEK1vucxbXgV7KD8g==
+            VoIXQ6/VRRQjCYBsseZE5N+ycnr4ZC/RpXJ577G4TfGMCcixX67AfA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1fw4xnh2q52juce94ffn54js708cr6umfwpv0mykuddkea7kr4f0q7a9h05
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLU21oQnlTQ3RQWmNzR3Y4
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuTG9LKzVvUjZEZ1lkMVJN
-            aWhhdFZ6RFEwVm5ITWluS2xZM0QyUHI5SEdvCmFjdDU2YlhlYTJ6Y2pPaGJkNW01
+            eldHSkRXQ241bnZmbHBmSXFNMU1seGcyaVNRCjNPaS9ITEJtdGRwOENDRytEMFk1
-            WUVVN0xIRXZ3djdVVkYzRThLSzlCVzAKLS0tIFhISmlJcXB2UHNsb2VQS2tnYVUy
+            L3cvVnRsa2lYUk1hOWZCdDNqT3F3TU0KLS0tIFQ3cU5YNEszQm03ZXFxWkJ2VVVW
-            aW5ERENRS2JWbGZhaGhNSGtqNVRNTncK0uI8n2L5uP3to/sByeO7y17h3ZrcmnOf
+            WTR2RU9GUVdsZHdleW1Gd2lyRENzSm8KznMUQ6Ah8O03AzZcCXgUIjjrV1cdkAnq
-            e3CwdzP4/WcSwbFk0CRnS6Cq8J0esUqweSJxvpt2eNBEYvDZ77SSMw==
+            Pbr2BwdLzJvlF5lzmymIZEt35euv/HzhJGWDLWGpYJmYj/N8qZgBuA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1pa8cecxaw4y4zea6zjnt0k0mz38g4qunmp6trwy5fvdvw88ttcgsv2dgrv
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxSDNMRlNaMXB2ZXBPTlNu
+            eG5BWE5xRTNnVUFtN2psUFVHejZVbFVCQTBFCkRXQitoL0VJaXZmMlI3Q0JHVWk1
+            Zk1wR0loMVZLbytDdTE2Ky94eGljS0EKLS0tIHFxVGYrZlVVS3FsWENUdzRaVzVY
+            Q0x4bDFBTzV2L0E3UXQxMUdubVJZRTgKcPQZ9zHQAFwP/Odnh5INleUsHSN06U+x
+            X98535uapyJR/Wswxj6ukdciMOou8cLfOInLwJgWOf6mZklEhecVXA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1kc0xu0ue2nrrr7w4gam7wlzackv8jv243rxwwndgxjqklgtnp5csdtpgzp
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTaE1mUUlyVUxKQmhPMnlT
+            eS81cE5TeE1WWFVIRkdWT3c0ckhNMnFYZGxrCnp4My9nK20zcGVxUFZ0cnVVTDBS
+            QWtIQmVnM1lRV1ZtVXNGQ0dGdXNyOWsKLS0tIGIwM0JMM0JlZjBNaUQycEdudGlU
+            bzJvaUg2VkFrazBoWmlIY2hKeUdhTjQKbgW+ysm3TWBKfVoKAeqvaPio29SyzjJP
+            61QsSqCuJyEwSPpOzeWa5NChcCjitOUG1jEMsSHlpIslKA1P7g/P9g==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2026-02-14T00:08:39Z"
     mac: ENC[AES256_GCM,data:lp9ZeDxt5gkOkDmYk+F0VQrVhkR0tQiQlYXbygoA8Dcq+gV0IIKKLwRqr5CVfgfRlo3239IwmKLsGaS6zYC1xX4toZ8oqw3Ic2UvP2CiWt6M7HTrlL+3Y2+PKOUvGl7RAqQxQAw7QaoxB4esqdIiWnMDueVHk5BTKrkay+afhno=,iv:NAMaZ9SMBAtROTBSQtU0RJDB60MAuE82AFoPtDqVHVM=,tag:RGBUTQC1pM+LcBweSJbc6w==,type:str]

config/modules/secrets/content/server.yaml

@@ -5,47 +5,65 @@ sops:
         - recipient: age1ykcy2r4kk729e7adqxu8s24ujc60z5eux7ma0ca4ruzydwgm5p6qmdp838
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSYm92cVo0Ykg2R3hTUWpW
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaU0s5VEszVDU4UlE2MDRi
-            UlNOTXF2cFI4Y29uRTh2aXIySFNSTFhZZ0RFCnR4YmRrQTVrY0hkUloxMGgzdFFa
+            eXBGNXU1Si9TZng4U1lrSjMvajQ2WmhIQkgwCitjM2owU0kwTXlGNy90ZHM3TEhY
-            ejFST0FESytnN3NIZW45blhmWDRMSlkKLS0tIE1MNWlHWWd1WEhNUGtiUm5GZ2pn
+            ZmlnSUtZcXFCUkdCNmxsL0lDWHIwQXMKLS0tIEtaWGVCbWJKOHl0SW5EUWVqRWgz
-            QUR3aGtVczZYV1FSUFdMRGw4a2lGU2MKh/56SL7neNFXN70dzwtwTHBaECoMvArR
+            bUI2bFdONHBIMTA4Rks4dytIK0NSZmsK6gzcg+iYzt01tnptnuSGXHqBt+T9o9hP
-            TicJhSPV5S/vUrC9oDmSE3MMYtdzXSZkcRHYPI8fy5LcPOxXVPRARQ==
+            0gqLXgsfB+4OxRoMJVMEyecz9SX5+j6sWNQoRVQY1CGJoIucrpFrpg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1e6vws55p0g23qzthm4qa93hpt6lqmck6670gkygph0sc0j7my4uq5wqjfh
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3K3ZxKzdvdVFMYnZLS0Nv
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmTlN4YlBnTS93ZTh2STFr
-            bDBkRWRNMkRMS09UWlZlcFYvZ1pEd09VVmlJCk9uMGJyNzd5QnZtWkdxOE40TVdG
+            Nng0YTNmeEw2N0ZXV0N0VVJaQjh4bldNS2xjCnYyMWxOb2hiR0Vwb1FXNmh6eitE
-            YkJiaGZMaEFlNXljcnFvODVSL3Q2d3cKLS0tIFg5UFFPVElyR0xlbXEvMDNDQmpW
+            N1BMWFpXNElyNkJQNGJ6NUFzT3VOOVEKLS0tIG5MUXgzMEpMWGVGVnBubmRVM0hr
-            TGo3cUJVQ2NETkhWdmNCazNYSVpyUWcKr4EUvbK28WCiymL1BgYk6N6J27ZnadK8
+            QjdQUkoyWHE2M05nSkZXNWpBTXdnN2cKEB3JndFHK/bFMx7zf3y/wfEALJIDO85u
-            kQ8tzwVS7iI1frBoHOVzXhCRt2CEg+O3EnXMRJDrahhxwmpqlx6cRA==
+            RCKs6jIAztc3ElNDaKsIYRoF1VmrQSOvpk5ZJ1NytFcetNXvOR1KXw==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1x3lahhkefkap67cdmdjcqaxan9hp62er78akr79v9m73nvgugpeqk0y32a
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRWGVsRmkwZGxId0hXQlEv
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6dDVCcHlKT1hVYUh5bXVk
-            czdmclRXYWNrL0t4bGpEQ0lmNE0vb1RuZEhjCkhEaGlxY3JKS3l4WGxHS0Uya2tM
+            cGtZWExJWlQxOVNDWkwrWU9hTi9iT2RLVW5RCjEveHczRDVsWkIyRWIvMTEzRyt6
-            Zm1Lb3RpY2h0K2lKaHR1bjdFL25yQ0UKLS0tIFYvNmkrUWNFekVoMFVLck81bXhl
+            ZWkzUDhqMVZjT1VKM0tvWjlEdy9DZGsKLS0tIDB0T1gyaTZ6a1JIaGF3dVhEcmdZ
-            WHNSbHpCTTZSS3lkUiszeEE0RGw4QncKTr1ZzIHtkv8aJNKT1v0m+QMJyht43+XJ
+            Yzl6QnAyU3l0QkhJQVpTN1ovY1hEUXMKiEPWh4isOmF2MdU6ENPNmwQgAOV7PleP
-            0CRxdoZ/HXoymMQ7oZvT8vf6Ehz41aLe1gZHl8ZJPexDHrSl28NCtg==
+            88PLtUx2K6VKjWPIHknIZ5esoXPVjJXeawDAdSj4gz91A1DrcrYXWA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1exzngtk4d9vcsmcq6ap5xx3ca9qacqjkrv86ymged7msx9z6vfyqsf5sjq
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlc0tUVjVGVS85YUZOSmJq
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwdXcwejJSejkwT3BuSURo
-            a0pvcGV4UDBEc0N0Zk0xVEhUc1l1ZUFFTGxnClNocURmTE5ZaUorSVdWcE1kbW81
+            MEluK3plUVdmVG8wcmw3SkI2dThBd1FOZDJzCmg2cHRZMEZIWENiTWdvdWtveTY2
-            U3doQm9ZbHVrdVlsSVhFaEFoSHo5NU0KLS0tIGgvd05PY2tlbnRwbTRrdXpsT0ho
+            TlN3MkhPT0N4enN3RlBJbWNUK1N0QXMKLS0tIEFOT2J6VlpLWmduK2pWalIvOWNo
-            Zm1jbTlSMnA1WDUrZUVCOHNDWWJ2RFUK+cvqFK49rIVj3FITF/4HtCELvZhvkCZ9
+            NFhiM1lWcExhcXBrZm8rMzc5WXJoeDAKSXHnzBymsLhXaxHipZig+xfpBjYaADu/
-            8Ss77uE6qtGyhuGWXB0HwnO3fsCpXA62uUt/zv08o9LmIgRi7o7adg==
+            AqOXpfLbZQD15oIMg8+vNR2OOzqRRSq8oY2yI1rhkjZtlTxGiuzANw==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1fw4xnh2q52juce94ffn54js708cr6umfwpv0mykuddkea7kr4f0q7a9h05
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuN0dkcExkR2pyaUxhbUlz
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUMUhGMURUdzh4MFgzNDlC
-            NkR2WTNWRUpHSWdRTFdUY05jcm4ybDdEbW4wCmR1TTV5VlFudHN1cC8yRG5Nd2ts
+            Nzh0UW5WNUh1MDhEQnBod2E5OEVqMmhiTVVrCitmbk1uWkY5Q09COGZRZ2xhNXBl
-            K3duNEE1dit0Ym9PdmNaM1pEWjlZZU0KLS0tIHBXaXhzQ0VuTWFxdDQrczQ4YTBM
+            bnlVUmxDb2FQT0xPN0F3SkgyTVRpWjgKLS0tIGdWN1ptVTlhNUZtTU11VDFMSFlM
-            VlhpZ0N2ZmVkSC90NlowUkNuYWZUclEKzQUfWDETV5lPgrtCxYTLtVP8y7R8RFJj
+            djVyTzMyRHA1QnlvdEtaNE5URXVDS00KH+9tHTwQqI7uLubVWfU1IZ19WWDPA9Br
-            4J1bei0nJHlsap8V88u+QiYRgFsEthd++hzkYmUDvYPsA48PnzMupw==
+            HrnX4nn0AITQCWUkAqWVyGVP5pk5YmlmazLE6xyBz+i2ETT11DHVMw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1pa8cecxaw4y4zea6zjnt0k0mz38g4qunmp6trwy5fvdvw88ttcgsv2dgrv
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2ZGJ4bWNsR0tOa0g5Ym1M
+            UTJlRS9XRnNaOVBOd3dkS0tmaVJlZU5yd2xVClR0WU1nTnZud0RzeHZERUFRYzRE
+            bmp1OXorQ09LRzZyUEs1SXlvenZIOVkKLS0tIHBvakxTSTkxZXdBQmpVRWF5YUtF
+            QnBNcU1ibytoNDZCU1lldzczV0xjUzgK6gIlN6PYv8+ZGhdMuOSVHIkzZ9sU5kvI
+            ZpB+JirAJzFpYEz2IyT21XKNq9phqyj9lzzinvJQQ7wxsI6ixaiBDQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1kc0xu0ue2nrrr7w4gam7wlzackv8jv243rxwwndgxjqklgtnp5csdtpgzp
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6NVU4dUR2Y3hXbWdrdXNN
+            Rjh4VEE2M1NiTTZiWmpjVXQzSGxSS0l3a1I4Ci95ZUVhbTFtTHNLa3BvRnJRUjda
+            aVIyREZiL1phNU16OERZSDBvRGovVVUKLS0tIHpGdkh1L280TVp1MnE0L1Q1Z3FV
+            QnNTaHVsSVh2UmNRVzZ3a082ZjRRbmcKgjnhtWweNUAbmxpb+nN3iL9FOsaXCatu
+            NyS4pTov3WR9c7SLhDLlbqxeeqd7mBDKLhWiuqiW05J5NQ+g5lXf7g==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2026-02-14T00:09:32Z"
     mac: ENC[AES256_GCM,data:nYWQYK5QOA0u3DYGTozSGFMYhx2uMqkAWoqhthgagRFRnKA/j852fVKqRFcwn+fPSQ4e8i4WpcvoM7FVwuFDC+ixNp7xtz16pnswiNS4N/mNEYXfajkon7wIoUYNtrHahUeYlAnID0vYSQFA3XKgV7ZDD9b4V8X5N+yMlVXex4c=,iv:IW7276v0nnmFBe9Z7HIn6Tl9vX4sDoqWdDfJ1uwKoAY=,tag:YC8OiTcoL+nYV4x8rkivbg==,type:str]

config/modules/spicetify.nix

@@ -0,0 +1,34 @@
+{
+  den,
+  modules,
+  inputs,
+  ...
+}:
+{
+  flake-file.inputs = {
+    spicetify-nix.url = "github:Gerg-L/spicetify-nix";
+  };
+  modules.spotify = {
+    homeManager =
+      { pkgs, ... }:
+      let
+        spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.system};
+      in
+      {
+        imports = [
+          # Example for NixOS
+          inputs.spicetify-nix.homeManagerModules.spicetify
+        ];
+        programs.spicetify = {
+          enable = true;
+          enabledExtensions = with spicePkgs.extensions; [
+            adblockify
+            hidePodcasts
+            shuffle # shuffle+ (special characters are sanitized out of extension names)
+          ];
+          theme = spicePkgs.themes.onepunch;
+          colorScheme = "dark";
+        };
+      };
+  };
+}

config/modules/stylix.nix

@@ -16,6 +16,7 @@
       { pkgs, ... }:
       {
         imports = [ inputs.stylix.homeModules.stylix ];
+        gtk.gtk4.theme = null;
         stylix = {
           enable = true;
           autoEnable = false;

config/modules/surface_patches.nix

@@ -0,0 +1,38 @@
+{
+  den,
+  modules,
+  inputs,
+  ...
+}:
+{
+  flake-file.inputs = {
+    x1e-kernel.url = "git+https://git.scug.io/doloro/x1e-nixos.git?ref=bump-7.1-rc1";
+  };
+  modules.surface-patches = {
+    nixos =
+      { pkgs, lib, ... }:
+      {
+        imports = with inputs; [
+          x1e-kernel.nixosModules.default
+        ];
+
+        x1e.model = "15"; # "13" (default) or "15" — selects the correct DTB
+        x1e.cpuParking = false; # loads cpu_parking at boot
+        x1e.ecReboot = true; # loads ec_reboot at boot, exposes /sys/kernel/ec_reboot/reboot
+
+        # Prevent reboot hang - qcom_smd_qrtr workers stuck in D-state
+        systemd.settings.Manager.DefaultTimeoutStopSec = "15s";
+        systemd.settings.Manager.DefaultDeviceTimeoutSec = "15s";
+
+        # Hardware watchdog (SBSA Generic Watchdog) as safety net
+        systemd.settings.Manager = {
+          KExecWatchdogSec = "30s";
+          RebootWatchdogSec = "30s";
+          RuntimeWatchdogSec = "30s";
+        };
+
+        # Override udevd stop timeout (D-state workers can't be killed)
+        systemd.services.systemd-udevd.serviceConfig.TimeoutStopSec = lib.mkForce "10s";
+      };
+  };
+}

config/modules/tuigreetd.nix

@@ -8,11 +8,21 @@
           enable = true;
           settings = {
             default_session = {
-              command = "${pkgs.greetd.tuigreet}/bin/tuigreet --sessions ${config.services.xserver.displayManager.sessionData.desktops}/share/xsessions:${config.services.xserver.displayManager.sessionData.desktops}/share/wayland-sessions --remember --remember-user-session";
+              command = "${pkgs.greetd.tuigreet}/bin/tuigreet --sessions ${config.services.xserver.displayManager.sessionData.desktops}/share/xsessions:${config.services.xserver.displayManager.sessionData.desktops}/share/wayland-sessions --remember --remember-user-session --greeting 'meow meow meow' --time";
               user = "greeter";
             };
           };
         };
+        systemd.services.greetd.serviceConfig = {
+          Type = "idle";
+          StandardInput = "tty";
+          StandardOutput = "tty";
+          StandardError = "journal"; # Without this errors will spam on screen
+          # Without these bootlogs will spam on screen
+          TTYReset = true;
+          TTYVHangup = true;
+          TTYVTDisallocate = true;
+        };
       };
   };
 }

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773436376,
+        "lastModified": 1776876344,
-        "narHash": "sha256-OUPRrprbgN27BXHuWkMAPSCfLLQ/uwpWghEfKYN2iAg=",
+        "narHash": "sha256-Ubqb/agkuMJK+k19gjQgHux/eOYRc1sRGoOZOho8+VY=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "43f10d24391692bba3d762931ee35e7f17f8e8b8",
+        "rev": "648a13d0ee1e03a843b3e145b8ece15393058701",
         "type": "github"
       },
       "original": {
@@ -101,17 +101,50 @@
         "type": "github"
       }
     },
+    "cachyos-kernel": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1776881435,
+        "narHash": "sha256-j8AobLjMzeKJugseObrVC4O5k7/aZCWoft2sCS3jWYs=",
+        "owner": "CachyOS",
+        "repo": "linux-cachyos",
+        "rev": "1c61dfd1c3ad7762faa0db8b06c6af6c59cc4340",
+        "type": "github"
+      },
+      "original": {
+        "owner": "CachyOS",
+        "repo": "linux-cachyos",
+        "type": "github"
+      }
+    },
+    "cachyos-kernel-patches": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1777002108,
+        "narHash": "sha256-PIZCIf6xUTOUqLFbEGH0mSwu2O/YfeAmYlgdAbP4dhs=",
+        "owner": "CachyOS",
+        "repo": "kernel-patches",
+        "rev": "46476ae2538db486462aef8a9de37d19030cdaf2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "CachyOS",
+        "repo": "kernel-patches",
+        "type": "github"
+      }
+    },
     "den": {
       "locked": {
-        "lastModified": 1773802746,
+        "lastModified": 1775551420,
-        "narHash": "sha256-iJUVWJJszikRf+eqm0oj3g1SUIRBJNWdiDgFucMUTUU=",
+        "narHash": "sha256-8ICGLVOpuXc8b1YirfsAQcPEW5sV4bpGHHDny8Pww0I=",
         "owner": "vic",
         "repo": "den",
-        "rev": "91bf41d5a40c043a8a1492455125597f6b3dbba2",
+        "rev": "8101ec865c0bf4027d40b9fd8951e3e435a86d64",
         "type": "github"
       },
       "original": {
         "owner": "vic",
+        "ref": "8101ec865c0bf4027d40b9fd8951e3e435a86d64",
         "repo": "den",
         "type": "github"
       }
@@ -121,11 +154,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1773506317,
+        "lastModified": 1776613567,
-        "narHash": "sha256-qWKbLUJpavIpvOdX1fhHYm0WGerytFHRoh9lVck6Bh0=",
+        "narHash": "sha256-gC9Cp5ibBmGD5awCA9z7xy6MW6iJufhazTYJOiGlCUI=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "878ec37d6a8f52c6c801d0e2a2ad554c75b9353c",
+        "rev": "32f4236bfc141ae930b5ba2fb604f561fed5219d",
         "type": "github"
       },
       "original": {
@@ -137,11 +170,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1764873433,
+        "lastModified": 1775176642,
-        "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
+        "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
+        "rev": "179704030c5286c729b5b0522037d1d51341022c",
         "type": "github"
       },
       "original": {
@@ -150,21 +183,6 @@
         "type": "github"
       }
     },
-    "flake-aspects": {
-      "locked": {
-        "lastModified": 1773552804,
-        "narHash": "sha256-a0kjpCZGnD5lt7yW6C3hzPhSf5KjnTyvX6XZ2NuhGs4=",
-        "owner": "vic",
-        "repo": "flake-aspects",
-        "rev": "56fa8d4d4772d58eb7f9d66c28c1cd2762b60423",
-        "type": "github"
-      },
-      "original": {
-        "owner": "vic",
-        "repo": "flake-aspects",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -181,13 +199,29 @@
         "type": "github"
       }
     },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-file": {
       "locked": {
-        "lastModified": 1773637821,
+        "lastModified": 1776202746,
-        "narHash": "sha256-Cp1x/5/97iNjXOI5hLCA51BwR6hc1dWJiZp4VPogkTw=",
+        "narHash": "sha256-RZVtJefKKy3Z2UvKWSbtRF3cUxt/2fHga2adN6MZQ1U=",
         "owner": "vic",
         "repo": "flake-file",
-        "rev": "bb9fbe00ba6a1945fbdd6973c2585ab770f404b0",
+        "rev": "7d16dfaeb912d5efdff0d0eda2aabc0c934168dd",
         "type": "github"
       },
       "original": {
@@ -199,15 +233,15 @@
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
-          "nixpkgs-lib"
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1772408722,
+        "lastModified": 1775087534,
-        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
         "type": "github"
       },
       "original": {
@@ -218,17 +252,14 @@
     },
     "flake-parts_2": {
       "inputs": {
-        "nixpkgs-lib": [
+        "nixpkgs-lib": "nixpkgs-lib"
-          "nixvim",
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1769996383,
+        "lastModified": 1775087534,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
         "type": "github"
       },
       "original": {
@@ -240,16 +271,16 @@
     "flake-parts_3": {
       "inputs": {
         "nixpkgs-lib": [
-          "stylix",
+          "nixvim",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1767609335,
+        "lastModified": 1775087534,
-        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
         "type": "github"
       },
       "original": {
@@ -258,6 +289,45 @@
         "type": "github"
       }
     },
+    "flake-parts_4": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "stylix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1775087534,
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "font-patcher": {
       "inputs": {
         "nixpkgs": "nixpkgs_2"
@@ -317,20 +387,18 @@
     "gnome-shell": {
       "flake": false,
       "locked": {
-        "host": "gitlab.gnome.org",
         "lastModified": 1767737596,
         "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
         "owner": "GNOME",
         "repo": "gnome-shell",
         "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
-        "type": "gitlab"
+        "type": "github"
       },
       "original": {
-        "host": "gitlab.gnome.org",
         "owner": "GNOME",
-        "ref": "gnome-49",
         "repo": "gnome-shell",
-        "type": "gitlab"
+        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
+        "type": "github"
       }
     },
     "heliumFlake": {
@@ -341,11 +409,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1773827691,
+        "lastModified": 1777445753,
-        "narHash": "sha256-Yc3YGaLs5fl7aVD4VA6GJVOEvEhm1JnHhc9SI3UdTdE=",
+        "narHash": "sha256-FqwjhUWRGzpHyYRDYB9f4r9nhlFRv31on7UsX9WqVrs=",
         "owner": "vikingnope",
         "repo": "helium-browser-nix-flake",
-        "rev": "6b7839f174ae52077b40f19f36aa2acc9b029e51",
+        "rev": "1de208c9ba96502c4e53ac01c1044d6da2065471",
         "type": "github"
       },
       "original": {
@@ -361,11 +429,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773810247,
+        "lastModified": 1777518431,
-        "narHash": "sha256-6Vz1Thy/1s7z+Rq5OfkWOBAdV4eD+OrvDs10yH6xJzQ=",
+        "narHash": "sha256-SwgiG2T5pbyo33Vz7/vUCAhEMgwCK8Pa2nDSx5a6/WE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d47357a4c806d18a3e853ad2699eaec3c01622e7",
+        "rev": "2e54a938cdd4c8e414b2518edc3d82308027c670",
         "type": "github"
       },
       "original": {
@@ -390,11 +458,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772461003,
+        "lastModified": 1776511930,
-        "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=",
+        "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7",
+        "rev": "39435900785d0c560c6ae8777d29f28617d031ef",
         "type": "github"
       },
       "original": {
@@ -419,11 +487,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772461523,
+        "lastModified": 1776426399,
-        "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=",
+        "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804",
+        "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84",
         "type": "github"
       },
       "original": {
@@ -449,11 +517,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1773774870,
+        "lastModified": 1777536932,
-        "narHash": "sha256-WJi1VzcGBvLntY1LzoQOPFyH3CJP/AEyERhXvF9kWbE=",
+        "narHash": "sha256-ewznj221hpKokwiNyrZUTpf7fy+LHEy3kchZ8v7gH7U=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "775951783c2e820ead180aca4356d4a98df9d17a",
+        "rev": "2ff598896d3334cb44331463e845128cae4815f1",
         "type": "github"
       },
       "original": {
@@ -495,11 +563,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772467975,
+        "lastModified": 1776426575,
-        "narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=",
+        "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=",
         "owner": "hyprwm",
         "repo": "hyprland-guiutils",
-        "rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507",
+        "rev": "a968d211048e3ed538e47b84cb3649299578f19d",
         "type": "github"
       },
       "original": {
@@ -549,11 +617,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772459629,
+        "lastModified": 1776426736,
-        "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=",
+        "narHash": "sha256-rl7i4aY+9p8LysJp7o8uRWahCkpFznCgGHXszlTw7b0=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "7615ee388de18239a4ab1400946f3d0e498a8186",
+        "rev": "7833ff33b2e82d3406337b5dcf0d1cec595d83e9",
         "type": "github"
       },
       "original": {
@@ -626,11 +694,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773436263,
+        "lastModified": 1777492286,
-        "narHash": "sha256-n+2xFJngUkBqUJD5FsbVnYEHBTyDFSqtBIwQIGPXWWo=",
+        "narHash": "sha256-PwuoEJQcjSKJNP5T55qhfDwIP0tw5zxEhfu8GDfKfeg=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "5e228db6821380a5875d5643176c5c46a47b8134",
+        "rev": "ec5c0c709706bad5b82f667fd8758eae442577ce",
         "type": "github"
       },
       "original": {
@@ -651,11 +719,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772459835,
+        "lastModified": 1777148232,
-        "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=",
+        "narHash": "sha256-Uv0WZLhu89SafuSOmYDA7akrPt4wBRmsa1ucasO5aXg=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "0a692d4a645165eebd65f109146b8861e3a925e7",
+        "rev": "fec9cf1abcc1011e46f0a0986f46bf93c6bf8b92",
         "type": "github"
       },
       "original": {
@@ -680,11 +748,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773074819,
+        "lastModified": 1776728575,
-        "narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=",
+        "narHash": "sha256-z9eGphrArEBpl1O/GCH0wlY6z4K9vA6yWh2gAS6qytU=",
         "owner": "hyprwm",
         "repo": "hyprwire",
-        "rev": "f68afd0e73687598cc2774804fedad76693046f0",
+        "rev": "f3a80888783702a39691b684d099e16b83ed4702",
         "type": "github"
       },
       "original": {
@@ -742,6 +810,27 @@
         "type": "github"
       }
     },
+    "nik-pkgs": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1776018244,
+        "narHash": "sha256-rIuCVr2m4Lkz7j8mDUNqCz2R4Tzqyv/DTrr3yIis0Ec=",
+        "ref": "refs/heads/main",
+        "rev": "a93e9362031abd8d5315c1487d118c04305feea2",
+        "revCount": 58,
+        "type": "git",
+        "url": "https://git.scug.io/nikkuss/pkgs.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.scug.io/nikkuss/pkgs.git"
+      }
+    },
     "niri-flake": {
       "inputs": {
         "niri-stable": "niri-stable",
@@ -754,11 +843,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1773809319,
+        "lastModified": 1777542749,
-        "narHash": "sha256-ZuMZEuxqWneGaK+HAXz50JyCmtFo0neo6mp6F2NWj24=",
+        "narHash": "sha256-j4W+WwdiRxTTFdsoB8A7jlLNLbMQANKJxh9eKf8nOIs=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "c4ee62058cd37d7b842c3b081917f792efee9082",
+        "rev": "36130bc452e0a84c07761d2e176ae875b48eebf3",
         "type": "github"
       },
       "original": {
@@ -787,11 +876,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1773130184,
+        "lastModified": 1777468255,
-        "narHash": "sha256-3bwx4WqCB06yfQIGB+OgIckOkEDyKxiTD5pOo4Xz2rI=",
+        "narHash": "sha256-lBZc1UMy+1P1T/E41j3jQrpS7EFI3qegd+ktHZdamIg=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "b07bde3ee82dd73115e6b949e4f3f63695da35ea",
+        "rev": "dd1c3bcb9f1ef416df33ffa22d1d9bcee1398e7d",
         "type": "github"
       },
       "original": {
@@ -800,13 +889,36 @@
         "type": "github"
       }
     },
+    "nix-cachyos-kernel": {
+      "inputs": {
+        "cachyos-kernel": "cachyos-kernel",
+        "cachyos-kernel-patches": "cachyos-kernel-patches",
+        "flake-compat": "flake-compat_2",
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1777227006,
+        "narHash": "sha256-A7GcOXjfo2xmZ3ERgN0j6GcqaVzqIf5zpYQcdfDaMr0=",
+        "owner": "xddxdd",
+        "repo": "nix-cachyos-kernel",
+        "rev": "0f7e2bea4088227a80502557f6c0e3b74949d6b5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "xddxdd",
+        "ref": "release",
+        "repo": "nix-cachyos-kernel",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1772771118,
+        "lastModified": 1773628058,
-        "narHash": "sha256-xWzaTvmmACR/SRWtABgI/Z97lcqwJAeoSd5QW1KdK1s=",
+        "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e38213b91d3786389a446dfce4ff5a8aaf6012f2",
+        "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df",
         "type": "github"
       },
       "original": {
@@ -816,13 +928,28 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1774748309,
+        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1773705440,
+        "lastModified": 1777428379,
-        "narHash": "sha256-xB30bbAp0e7ogSEYyc126mAJMt4FRFh8wtm6ADE1xuM=",
+        "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "48652e9d5aea46e555b3df87354280d4f29cd3a3",
+        "rev": "755f5aa91337890c432639c60b6064bb7fe67769",
         "type": "github"
       },
       "original": {
@@ -847,11 +974,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1773389992,
+        "lastModified": 1776877367,
-        "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=",
+        "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda",
+        "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
         "type": "github"
       },
       "original": {
@@ -863,18 +990,50 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1773628058,
+        "lastModified": 1777187199,
-        "narHash": "sha256-YgVQzPaKa5eVf/rGA5Rn7BWJcP0T98JkE+2KuKVTyzA=",
+        "narHash": "sha256-RJlLGrl+xHndIVK1NbPkIsItePNB3X4PIe8UTk3AHnw=",
-        "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "facea5e538604efa4893c08770fe9fca5bf62c2f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable-small",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1777395829,
+        "narHash": "sha256-G77zuprOFgsvOB78BfVeSYu71UOwCet4x3zAXkFZ9kI=",
+        "rev": "e75f25705c2934955ee5075e62530d74aca973c6",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre963857.f8573b9c935c/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre988531.e75f25705c29/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
         "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1776255774,
+        "narHash": "sha256-psVTpH6PK3q1htMJpmdz1hLF5pQgEshu7gQWgKO6t6Y=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "566acc07c54dc807f91625bb286cb9b321b5f42a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1736061677,
         "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
@@ -890,20 +1049,31 @@
         "type": "github"
       }
     },
+    "nixpkgs_8": {
+      "locked": {
+        "lastModified": 1776877367,
+        "narHash": "sha256-wMN1gM00sUQ2KC9CNr/XEOGdfOrl67PabIRv9AYayTo=",
+        "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre985613.0726a0ecb6d4/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
+      }
+    },
     "nixvim": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts_3",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_6",
-          "nixpkgs"
+        "systems": "systems_4"
-        ],
-        "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1772402258,
+        "lastModified": 1777236345,
-        "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=",
+        "narHash": "sha256-ALOqlq7bE30lsX4rA76hXeQ2aLLEpb44hS+D1+jWS88=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10",
+        "rev": "a67d9cd6ff725a763afe88727aac73208ded3bf4",
         "type": "github"
       },
       "original": {
@@ -924,11 +1094,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767810917,
+        "lastModified": 1775228139,
-        "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
+        "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
+        "rev": "601971b9c89e0304561977f2c28fa25e73aa7132",
         "type": "github"
       },
       "original": {
@@ -947,11 +1117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772893680,
+        "lastModified": 1776796298,
-        "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=",
+        "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9",
+        "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
         "type": "github"
       },
       "original": {
@@ -964,7 +1134,7 @@
       "inputs": {
         "libcamera-src": "libcamera-src",
         "libpisp-src": "libpisp-src",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_7",
         "rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
         "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
         "rpi-firmware-src": "rpi-firmware-src",
@@ -991,7 +1161,6 @@
       "inputs": {
         "den": "den",
         "disko": "disko",
-        "flake-aspects": "flake-aspects",
         "flake-file": "flake-file",
         "flake-parts": "flake-parts",
         "font-patcher": "font-patcher",
@@ -999,15 +1168,16 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "import-tree": "import-tree",
+        "nik-pkgs": "nik-pkgs",
         "niri-flake": "niri-flake",
-        "nixpkgs": "nixpkgs_4",
+        "nix-cachyos-kernel": "nix-cachyos-kernel",
-        "nixpkgs-lib": [
+        "nixpkgs": "nixpkgs_5",
-          "nixpkgs"
-        ],
         "nixvim": "nixvim",
         "raspberry-pi-nix": "raspberry-pi-nix",
         "sops-nix": "sops-nix",
+        "spicetify-nix": "spicetify-nix",
         "stylix": "stylix",
+        "x1e-kernel": "x1e-kernel",
         "zen-browser": "zen-browser"
       }
     },
@@ -1137,11 +1307,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773698643,
+        "lastModified": 1777338324,
-        "narHash": "sha256-VCiDjE8kNs8uCAK73Ezk1r3fFuc4JepvW07YFqaN968=",
+        "narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "8237de83e8200d16fe0c4467b02a1c608ff28044",
+        "rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5",
         "type": "github"
       },
       "original": {
@@ -1150,6 +1320,25 @@
         "type": "github"
       }
     },
+    "spicetify-nix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_8",
+        "systems": "systems_5"
+      },
+      "locked": {
+        "lastModified": 1777183994,
+        "narHash": "sha256-zahis/vVFOsWv/HeyHbU13jxnrCC+ppIg49xG+viWxg=",
+        "owner": "Gerg-L",
+        "repo": "spicetify-nix",
+        "rev": "501256c3e670ca1679501ce3839ea805df00d8ba",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "spicetify-nix",
+        "type": "github"
+      }
+    },
     "stylix": {
       "inputs": {
         "base16": "base16",
@@ -1157,25 +1346,24 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_4",
         "gnome-shell": "gnome-shell",
         "nixpkgs": [
           "nixpkgs"
         ],
         "nur": "nur",
-        "systems": "systems_4",
+        "systems": "systems_6",
-        "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
         "tinted-tmux": "tinted-tmux",
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1773792048,
+        "lastModified": 1777501441,
-        "narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=",
+        "narHash": "sha256-+QWZ2/LvtEfbI4a5OiJmfv8aypBdm0u4Ui9t6LNHkRc=",
         "owner": "nix-community",
         "repo": "stylix",
-        "rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1",
+        "rev": "0bd266569c03b74234b8a2ae73d05055fb02a35f",
         "type": "github"
       },
       "original": {
@@ -1244,20 +1432,33 @@
         "type": "github"
       }
     },
-    "tinted-foot": {
+    "systems_5": {
-      "flake": false,
       "locked": {
-        "lastModified": 1726913040,
+        "lastModified": 1681028828,
-        "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "tinted-theming",
+        "owner": "nix-systems",
-        "repo": "tinted-foot",
+        "repo": "default",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
-        "owner": "tinted-theming",
+        "owner": "nix-systems",
-        "repo": "tinted-foot",
+        "repo": "default",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
+        "type": "github"
+      }
+    },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
         "type": "github"
       }
     },
@@ -1280,11 +1481,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1767710407,
+        "lastModified": 1772661346,
-        "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
+        "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
+        "rev": "13b5b0c299982bb361039601e2d72587d6846294",
         "type": "github"
       },
       "original": {
@@ -1296,11 +1497,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1767489635,
+        "lastModified": 1772934010,
-        "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
+        "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
+        "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d",
         "type": "github"
       },
       "original": {
@@ -1312,11 +1513,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1767488740,
+        "lastModified": 1772909925,
-        "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
+        "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
+        "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df",
         "type": "github"
       },
       "original": {
@@ -1343,6 +1544,22 @@
         "type": "github"
       }
     },
+    "x1e-kernel": {
+      "locked": {
+        "lastModified": 1777545570,
+        "narHash": "sha256-FA0uzu5xe/STxNoD9/dWRsEvVEwUgU7ireMobdtCJBA=",
+        "ref": "bump-7.1-rc1",
+        "rev": "a0257f88667f6463eb6fb0e7ba4e257829d3f947",
+        "revCount": 7,
+        "type": "git",
+        "url": "https://git.scug.io/doloro/x1e-nixos.git"
+      },
+      "original": {
+        "ref": "bump-7.1-rc1",
+        "type": "git",
+        "url": "https://git.scug.io/doloro/x1e-nixos.git"
+      }
+    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
@@ -1371,11 +1588,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772669058,
+        "lastModified": 1777035886,
-        "narHash": "sha256-XhnY0aRuDo5LT8pmJVPofPOgO2hAR7T+XRoaQxtNPzQ=",
+        "narHash": "sha256-m1TNuBoSXUBSKhD9UVMkU90M0wFTPTfvIOOltO8IM8A=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "906d0ac159803a7df2dc1f948df9327670380f69",
+        "rev": "ecfcdcc781f48821d83e1e2a0e30d7beca0eeb5e",
         "type": "github"
       },
       "original": {
@@ -1424,11 +1641,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773722260,
+        "lastModified": 1777352968,
-        "narHash": "sha256-U8MsSiqqYZHR3oKE+cCZ2AJt3b4LcXs+oQuNLipaO78=",
+        "narHash": "sha256-BZ+BHCINHSyyCOWo4pCJQU4T994iZLiw7lgFMNw+W9k=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "0e6e43342fb3e9a3439fafa777d8cdf98e4ffc49",
+        "rev": "bebce586893c7d441edd6cf9cf2cf62a1799361e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -3,13 +3,12 @@
   outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./config);
 
   inputs = {
-    den.url = "github:vic/den";
+    den.url = "github:vic/den?ref=8101ec865c0bf4027d40b9fd8951e3e435a86d64";
     disko.url = "github:nix-community/disko";
-    flake-aspects.url = "github:vic/flake-aspects";
     flake-file.url = "github:vic/flake-file";
     flake-parts = {
       url = "github:hercules-ci/flake-parts";
-      inputs.nixpkgs-lib.follows = "nixpkgs-lib";
+      inputs.nixpkgs-lib.follows = "nixpkgs";
     };
     font-patcher.url = "github:Doloro1978/nix-nerd-fonts-patcher";
     heliumFlake = {
@@ -22,25 +21,28 @@
     };
     hyprland.url = "github:hyprwm/Hyprland";
     import-tree.url = "github:vic/import-tree";
+    nik-pkgs = {
+      url = "git+https://git.scug.io/nikkuss/pkgs.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     niri-flake = {
       url = "github:sodiboo/niri-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
     nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
-    nixpkgs-lib.follows = "nixpkgs";
+    nixvim.url = "github:nix-community/nixvim";
-    nixvim = {
-      url = "github:nix-community/nixvim";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     raspberry-pi-nix.url = "github:nix-community/raspberry-pi-nix";
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    spicetify-nix.url = "github:Gerg-L/spicetify-nix";
     stylix = {
       url = "github:nix-community/stylix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    x1e-kernel.url = "git+https://git.scug.io/doloro/x1e-nixos.git?ref=bump-7.1-rc1";
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";

paws.txt

@@ -0,0 +1,5 @@
+██████   █████  ██     ██ ███████
+██   ██ ██   ██ ██     ██ ██
+██████  ███████ ██  █  ██ ███████
+██      ██   ██ ██ ███ ██      ██
+██      ██   ██  ███ ███  ███████