meow

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

@@ -4,7 +4,8 @@
   modules,
   inputs,
   ...
-}: {
+}:
+{
   den.aspects.doloro-desktop = {
     includes = [
       <den/primary-user>
@@ -33,28 +34,19 @@
       modules.easyeffects
       modules.lavd
       modules.ai
-      modules.omp
-      modules.podman
       <modules/ai/ollama-cuda>
     ];
-    nixos = {
+    nixos =
-      config,
+      { config, pkgs, ... }:
-      pkgs,
+      {
-      ...
-    }: {
         users.users.doloro = {
           shell = pkgs.fish;
           hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path;
-        extraGroups = ["libvirtd"];
         };
-      virtualisation.libvirtd.enable = true;
-      programs.virt-manager.enable = true;
       };
-    homeManager = {
+    homeManager =
-      home,
+      { home, pkgs, ... }:
-      pkgs,
+      {
-      ...
-    }: {
         wayland.windowManager.hyprland.settings = {
           monitor = [
             "HDMI-A-1, 1920x1080@60, 0x0, 1"
@@ -81,17 +73,6 @@
           deadlock-mod-manager
           gamescope
           android-studio
-        blender
-      ];
-      programs.lutris.enable = true;
-      nixpkgs.overlays = [
-        # Skipping tests while upstream sorts it out, revert once
-        # Hydra consistently builds openldap green.
-        (final: prev: {
-          openldap = prev.openldap.overrideAttrs (_: {
-            doCheck = false;
-          });
-        })
         ];
         nixpkgs.config.allowUnfree = true;
         programs.home-manager.enable = true;

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

@@ -6,16 +6,15 @@
   __findFile,
   lib,
   ...
-}: {
+}:
+{
   den.aspects.desktop = {
     includes = [
       modules.nix
     ];
-    nixos = {
+    nixos =
-      pkgs,
+      { pkgs, config, ... }:
-      config,
+      {
-      ...
-    }: {
         boot.loader.grub.enable = true;
         boot.loader.grub.device = "nodev";
         boot.loader.grub.devices = [
@@ -63,6 +62,7 @@
         services.gnome.gnome-keyring.enable = true;
 
         hardware.nvidia = {
+
           # Modesetting is required.
           modesetting.enable = true;
 
@@ -92,9 +92,7 @@
           # Optionally, you may need to select the appropriate driver version for your specific GPU.
           package = config.boot.kernelPackages.nvidiaPackages.stable;
         };
-      boot.binfmt.emulatedSystems = [
+
-        "aarch64-linux"
-      ];
       };
   };
 }

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

@@ -21,7 +21,6 @@
       modules.stylix
       modules.quickshell
       modules.lavd
-      modules.omp
       # modules.podman
       # modules.openvivo
     ];

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

@@ -171,12 +171,12 @@
           # "mem_sleep_default=deep"
           # "i915.fastboot=1"
           # "i915.modeset=1"
-          "ahci.mobile_lpm_policy=1"
+          # "ahci.mobile_lpm_policy=1"
           # "intel_idle.max_cstate=10"
           "processor.max_cstate=10"
           "pci=noaer"
-          "quiet"
+          # "quiet"
-          "splash"
+          # "splash"
           # "idle=halt"
         ];
         boot.binfmt.emulatedSystems = [

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

@@ -1,34 +0,0 @@
-{
-  den,
-  modules,
-  __findFile,
-  ...
-}: {
-  den.aspects.doloro-wsl = {
-    includes = [
-      <den/primary-user>
-      den.aspects.doloro-shared
-      modules.fish
-      modules.tmux
-      modules.nix
-      modules.omp
-      modules.hyfetch
-      modules.git
-    ];
-    nixos = {
-      config,
-      pkgs,
-      ...
-    }: {
-      users.users.doloro = {
-        isNormalUser = true;
-        shell = pkgs.fish;
-        uid = 1000;
-        # hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path;
-      };
-    };
-
-    homeManager = {...}: {
-    };
-  };
-}

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

@@ -1,22 +0,0 @@
-{
-  den,
-  modules,
-  ...
-}: {
-  flake-file.inputs = {
-  };
-  den.aspects.wsl = {
-    includes = [
-      modules.wsl
-      modules.tmux
-      modules.nix
-      modules.omp
-      modules.hyfetch
-      modules.git
-    ];
-    nixos = {lib, ...}: {
-      wsl.enable = true;
-      wsl.defaultUser = "doloro";
-    };
-  };
-}

config/hosts/aspects/servers/rpi5.nix

@@ -3,14 +3,14 @@
   __findFile,
   modules,
   ...
-}: {
+}:
+{
   den.aspects.rpi5 = {
     includes = [
       <modules/raspberry-pi/5>
       # <modules/services/traefik>
       <modules/services/caddy>
       <modules/services/home-assistant>
-      <modules/services/docker-registry>
       <modules/services/ddns>
     ];
     nixos = {

config/hosts/computers.nix

@@ -3,7 +3,8 @@
   __findFile,
   lib,
   ...
-}: {
+}:
+{
   # Homes
   den.homes.x86_64-linux.doloro-desktop = {
     aspect = "doloro-desktop";
@@ -13,9 +14,6 @@
   den.homes.aarch64-linux.doloro-laptop = {
     userName = "doloro";
   };
-  den.homes.aarch64-linux.doloro-wsl = {
-    userName = "doloro";
-  };
   # Machines
   den.hosts.x86_64-linux.desktop = {
     users.doloro = {
@@ -30,12 +28,6 @@
       home-manager.enable = true;
     };
   };
-  den.hosts.aarch64-linux.wsl = {
-    users.doloro = {
-      aspect = "doloro-wsl";
-      home-manager.enable = true;
-    };
-  };
 
   den.schema.user.classes = lib.mkDefault [ "homeManager" ];
 
@@ -44,4 +36,5 @@
     type = lib.types.attrs;
     description = "Home Manager configurations for users.";
   };
+
 }

config/modules/ai/ai.nix

@@ -13,10 +13,7 @@
     homeManager =
       { pkgs, ... }:
       {
-        home.packages = [
+        home.packages = [ pkgs.opencode ];
-          pkgs.opencode
-          pkgs.claude-code
-        ];
       };
   };
 }

config/modules/ai/omp.nix

@@ -1,30 +0,0 @@
-{
-  modules,
-  den,
-  inputs,
-  ...
-}: {
-  flake-file.inputs = {
-    omp-nix.url = "git+https://git.molez.org/mandlm/omp-nix?ref=main";
-  };
-  modules.omp = {
-    homeManager = {
-      imports = [inputs.omp-nix.homeManagerModules.omp];
-
-      oh-my-pi = {
-        enable = false;
-        settings = {
-          theme = "dark-gruvbox";
-          symbolPreset = "nerd";
-          defaultThinkingLevel = "medium";
-          ask.timeout = 0;
-        };
-
-        skills = {
-          pdf = "github:anthropics/skills/skills/pdf@b0cbd3df1533b396d281a6886d5132f623393a9c";
-          frontend-design = "github:anthropics/skills/skills/frontend-design@b0cbd3df1533b396d281a6886d5132f623393a9c";
-        };
-      };
-    };
-  };
-}

config/modules/fish.nix

@@ -18,9 +18,6 @@
               set -g theme_display_user yes
               set -g fish_color_autosuggestion 6F6578
               alias nik 'nix'
-              if not set -q TMUX
-                set -gx COLORTERM truecolor
-              end
             '';
             # alias nos 'sudo echo; sudo nixos-rebuild switch --flake .#${aspect-name} --log-format internal-json -v &| nom --json'
             # alias hms 'home-manager switch --flake .#${aspect-name} --log-format internal-json -v &| nom --json'

config/modules/hyprland/doloro-settings.nix

@@ -1,15 +1,14 @@
-{modules, ...}: {
+{ modules, ... }:
+{
   modules.hyprland = {
     provides = {
       doloro-settings = {
         includes = [
           modules.dunst
         ];
-        homeManager = {
+        homeManager =
-          pkgs,
+          { pkgs, home, ... }:
-          home,
+          {
-          ...
-        }: {
             home.packages = [
               pkgs.hyprcursor
               pkgs.wlogout
@@ -96,7 +95,7 @@
                 ];
               };
               dwindle = {
-              # pseudotile = true;
+                pseudotile = true;
                 preserve_split = true;
               };
               # master = {
@@ -106,11 +105,10 @@
                 force_default_wallpaper = -1;
                 disable_hyprland_logo = false;
                 enable_anr_dialog = false;
-              # vfr = true;
+                vfr = true;
               };
               "$mainMod" = "SUPER";
-            bind =
+              bind = [
-              [
                 (
                   let
                     config = pkgs.writeTextFile {
@@ -131,14 +129,15 @@
                     script = pkgs.writeShellScript "mreow" ''
                       	exec $(tofi-drun -c ${config})
                           	'';
-                  in "$mainMod, R, exec, ${script}"
+                  in
+                  "$mainMod, R, exec, ${script}"
                 )
                 "$mainMod, C, killactive"
                 "$mainMod, M, exec, uwsm stop"
                 "$mainMod, Q, exec, kitty"
                 "$mainMod, V, togglefloating,"
-                # "$mainMod, P, pseudo, # dwindle"
+                "$mainMod, P, pseudo, # dwindle"
-                # "$mainMod, J, togglesplit, # dwindle"
+                "$mainMod, J, togglesplit, # dwindle"
                 "$mainMod, left, movefocus, l"
                 "$mainMod, right, movefocus, r"
                 "$mainMod, up, movefocus, u"
@@ -163,14 +162,15 @@
               ]
               ++ (builtins.concatLists (
                 builtins.genList (
-                  i: let
+                  i:
+                  let
                     ws = i + 1;
-                  in [
+                  in
+                  [
                     "$mainMod, ${toString ws}, workspace, ${toString ws}"
                     "$mainMod SHIFT, ${toString ws}, movetoworkspace, ${toString ws}"
                   ]
-                )
+                ) 9
-                9
               ));
               bindm = [
                 "$mainMod, mouse:272, movewindow"

config/modules/nix.nix

@@ -1,6 +1,9 @@
-{...}: {
+{ ... }:
+{
   modules.nix = {
-    nixos = {...}: {
+    nixos =
+      { ... }:
+      {
         nixpkgs.config.allowUnfree = true;
         nix.settings = {
           substituters = [
@@ -11,7 +14,6 @@
             "https://cache.nixos-cuda.org"
             "https://niri.cachix.org"
             "https://attic.xuyh0120.win/lantian"
-          "https://nixos-raspberrypi.cachix.org"
           ];
           trusted-public-keys = [
             "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
@@ -20,7 +22,6 @@
             "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M="
             "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964="
             "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc="
-          "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
           ];
           experimental-features = [
             "flakes"

config/modules/nixvim/default.nix

@@ -4,7 +4,8 @@
   lib,
   inputs,
   ...
-}: {
+}:
+{
   # Its in its own folder for future modulizaion efforts
   flake-file.inputs = {
     nixvim = {
@@ -14,20 +15,13 @@
   };
   modules = {
     nixvim = {
-      nixos = {home-manager, ...}: {
+      nixos =
+        { home-manager, ... }:
+        {
         };
-      homeManager = {pkgs, ...}: let
+      homeManager =
-        tiny-code-action = pkgs.vimUtils.buildVimPlugin {
+        { pkgs, ... }:
-          name = "tiny-code-action.nvim";
+        {
-          src = pkgs.fetchFromGitHub {
-            owner = "rachartier";
-            repo = "tiny-code-action.nvim";
-            rev = "main";
-            hash = "sha256-UF9zeO5Uujdt2MEwy2d2Lhk6JRnEN4vrEvYslv0/zaA";
-          };
-          nvimSkipModules = ["tiny-code-action.previewers.snacks"];
-        };
-      in {
           imports = [
             inputs.nixvim.homeModules.nixvim
           ];
@@ -42,13 +36,13 @@
             colorschemes.gruvbox-material.enable = true;
             extraPackages = with pkgs; [
               # formatters
-            alejandra
+              nixfmt
               rustfmt
               # misc
               ripgrep
+              # misc
               nixd
               tree-sitter
-            rust-analyzer
             ];
             performance.byteCompileLua = {
               enable = true;
@@ -62,12 +56,11 @@
               lsp-status.enable = true;
               transparent.enable = true;
               which-key.enable = true;
-            snacks.enable = true;
               conform-nvim = {
                 enable = true;
                 settings = {
                   formatters_by_ft = {
-                  nix = ["alejandra"];
+                    nix = [ "nixfmt" ];
                     rust = [ "rustfmt" ];
                     "_" = [
                       "squeeze_blanks"
@@ -106,15 +99,6 @@
                   };
                   nixd = {
                     enable = true;
-                  settings = {
-                    nixd = {
-                      nixpkgs.expr = "import (builtins.getFlake \"${toString /home/doloro/dotfiles}\").inputs.nixpkgs { }";
-                      options = {
-                        nixos.expr = "(builtins.getFlake \"${toString /home/doloro/dotfiles}\").nixosConfigurations.desktop.options";
-                        home_manager.expr = "(builtins.getFlake \"${toString /home/doloro/dotfiles}\").homeConfigurations.doloro-desktop.options";
-                      };
-                    };
-                  };
                   };
                   astro = {
                     enable = true;
@@ -154,7 +138,7 @@
                       "fileformat"
                       "filetype"
                     ];
-                  lualine_y = ["progress"];
+                    lualine_y = [ "lsp_status" ];
                     lualine_z = [ "location" ];
                   };
                   inactive_sections = {
@@ -187,30 +171,15 @@
                   };
                 };
               };
-            lsp-lines.enable = true;
+              trouble.enable = true;
-            diaglist = {
-              enable = true;
-              settings = {
-                debug = false;
-              };
-            };
               cmp = {
                 enable = true;
                 autoEnableSources = true;
                 settings = {
                   sources = [
-                  {
+                    { name = "nvim_lsp"; }
-                    name = "nvim_lsp";
+                    { name = "path"; }
-                    priority = 100;
+                    { name = "buffer"; }
-                  }
-                  {
-                    name = "buffer";
-                    priority = 50;
-                  }
-                  {
-                    name = "path";
-                    priority = 40;
-                  }
                   ];
                   mapping = {
                     "<C-Space>" = "cmp.mapping.complete()";
@@ -218,24 +187,13 @@
                     "<C-e>" = "cmp.mapping.close()";
                     "<C-f>" = "cmp.mapping.scroll_docs(4)";
                     "<CR>" = "cmp.mapping.confirm({ select = true })";
-                  "<S-Tab>" = "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() else fallback() end end, {'i', 's'})";
+                    "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
-                  "<Tab>" = "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() else fallback() end end, {'i', 's'})";
+                    "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
-                };
-                window = {
-                  completion = {
-                    border = "rounded";
-                    winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,CursorLine:PmenuSel,Search:None";
-                  };
-                  documentation = {
-                    border = "rounded";
-                    winhighlight = "Normal:Pmenu,FloatBorder:Pmenu";
-                  };
                   };
                 };
               };
               lspkind.enable = true;
               tiny-inline-diagnostic.enable = true;
-            # tiny-code-action.enable = true;
               # persisted.enable = true;
               auto-session = {
                 enable = false;
@@ -250,9 +208,6 @@
                 enable = true;
                 grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
                   bash
-                css
-                html
-                javascript
                   json
                   lua
                   make
@@ -261,8 +216,6 @@
                   nix
                   regex
                   toml
-                tsx
-                typescript
                   vim
                   vimdoc
                   xml
@@ -271,7 +224,6 @@
                 ];
                 settings = {
                   highlight.enable = true;
-                indent.enable = true;
                 };
               };
             };
@@ -281,9 +233,6 @@
               vimPlugins.melange-nvim
               vimPlugins.telescope-file-browser-nvim
               vimPlugins.lsp-progress-nvim
-            vimPlugins.cmp-cmdline
-            vimPlugins.cmp-nvim-lsp-signature-help
-            tiny-code-action
             ];
             opts = {
               number = true;
@@ -295,42 +244,6 @@
             globals = {
               mapleader = " ";
             };
-          extraConfigLua = ''
-            local cmp = require('cmp')
-            cmp.setup.cmdline(':', {
-              mapping = cmp.mapping.preset.cmdline(),
-              sources = cmp.config.sources(
-                { { name = 'path' } },
-                { { name = 'cmdline' } }
-              ),
-              window = {
-                completion = {
-                  border = 'rounded',
-                },
-              },
-            })
-            cmp.setup.cmdline('/', {
-              mapping = cmp.mapping.preset.cmdline(),
-              sources = {
-                { name = 'buffer' }
-              },
-              window = {
-                completion = {
-                  border = 'rounded',
-                },
-              },
-            })
-
-            require('tiny-code-action').setup({
-              backend = 'vim',
-              picker = 'snacks',
-              resolve_timeout = 100,
-              notify = {
-                enabled = true,
-                on_empty = true,
-              },
-            })
-          '';
             keymaps = [
               {
                 action = "<cmd>Telescope persisted<cr>";
@@ -375,20 +288,12 @@
                 };
               }
               {
-              action = "<cmd>DiaglistToggle<cr>";
+                action = "<cmd>Trouble diagnostics toggle<cr>";
                 key = "<leader>fd";
                 options = {
                   silent = true;
                 };
               }
-            {
-              action = "<cmd>lua require('tiny-code-action').code_action()<cr>";
-              key = "<leader>ca";
-              mode = ["n" "x"];
-              options = {
-                silent = true;
-              };
-            }
             ];
           };
         };

config/modules/quickshell/quickshell/.qmlls.ini

@@ -1 +1 @@
-/run/user/1000/quickshell/vfs/ca6d8e2cdd46bffdf799708f31d409fa/.qmlls.ini
+/run/user/1000/quickshell/vfs/6e389f6b800776b0595d9d90e42ebd04/.qmlls.ini

config/modules/raspberry-pi.nix

@@ -4,22 +4,23 @@
   modules,
   inputs,
   ...
-}: {
+}:
+{
   flake-file.inputs = {
-    raspberry-pi-nix.url = "github:cmyk/raspberry-pi-nix";
+    raspberry-pi-nix.url = "github:nix-community/raspberry-pi-nix";
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
   modules.raspberry-pi = {
     provides = {
       "5" = {
-        nixos = {
+        nixos =
-          pkgs,
+          { pkgs, ... }:
-          modulesPath,
+          let
-          ...
+            rpi-pi = inputs.raspberry-pi-nix;
-        }: {
+          in
+          {
             imports = [
-            inputs.nixos-hardware.nixosModules.raspberry-pi-5
+              rpi-pi.nixosModules.raspberry-pi
-            "${modulesPath}/installer/sd-card/sd-image-aarch64.nix"
+              rpi-pi.nixosModules.sd-image
             ];
 
             environment.systemPackages = with pkgs; [
@@ -27,12 +28,12 @@
             ];
 
             sdImage.compressImage = false;
+            raspberry-pi-nix.board = "bcm2712"; # Rpi 5 - 64bit
+            # We need to rebuild kernel for 6.12
+            # raspberry-pi-nix.kernel-version = "v6_12_17";
+            raspberry-pi-nix.uboot.enable = false;
 
-          boot.initrd.systemd.tpm2.enable = false;
+            hardware.enableRedistributableFirmware = true;
-          boot.initrd.allowMissingModules = true;
-          boot.zfs.forceImportRoot = false;
-
-          # hardware.enableRedistributableFirmware = true;
           };
       };
     };

config/modules/services/registry.nix

@@ -1,49 +0,0 @@
-{
-  den,
-  __findFile,
-  modules,
-  ...
-}: {
-  # Basic traefik
-  modules.services.provides.docker-registry = {
-    nixos = {
-      config,
-      pkgs,
-      ...
-    }: let
-      registryImg = pkgs.dockerTools.pullImage {
-        imageName = "registry";
-        imageDigest = "sha256:85347ed2ecde64161c7a4788a4d7d3dcc9d6f86f7be95834022e3c6a423a945a";
-        finalImageName = "registry";
-        finalImageTag = "3";
-        sha256 = "sha256-rLG0q/MVVz52veqZuZs5W0Qke6FugXkx7fMe3QnE3gU";
-        arch = "arm64";
-      };
-    in {
-      virtualisation.oci-containers.containers = {
-        docker-registry = {
-          image = "registry";
-          imageFile = registryImg;
-          volumes = [
-            "/data/dockerRegistry:/var/lib/registry"
-            "/run/dbus:/run/dbus:ro"
-            "/etc/localtime:/etc/localtime:ro"
-          ];
-          ports = ["0.0.0.0:5000:5000"];
-          # networks = [ "meow" ];
-        };
-      };
-      networking.firewall = {
-        allowedTCPPorts = [
-          5000
-        ];
-        allowedUDPPortRanges = [];
-      };
-      services.caddy = pkgs.lib.mkIf config.services.caddy.enable {
-        virtualHosts."dockerRegistry.h.doloro.co.uk".extraConfig = ''
-          reverse_proxy :5000
-        '';
-      };
-    };
-  };
-}

config/modules/surface_patches.nix

@@ -6,7 +6,7 @@
 }:
 {
   flake-file.inputs = {
-    x1e-kernel.url = "git+https://git.scug.io/nikkuss/x1e-nixos.git";
+    x1e-kernel.url = "git+https://git.scug.io/doloro/x1e-nixos.git?ref=bump-7.1-rc1";
   };
   modules.surface-patches = {
     nixos =

config/modules/tmux.nix

@@ -1,10 +1,9 @@
-{modules, ...}: {
+{ modules, ... }:
+{
   modules.tmux = {
-    homeManager = {
+    homeManager =
-      home,
+      { home, pkgs, ... }:
-      pkgs,
+      {
-      ...
-    }: {
         programs.tmux = {
           enable = true;
           plugins = with pkgs.tmuxPlugins; [
@@ -12,11 +11,10 @@
             minimal-tmux-status
           ];
           extraConfig = ''
-          set-option -g default-terminal "tmux-256color"
+                  set-option -g default-terminal "xterm-256color"
-          set -as terminal-features ",xterm-256color:RGB"
+            			set -a terminal-features "xterm-256color:RGB"
                   set -g status-bg black
                   set -g status-fg white
-          set -g mouse on
           '';
         };
       };

config/modules/user/doloro.nix

@@ -7,7 +7,6 @@
         users.users.${user.userName} = {
           extraGroups = [
             "wheel"
-            "libvirtd"
             "networkmanager"
           ];
         };

config/modules/wsl.nix

@@ -1,15 +0,0 @@
-{
-  modules,
-  den,
-  inputs,
-  ...
-}: {
-  flake-file.inputs = {
-    nixos-wsl.url = "github:nix-community/NixOS-WSL";
-  };
-  modules.wsl = {
-    nixos = {
-      imports = [inputs.nixos-wsl.nixosModules.default];
-    };
-  };
-}

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778620495,
+        "lastModified": 1776876344,
-        "narHash": "sha256-Gu7UhWjwKCgSiVC3Qz/Rc7cYi9DNuDTBxYzg3kfLvfM=",
+        "narHash": "sha256-Ubqb/agkuMJK+k19gjQgHux/eOYRc1sRGoOZOho8+VY=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "be35f75ac305f430f5f9d89b5f5a4af59ca7567e",
+        "rev": "648a13d0ee1e03a843b3e145b8ece15393058701",
         "type": "github"
       },
       "original": {
@@ -71,11 +71,11 @@
     "base16-helix": {
       "flake": false,
       "locked": {
-        "lastModified": 1776754714,
+        "lastModified": 1760703920,
-        "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=",
+        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
         "owner": "tinted-theming",
         "repo": "base16-helix",
-        "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581",
+        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
         "type": "github"
       },
       "original": {
@@ -104,11 +104,11 @@
     "cachyos-kernel": {
       "flake": false,
       "locked": {
-        "lastModified": 1779085181,
+        "lastModified": 1776881435,
-        "narHash": "sha256-ZdiBlGOkI9tS3ggyNlJ5gU4qCkvGWLT3sbrnHEemN2o=",
+        "narHash": "sha256-j8AobLjMzeKJugseObrVC4O5k7/aZCWoft2sCS3jWYs=",
         "owner": "CachyOS",
         "repo": "linux-cachyos",
-        "rev": "391e1e35d62d30dccd14ec3af01d58e5310b7d80",
+        "rev": "1c61dfd1c3ad7762faa0db8b06c6af6c59cc4340",
         "type": "github"
       },
       "original": {
@@ -120,11 +120,11 @@
     "cachyos-kernel-patches": {
       "flake": false,
       "locked": {
-        "lastModified": 1779082750,
+        "lastModified": 1777002108,
-        "narHash": "sha256-yyk+TU5OF0JwTlTVqqvQIwsYWFZeSzGD5JqSUg52vHw=",
+        "narHash": "sha256-PIZCIf6xUTOUqLFbEGH0mSwu2O/YfeAmYlgdAbP4dhs=",
         "owner": "CachyOS",
         "repo": "kernel-patches",
-        "rev": "2c2eb7e421e954960dd336d7d45c24f949475958",
+        "rev": "46476ae2538db486462aef8a9de37d19030cdaf2",
         "type": "github"
       },
       "original": {
@@ -154,11 +154,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1779226674,
+        "lastModified": 1776613567,
-        "narHash": "sha256-wuOkjI6pRiN4sEn/EPBRnNW5cmcpvd7xtIM8y5LooAs=",
+        "narHash": "sha256-gC9Cp5ibBmGD5awCA9z7xy6MW6iJufhazTYJOiGlCUI=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "65fb947964bd44fc0008faf77d1fcb7a9f40bb32",
+        "rev": "32f4236bfc141ae930b5ba2fb604f561fed5219d",
         "type": "github"
       },
       "original": {
@@ -170,11 +170,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1776136500,
+        "lastModified": 1775176642,
-        "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=",
+        "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7",
+        "rev": "179704030c5286c729b5b0522037d1d51341022c",
         "type": "github"
       },
       "original": {
@@ -215,29 +215,13 @@
         "type": "github"
       }
     },
-    "flake-compat_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-file": {
       "locked": {
-        "lastModified": 1779051720,
+        "lastModified": 1776202746,
-        "narHash": "sha256-+jbXnODsR19pFKB0x/6kHhFgW6yV6N+CGClFr45eDU8=",
+        "narHash": "sha256-RZVtJefKKy3Z2UvKWSbtRF3cUxt/2fHga2adN6MZQ1U=",
         "owner": "vic",
         "repo": "flake-file",
-        "rev": "c58eb27d9434e5be0c8693f1eb18d47035bc21ba",
+        "rev": "7d16dfaeb912d5efdff0d0eda2aabc0c934168dd",
         "type": "github"
       },
       "original": {
@@ -253,11 +237,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778716662,
+        "lastModified": 1775087534,
-        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
         "type": "github"
       },
       "original": {
@@ -271,11 +255,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1778716662,
+        "lastModified": 1775087534,
-        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
         "type": "github"
       },
       "original": {
@@ -292,11 +276,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778716662,
+        "lastModified": 1775087534,
-        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
         "type": "github"
       },
       "original": {
@@ -425,11 +409,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1778817414,
+        "lastModified": 1777445753,
-        "narHash": "sha256-U1pJAxTPbPMn/SCwePgIwoiMWD43QgUAIL7J3kxgAAU=",
+        "narHash": "sha256-FqwjhUWRGzpHyYRDYB9f4r9nhlFRv31on7UsX9WqVrs=",
         "owner": "vikingnope",
         "repo": "helium-browser-nix-flake",
-        "rev": "53a220890870c24d8c7ad6a21b8d63260e94507f",
+        "rev": "1de208c9ba96502c4e53ac01c1044d6da2065471",
         "type": "github"
       },
       "original": {
@@ -445,11 +429,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779213149,
+        "lastModified": 1777518431,
-        "narHash": "sha256-Cf+p/T4Z3n9Sw0TiR3kQaIwQI+/hfvLJcoTzeq6yS3E=",
+        "narHash": "sha256-SwgiG2T5pbyo33Vz7/vUCAhEMgwCK8Pa2nDSx5a6/WE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bd868f769a69d3b6091a1da68a75cb83a181033c",
+        "rev": "2e54a938cdd4c8e414b2518edc3d82308027c670",
         "type": "github"
       },
       "original": {
@@ -533,11 +517,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1779190425,
+        "lastModified": 1777536932,
-        "narHash": "sha256-C0hPhLeo3ztBXYSnpYarYjw6HDvlgZRnNyFfG5PoaVI=",
+        "narHash": "sha256-ewznj221hpKokwiNyrZUTpf7fy+LHEy3kchZ8v7gH7U=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "203a121537d0868bd4d8258b58861ca970483157",
+        "rev": "2ff598896d3334cb44331463e845128cae4815f1",
         "type": "github"
       },
       "original": {
@@ -633,11 +617,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777320127,
+        "lastModified": 1776426736,
-        "narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=",
+        "narHash": "sha256-rl7i4aY+9p8LysJp7o8uRWahCkpFznCgGHXszlTw7b0=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "090117506ddc3d7f26e650ff344d378c2ec329cc",
+        "rev": "7833ff33b2e82d3406337b5dcf0d1cec595d83e9",
         "type": "github"
       },
       "original": {
@@ -710,11 +694,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778234770,
+        "lastModified": 1777492286,
-        "narHash": "sha256-jAcsogZwWMfXT9MfXxZzkwliAqIuZUV0p71h6Ba9ReE=",
+        "narHash": "sha256-PwuoEJQcjSKJNP5T55qhfDwIP0tw5zxEhfu8GDfKfeg=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "a2dbd8a4cc51f7cbe4224732668392bb1aa79df2",
+        "rev": "ec5c0c709706bad5b82f667fd8758eae442577ce",
         "type": "github"
       },
       "original": {
@@ -735,11 +719,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777159683,
+        "lastModified": 1777148232,
-        "narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=",
+        "narHash": "sha256-Uv0WZLhu89SafuSOmYDA7akrPt4wBRmsa1ucasO5aXg=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404",
+        "rev": "fec9cf1abcc1011e46f0a0986f46bf93c6bf8b92",
         "type": "github"
       },
       "original": {
@@ -764,11 +748,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778410714,
+        "lastModified": 1776728575,
-        "narHash": "sha256-o6RzFj4nJXaPRY7EM01siuCQeT41RfwwmcmFQqwFJJg=",
+        "narHash": "sha256-z9eGphrArEBpl1O/GCH0wlY6z4K9vA6yWh2gAS6qytU=",
         "owner": "hyprwm",
         "repo": "hyprwire",
-        "rev": "85148a8e612808cf5ddb25d0b3c5840f3498a7dc",
+        "rev": "f3a80888783702a39691b684d099e16b83ed4702",
         "type": "github"
       },
       "original": {
@@ -779,11 +763,11 @@
     },
     "import-tree": {
       "locked": {
-        "lastModified": 1778781969,
+        "lastModified": 1773693634,
-        "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=",
+        "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=",
         "owner": "vic",
         "repo": "import-tree",
-        "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274",
+        "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1",
         "type": "github"
       },
       "original": {
@@ -812,16 +796,16 @@
     "libpisp-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1740559338,
+        "lastModified": 1724944683,
-        "narHash": "sha256-tHfFcNSmXLcUHhqiGRh2YZT8xioUq0zMOMZl9rjG8ys=",
+        "narHash": "sha256-Fo2UJmQHS855YSSKKmGrsQnJzXog1cdpkIOO72yYAM4=",
         "owner": "raspberrypi",
         "repo": "libpisp",
-        "rev": "50426319aa1a9ba4672f91977429365ad4e335a2",
+        "rev": "28196ed6edcfeda88d23cc5f213d51aa6fa17bb3",
         "type": "github"
       },
       "original": {
         "owner": "raspberrypi",
-        "ref": "v1.2.0",
+        "ref": "v1.0.7",
         "repo": "libpisp",
         "type": "github"
       }
@@ -834,11 +818,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779050451,
+        "lastModified": 1776018244,
-        "narHash": "sha256-tnytppL6f/7YJ4hKceNmkKpmwwZOKuqBFKmIEKUmy6c=",
+        "narHash": "sha256-rIuCVr2m4Lkz7j8mDUNqCz2R4Tzqyv/DTrr3yIis0Ec=",
         "ref": "refs/heads/main",
-        "rev": "6c53c5847556d335f7a5ef97820d8bfae79fd280",
+        "rev": "a93e9362031abd8d5315c1487d118c04305feea2",
-        "revCount": 66,
+        "revCount": 58,
         "type": "git",
         "url": "https://git.scug.io/nikkuss/pkgs.git"
       },
@@ -859,11 +843,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1779213531,
+        "lastModified": 1777542749,
-        "narHash": "sha256-B4pOfIX6CpCD/cKckwNP3DYDxEUBG1x/K3vqwYNonx4=",
+        "narHash": "sha256-j4W+WwdiRxTTFdsoB8A7jlLNLbMQANKJxh9eKf8nOIs=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "f4027707431220ffb660ae0da0e03fd5229ab4d9",
+        "rev": "36130bc452e0a84c07761d2e176ae875b48eebf3",
         "type": "github"
       },
       "original": {
@@ -892,11 +876,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1778858756,
+        "lastModified": 1777468255,
-        "narHash": "sha256-9VvAHNoi2wd0fxLfJOPChZMS7l6rhCtAJmpd59Hv5rw=",
+        "narHash": "sha256-lBZc1UMy+1P1T/E41j3jQrpS7EFI3qegd+ktHZdamIg=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "cd5ac3e5e04bb5a11276d3c755fa25242818e05f",
+        "rev": "dd1c3bcb9f1ef416df33ffa22d1d9bcee1398e7d",
         "type": "github"
       },
       "original": {
@@ -914,11 +898,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1779131761,
+        "lastModified": 1777227006,
-        "narHash": "sha256-DIdXwxWzhECkp2n/OF15llkEHoGXLjwjCCg7oU+Qd2o=",
+        "narHash": "sha256-A7GcOXjfo2xmZ3ERgN0j6GcqaVzqIf5zpYQcdfDaMr0=",
         "owner": "xddxdd",
         "repo": "nix-cachyos-kernel",
-        "rev": "56707a2b9725fd5b030f508565ae3a1327d6ac44",
+        "rev": "0f7e2bea4088227a80502557f6c0e3b74949d6b5",
         "type": "github"
       },
       "original": {
@@ -928,48 +912,13 @@
         "type": "github"
       }
     },
-    "nixos-hardware": {
-      "locked": {
-        "lastModified": 1779258371,
-        "narHash": "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "master",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
-    "nixos-wsl": {
-      "inputs": {
-        "flake-compat": "flake-compat_3",
-        "nixpkgs": "nixpkgs_5"
-      },
-      "locked": {
-        "lastModified": 1777732699,
-        "narHash": "sha256-2uX/XtOWZ/oy2rerRynVhqVA//ZXZ3Fo60PikLHEPQc=",
-        "owner": "nix-community",
-        "repo": "NixOS-WSL",
-        "rev": "5482f113fd31ebac131d1ebeb2ae90bf0d5e41f5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NixOS-WSL",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1778036283,
+        "lastModified": 1773628058,
-        "narHash": "sha256-62EWg6lI0qyzm7oAx5cAnGkLutvJsRBe0KkEW2JDZCE=",
+        "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ed67bc86e84e51d4a88e73c7fd36006dc876476f",
+        "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df",
         "type": "github"
       },
       "original": {
@@ -981,11 +930,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1777168982,
+        "lastModified": 1774748309,
-        "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
+        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
+        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
         "type": "github"
       },
       "original": {
@@ -996,11 +945,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1779102034,
+        "lastModified": 1777428379,
-        "narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=",
+        "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "687f05a9184cad4eaf905c48b63649e3a86f5433",
+        "rev": "755f5aa91337890c432639c60b6064bb7fe67769",
         "type": "github"
       },
       "original": {
@@ -1010,19 +959,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_10": {
-      "locked": {
-        "lastModified": 1778869304,
-        "narHash": "sha256-VdRy3A14M5vIE882DJcaaR+5wrss9Qsg4YNVbr7uj3k=",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre998534.d233902339c0/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1704008649,
@@ -1038,11 +974,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1778443072,
+        "lastModified": 1776877367,
-        "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
+        "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
+        "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
         "type": "github"
       },
       "original": {
@@ -1054,11 +990,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1779024751,
+        "lastModified": 1777187199,
-        "narHash": "sha256-fIE/HazjcoU/27WI3//uVg5AIntnVo1Q/GjMuBwPuHw=",
+        "narHash": "sha256-RJlLGrl+xHndIVK1NbPkIsItePNB3X4PIe8UTk3AHnw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3849902757e881ccbf21df80d592e3b94a35131c",
+        "rev": "facea5e538604efa4893c08770fe9fca5bf62c2f",
         "type": "github"
       },
       "original": {
@@ -1070,40 +1006,24 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1776169885,
+        "lastModified": 1777395829,
-        "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
+        "narHash": "sha256-G77zuprOFgsvOB78BfVeSYu71UOwCet4x3zAXkFZ9kI=",
-        "owner": "NixOS",
+        "rev": "e75f25705c2934955ee5075e62530d74aca973c6",
-        "repo": "nixpkgs",
-        "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1778869304,
-        "narHash": "sha256-vZOcDniDPc1cS8A4Xi5YE6AGyPIvEpy4GMyayA3SWIM=",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre998534.d233902339c0/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_7": {
+    "nixpkgs_6": {
       "locked": {
-        "lastModified": 1778869304,
+        "lastModified": 1776255774,
-        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
+        "narHash": "sha256-psVTpH6PK3q1htMJpmdz1hLF5pQgEshu7gQWgKO6t6Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
+        "rev": "566acc07c54dc807f91625bb286cb9b321b5f42a",
         "type": "github"
       },
       "original": {
@@ -1113,29 +1033,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_7": {
       "locked": {
-        "lastModified": 1774709303,
+        "lastModified": 1736061677,
-        "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
+        "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_9": {
-      "locked": {
-        "lastModified": 1745279238,
-        "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3",
+        "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36",
         "type": "github"
       },
       "original": {
@@ -1145,18 +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_3",
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": "nixpkgs_6",
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1779231450,
+        "lastModified": 1777236345,
-        "narHash": "sha256-5YgsQE2pzHw1YLiemIo55tQDWEeI7Og1n2D/X77kP2A=",
+        "narHash": "sha256-ALOqlq7bE30lsX4rA76hXeQ2aLLEpb44hS+D1+jWS88=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "5de0b035974d6281f0bab3e8ec46015c8ffbeed9",
+        "rev": "a67d9cd6ff725a763afe88727aac73208ded3bf4",
         "type": "github"
       },
       "original": {
@@ -1177,11 +1094,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777598946,
+        "lastModified": 1775228139,
-        "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=",
+        "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "5d55af01c0f86be583931fe99207fc56c14134b3",
+        "rev": "601971b9c89e0304561977f2c28fa25e73aa7132",
         "type": "github"
       },
       "original": {
@@ -1190,25 +1107,6 @@
         "type": "github"
       }
     },
-    "omp-nix": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_8"
-      },
-      "locked": {
-        "lastModified": 1779271700,
-        "narHash": "sha256-KtWAf0d6xkldTiR4J+m0qDn7uXb8zp/BlLWcHRbRAkg=",
-        "ref": "main",
-        "rev": "a5095961bde9827989cf4ed2d6efac2781b9ce3e",
-        "revCount": 66,
-        "type": "git",
-        "url": "https://git.molez.org/mandlm/omp-nix"
-      },
-      "original": {
-        "ref": "main",
-        "type": "git",
-        "url": "https://git.molez.org/mandlm/omp-nix"
-      }
-    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -1219,11 +1117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778507602,
+        "lastModified": 1776796298,
-        "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
+        "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
+        "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
         "type": "github"
       },
       "original": {
@@ -1236,23 +1134,25 @@
       "inputs": {
         "libcamera-src": "libcamera-src",
         "libpisp-src": "libpisp-src",
-        "nixpkgs": "nixpkgs_9",
+        "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",
-        "rpi-linux-6_12_20-src": "rpi-linux-6_12_20-src",
+        "rpi-linux-6_12_17-src": "rpi-linux-6_12_17-src",
+        "rpi-linux-6_6_78-src": "rpi-linux-6_6_78-src",
+        "rpi-linux-stable-src": "rpi-linux-stable-src",
         "rpicam-apps-src": "rpicam-apps-src"
       },
       "locked": {
-        "lastModified": 1745517382,
+        "lastModified": 1742223591,
-        "narHash": "sha256-yGuXArSvZ1AKOY6ufWbO3YNwYYMsYUk6aXOEYeYIJgk=",
+        "narHash": "sha256-ZNTz8r5jlJ1jvpqf5+aUYgpnYJSVX0iP14doOc1Hm0E=",
-        "owner": "cmyk",
+        "owner": "nix-community",
         "repo": "raspberry-pi-nix",
-        "rev": "79d5db180b4e933389affeee0c8959ae5975c5c3",
+        "rev": "3e8100d5e976a6a2be363015cb33463af9ef441a",
         "type": "github"
       },
       "original": {
-        "owner": "cmyk",
+        "owner": "nix-community",
         "repo": "raspberry-pi-nix",
         "type": "github"
       }
@@ -1271,11 +1171,8 @@
         "nik-pkgs": "nik-pkgs",
         "niri-flake": "niri-flake",
         "nix-cachyos-kernel": "nix-cachyos-kernel",
-        "nixos-hardware": "nixos-hardware",
+        "nixpkgs": "nixpkgs_5",
-        "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_6",
         "nixvim": "nixvim",
-        "omp-nix": "omp-nix",
         "raspberry-pi-nix": "raspberry-pi-nix",
         "sops-nix": "sops-nix",
         "spicetify-nix": "spicetify-nix",
@@ -1287,11 +1184,11 @@
     "rpi-bluez-firmware-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1741017538,
+        "lastModified": 1708969706,
-        "narHash": "sha256-t+D4VUfEIov83KV4wiKp6TqXTHXGkxg/mANi4GW7QHs=",
+        "narHash": "sha256-KakKnOBeWxh0exu44beZ7cbr5ni4RA9vkWYb9sGMb8Q=",
         "owner": "RPi-Distro",
         "repo": "bluez-firmware",
-        "rev": "2bbfb8438e824f5f61dae3f6ebb367a6129a4d63",
+        "rev": "78d6a07730e2d20c035899521ab67726dc028e1c",
         "type": "github"
       },
       "original": {
@@ -1304,11 +1201,11 @@
     "rpi-firmware-nonfree-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1741707399,
+        "lastModified": 1723266537,
-        "narHash": "sha256-n2u6dnFGVUDfUBXR+xL+k6A78JThMJc2rDjvWblReEY=",
+        "narHash": "sha256-T7eTKXqY9cxEMdab8Snda4CEOrEihy5uOhA6Fy+Mhnw=",
         "owner": "RPi-Distro",
         "repo": "firmware-nonfree",
-        "rev": "3900afffcd85198e3afab396fbf1d0abe5f76173",
+        "rev": "4b356e134e8333d073bd3802d767a825adec3807",
         "type": "github"
       },
       "original": {
@@ -1321,34 +1218,68 @@
     "rpi-firmware-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1742998042,
+        "lastModified": 1728405098,
-        "narHash": "sha256-o198RfJe2UUEjtEJnAVMrEG5bQkZca1nzsaUKOKVAQo=",
+        "narHash": "sha256-4gnK0KbqFnjBmWia9Jt2gveVWftmHrprpwBqYVqE/k0=",
         "owner": "raspberrypi",
         "repo": "firmware",
-        "rev": "f49a3960223f20ea0b2e30646f65be67bafe30dc",
+        "rev": "7bbb5f80d20a2335066a8781459c9f33e5eebc64",
         "type": "github"
       },
       "original": {
         "owner": "raspberrypi",
-        "ref": "1.20250326",
+        "ref": "1.20241008",
         "repo": "firmware",
         "type": "github"
       }
     },
-    "rpi-linux-6_12_20-src": {
+    "rpi-linux-6_12_17-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1742992765,
+        "lastModified": 1740765145,
-        "narHash": "sha256-hSlzUXkfsWiE/HsSOEEx9RQlN4lXj2UV8Qgcfq1T5pg=",
+        "narHash": "sha256-hoCsGc4+RC/2LmxDtswLBL5ZhWlw4vSiL4Vkl39r2MU=",
         "owner": "raspberrypi",
         "repo": "linux",
-        "rev": "cd231d4775b14f228606c09f219b48308f6ab3aa",
+        "rev": "5985ce32e511f4e8279a841a1b06a8c7d972b386",
         "type": "github"
       },
       "original": {
         "owner": "raspberrypi",
+        "ref": "rpi-6.12.y",
+        "repo": "linux",
+        "type": "github"
+      }
+    },
+    "rpi-linux-6_6_78-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1740503700,
+        "narHash": "sha256-Y8+ot4Yi3UKwlZK3ap15rZZ16VZDvmeFkD46+6Ku7bE=",
+        "owner": "raspberrypi",
+        "repo": "linux",
+        "rev": "2e071057fded90e789c0101498e45a1778be93fe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "rpi-6.6.y",
+        "repo": "linux",
+        "type": "github"
+      }
+    },
+    "rpi-linux-stable-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1728403745,
+        "narHash": "sha256-phCxkuO+jUGZkfzSrBq6yErQeO2Td+inIGHxctXbD5U=",
+        "owner": "raspberrypi",
+        "repo": "linux",
+        "rev": "5aeecea9f4a45248bcf564dec924965e066a7bfd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "stable_20241008",
         "repo": "linux",
-        "rev": "cd231d4775b14f228606c09f219b48308f6ab3aa",
         "type": "github"
       }
     },
@@ -1376,11 +1307,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777944972,
+        "lastModified": 1777338324,
-        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
+        "narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
+        "rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5",
         "type": "github"
       },
       "original": {
@@ -1391,15 +1322,15 @@
     },
     "spicetify-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_10",
+        "nixpkgs": "nixpkgs_8",
         "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1779000518,
+        "lastModified": 1777183994,
-        "narHash": "sha256-wdtytSnzMe85J/qeXJALMzSLRFTZ1gBHwn81l1PtT8k=",
+        "narHash": "sha256-zahis/vVFOsWv/HeyHbU13jxnrCC+ppIg49xG+viWxg=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "5dde76b38418892ccb3d99e99bed7f8a43ac294c",
+        "rev": "501256c3e670ca1679501ce3839ea805df00d8ba",
         "type": "github"
       },
       "original": {
@@ -1428,11 +1359,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1778776709,
+        "lastModified": 1777501441,
-        "narHash": "sha256-YhnEcpiY6+l3RFA+cPmdTaeODGvNRuqE8B7VBjPVIxo=",
+        "narHash": "sha256-+QWZ2/LvtEfbI4a5OiJmfv8aypBdm0u4Ui9t6LNHkRc=",
         "owner": "nix-community",
         "repo": "stylix",
-        "rev": "e8ea85b4f7dddda9603e0f1ac86cd92cee3b2819",
+        "rev": "0bd266569c03b74234b8a2ae73d05055fb02a35f",
         "type": "github"
       },
       "original": {
@@ -1550,11 +1481,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1777041405,
+        "lastModified": 1772661346,
-        "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=",
+        "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "5f868b3a338b6904c47f3833b9c411be641983a8",
+        "rev": "13b5b0c299982bb361039601e2d72587d6846294",
         "type": "github"
       },
       "original": {
@@ -1566,11 +1497,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1777169200,
+        "lastModified": 1772934010,
-        "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=",
+        "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac",
+        "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d",
         "type": "github"
       },
       "original": {
@@ -1582,11 +1513,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1777463218,
+        "lastModified": 1772909925,
-        "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=",
+        "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae",
+        "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df",
         "type": "github"
       },
       "original": {
@@ -1615,17 +1546,18 @@
     },
     "x1e-kernel": {
       "locked": {
-        "lastModified": 1776849143,
+        "lastModified": 1777545570,
-        "narHash": "sha256-41YSWFxindwVTkQF6UlRtkkIryNYWX0mpChvz/av4uc=",
+        "narHash": "sha256-FA0uzu5xe/STxNoD9/dWRsEvVEwUgU7ireMobdtCJBA=",
-        "ref": "refs/heads/main",
+        "ref": "bump-7.1-rc1",
-        "rev": "0569ea2dd459957d424b734e815860c52ecaaab3",
+        "rev": "a0257f88667f6463eb6fb0e7ba4e257829d3f947",
-        "revCount": 5,
+        "revCount": 7,
         "type": "git",
-        "url": "https://git.scug.io/nikkuss/x1e-nixos.git"
+        "url": "https://git.scug.io/doloro/x1e-nixos.git"
       },
       "original": {
+        "ref": "bump-7.1-rc1",
         "type": "git",
-        "url": "https://git.scug.io/nikkuss/x1e-nixos.git"
+        "url": "https://git.scug.io/doloro/x1e-nixos.git"
       }
     },
     "xdph": {
@@ -1656,11 +1588,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778265244,
+        "lastModified": 1777035886,
-        "narHash": "sha256-8jlPtGSsv/CQY6tVVyLF4Jjd0gnS+Zbn9yk/V13A9nM=",
+        "narHash": "sha256-m1TNuBoSXUBSKhD9UVMkU90M0wFTPTfvIOOltO8IM8A=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "813ea5ca9a1702a9a2d1f5836bc00172ef698968",
+        "rev": "ecfcdcc781f48821d83e1e2a0e30d7beca0eeb5e",
         "type": "github"
       },
       "original": {
@@ -1709,11 +1641,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778822459,
+        "lastModified": 1777352968,
-        "narHash": "sha256-hJlFMK7Es783KU/mhLEGC+xim/EqBMVdbsWgthquo6Y=",
+        "narHash": "sha256-BZ+BHCINHSyyCOWo4pCJQU4T994iZLiw7lgFMNw+W9k=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "90d4d395e2be09b2d314816dadd34660528c4ee4",
+        "rev": "bebce586893c7d441edd6cf9cf2cf62a1799361e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -30,12 +30,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-    nixos-wsl.url = "github:nix-community/NixOS-WSL";
     nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
     nixvim.url = "github:nix-community/nixvim";
-    omp-nix.url = "git+https://git.molez.org/mandlm/omp-nix?ref=main";
+    raspberry-pi-nix.url = "github:nix-community/raspberry-pi-nix";
-    raspberry-pi-nix.url = "github:cmyk/raspberry-pi-nix";
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -45,7 +42,7 @@
       url = "github:nix-community/stylix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    x1e-kernel.url = "git+https://git.scug.io/nikkuss/x1e-nixos.git";
+    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";