meow

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

@@ -4,17 +4,21 @@
   modules,
   inputs,
   ...
-}: {
+}:
+{
   den.aspects.doloro-desktop = {
     includes = [
       <den/primary-user>
       den.aspects.doloro-shared
       modules.sops
+      modules.flatpaks
       modules.hyprland
       modules.fish
       modules.tuigreet
       modules.kitty
+      modules.nikpkgs
       modules.fonts
+      modules.unity
       <modules/hyprland/doloro-settings>
       (modules.obs {
         audio = true;
@@ -30,35 +34,42 @@
       modules.quickshell
       modules.nix-ld
       modules.spotify
-      modules.easyeffects
+      # modules.easyeffects
       modules.lavd
       modules.ai
-      modules.omp
+      # modules.omp
       modules.podman
       <modules/ai/ollama-cuda>
     ];
-    nixos = {
+    nixos =
+      {
         config,
         pkgs,
         ...
-    }: {
+      }:
+      {
         users.users.doloro = {
           shell = pkgs.fish;
           hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path;
           extraGroups = [ "libvirtd" ];
         };
         virtualisation.libvirtd.enable = true;
+        # virtualisation.waydroid.enable = true;
+        # # Newer kernel versions may need
+        # virtualisation.waydroid.package = pkgs.waydroid-nftables;
         programs.virt-manager.enable = true;
       };
-    homeManager = {
+    homeManager =
+      {
         home,
         pkgs,
         ...
-    }: {
+      }:
+      {
         wayland.windowManager.hyprland.settings = {
           monitor = [
             "HDMI-A-1, 1920x1080@60, 0x0, 1"
-          "DP-3, 1920x1080@144, 1920x0, 1"
+            "DP-2, 1920x1080@120, 1920x0, 1"
           ];
           exec-once = [
             "hyprctl dispatch workspace 2" # shit solution to get quickshell on the right monitor
@@ -78,10 +89,26 @@
           obsidian
           # pear-desktop
           prismlauncher
-        deadlock-mod-manager
+          # deadlock-mod-manager
+          inputs.nik-pkgs.packages.x86_64-linux.grimorie
           gamescope
           android-studio
           blender
+          bottles
+          pi-coding-agent
+          (pkgs.symlinkJoin {
+            name = "orca-slicer";
+            paths = [ pkgs.orca-slicer ];
+            buildInputs = [ pkgs.makeWrapper ];
+            postBuild = ''
+              wrapProgram $out/bin/orca-slicer \
+                --prefix LC_ALL : C \
+                --prefix MESA_LOADER_DRIVER_OVERRIDE : zink \
+                --prefix WEBKIT_DISABLE_DMABUF_RENDERER : 1 \
+                --prefix __EGL_VENDOR_LIBRARY_FILENAMES : ${pkgs.mesa}/share/glvnd/egl_vendor.d/50_mesa.json \
+                --prefix GALLIUM_DRIVER : zink
+            '';
+          })
         ];
         programs.lutris.enable = true;
         nixpkgs.overlays = [

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

@@ -6,16 +6,19 @@
   __findFile,
   lib,
   ...
-}: {
+}:
+{
   den.aspects.desktop = {
     includes = [
       modules.nix
     ];
-    nixos = {
+    nixos =
+      {
         pkgs,
         config,
         ...
-    }: {
+      }:
+      {
         boot.loader.grub.enable = true;
         boot.loader.grub.device = "nodev";
         boot.loader.grub.devices = [
@@ -27,7 +30,7 @@
         boot.loader.grub.efiInstallAsRemovable = true;
         networking.hostName = "doloroo-main"; # Define your hostname.
 
-      boot.kernelPackages = pkgs.linuxPackages_latest;
+        # boot.kernelPackages = pkgs.linuxPackages_latest;
 
         boot.initrd.verbose = false;
         boot.kernelParams = [
@@ -70,7 +73,7 @@
           # Enable this if you have graphical corruption issues or application crashes after waking
           # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
           # of just the bare essentials.
-        powerManagement.enable = true;
+          powerManagement.enable = false;
 
           # Fine-grained power management. Turns off GPU when not in use.
           # Experimental and only works on modern Nvidia GPUs (Turing or newer).
@@ -83,7 +86,7 @@
           # supported GPUs is at:
           # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
           # Only available from driver 515.43.04+
-        open = true;
+          open = false;
 
           # Enable the Nvidia settings menu,
           # accessible via `nvidia-settings`.

config/hosts/aspects/doloro-shared.nix

@@ -3,8 +3,7 @@
   modules,
   __findFile,
   ...
-}:
+}: {
-{
   den.aspects.doloro-shared = {
     includes = [
       modules.nixvim
@@ -14,9 +13,11 @@
       modules.hyfetch
       modules.ssh
     ];
-    homeManager =
+    homeManager = {
-      { pkgs, lib, ... }:
+      pkgs,
-      {
+      lib,
+      ...
+    }: {
       home = {
         username = "doloro";
         homeDirectory = "/home/doloro";
@@ -24,13 +25,12 @@
           wl-clipboard
           # home-manager
           btop
+          pavucontrol
         ];
       };
       programs.home-manager.enable = true;
     };
-    nixos =
+    nixos = {lib, ...}: {
-      { lib, ... }:
-      {
     };
   };
 }

config/hosts/aspects/servers/rpi5.nix

@@ -31,6 +31,10 @@
 
       services.openssh.enable = true;
       nixpkgs.hostPlatform = "aarch64-linux";
+
+      nix.gc = {
+        automatic = true;
+      };
     };
   };
 }

config/modules/ai/ai.nix

@@ -14,9 +14,25 @@
       { pkgs, ... }:
       {
         home.packages = [
-          pkgs.opencode
           pkgs.claude-code
         ];
+        programs.opencode = {
+          enable = true;
+          extraPackages = with pkgs; [
+            rust-analyzer
+            typescript-language-server
+          ];
+          context = ''
+            Instructions:
+
+            - Do NOT preemptively load all references - use lazy loading based on actual need
+            - When loaded, treat content as mandatory instructions that override defaults
+            - Follow references recursively when needed
+          '';
+          settings = {
+            "lsp" = true;
+          };
+        };
       };
   };
 }

config/modules/ai/omp.nix

@@ -3,28 +3,15 @@
   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 = true;
-      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/dunst.nix

@@ -7,6 +7,7 @@
         settings = {
           global = {
             font = "Noto Nerd Font 8";
+            monitor = "DP-2";
           };
         };
       };

config/modules/fish.nix

@@ -1,5 +1,12 @@
-{ modules, ... }:
 {
+  modules,
+  inputs,
+  ...
+}:
+{
+  flake-file.inputs = {
+    direnv-instant.url = "github:Mic92/direnv-instant";
+  };
   modules.fish = {
     nixos = {
       programs.fish.enable = true;
@@ -8,7 +15,10 @@
       { pkgs, ... }:
       {
         home.shell.enableFishIntegration = true;
-        home.packages = [ pkgs.nix-output-monitor ];
+        home.packages = [
+          pkgs.nix-output-monitor
+          # pkgs.devenv
+        ];
         programs = {
           fish = {
             enable = true;
@@ -18,12 +28,11 @@
               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'
             plugins = [
               {
                 name = "bobthefish";
@@ -45,7 +54,7 @@
           };
           direnv = {
             enable = true;
-            nix-direnv.enable = true;
+            enableFishIntegration = true;
           };
         };
       };

config/modules/flatpaks.nix

@@ -0,0 +1,36 @@
+{ modules, inputs, ... }:
+{
+  flake-file.inputs = {
+    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
+  };
+  modules.flatpaks = {
+    nixos = {
+      imports = [
+        inputs.nix-flatpak.nixosModules.nix-flatpak
+      ];
+      services.flatpak = {
+        enable = true;
+      };
+    };
+    homeManager = {
+      imports = [
+        inputs.nix-flatpak.homeManagerModules.nix-flatpak
+      ];
+      services.flatpak = {
+        enable = true;
+        packages = [
+          {
+            flatpakref = "https://dl.flathub.org/repo/appstream/org.vinegarhq.Sober.flatpakref";
+            sha256 = "15ak2i5nk64wbmswqml2cqfgidczawqybmc7pmw94yp8wcd4yv6i";
+          }
+        ];
+      };
+      services.flatpak.remotes = [
+        {
+          name = "flathub-beta";
+          location = "https://flathub.org/beta-repo/flathub-beta.flatpakrepo";
+        }
+      ];
+    };
+  };
+}

config/modules/gaming/steam.nix

@@ -11,14 +11,14 @@
           localNetworkGameTransfers.openFirewall = true;
           # Ensure gamescope is inside the steam "fhs"
           package = pkgs.steam.override {
-            extraLibraries = pkgs: [ pkgs.xorg.libxcb ];
+            extraLibraries = pkgs: [ pkgs.libxcb ];
             extraPkgs =
               pkgs: with pkgs; [
                 attr
-                xorg.libXcursor
+                libxcursor
-                xorg.libXi
+                libxi
-                xorg.libXinerama
+                libxinerama
-                xorg.libXScrnSaver
+                libxscrnsaver
                 libpng
                 libpulseaudio
                 libvorbis

config/modules/hyprland/doloro-settings.nix

@@ -1,15 +1,18 @@
-{modules, ...}: {
+{ modules, ... }:
+{
   modules.hyprland = {
     provides = {
       doloro-settings = {
         includes = [
           modules.dunst
         ];
-        homeManager = {
+        homeManager =
+          {
             pkgs,
             home,
             ...
-        }: {
+          }:
+          {
             home.packages = [
               pkgs.hyprcursor
               pkgs.wlogout
@@ -25,6 +28,22 @@
               package = pkgs.rose-pine-hyprcursor;
               hyprcursor.enable = true;
             };
+            services.hyprpaper = {
+              enable = true;
+              settings = {
+                splash = true;
+                wallpaper = [
+                  {
+                    monitor = "HDMI-A-1";
+                    path = "/home/doloro/Wallpaper.jpg";
+                  }
+                  {
+                    monitor = "DP-2";
+                    path = "/home/doloro/Wallpaper.jpg";
+                  }
+                ];
+              };
+            };
             wayland.windowManager.hyprland.settings = {
               env = [
                 "XCURSOR_THEME,BreezeX-RosePine-Linux"
@@ -63,7 +82,7 @@
                 };
               };
               cursor = {
-              no_hardware_cursors = true;
+                no_hardware_cursors = false;
               };
               animations = {
                 enabled = true;
@@ -109,8 +128,7 @@
                 # vfr = true;
               };
               "$mainMod" = "SUPER";
-            bind =
+              bind = [
-              [
                 (
                   let
                     config = pkgs.writeTextFile {
@@ -131,7 +149,8 @@
                     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"
@@ -163,14 +182,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"
@@ -180,6 +200,7 @@
                 "match:class .*, suppress_event maximize"
                 "match:class ^(gamescope)$, workspace 5"
                 "match:class ^(gamescope)$, immediate true"
+                "match:class ^(gamescope)$, confine_pointer true"
                 "match:class ^(steam)$, workspace 6 silent"
                 "match:class ^(vesktop)$, workspace 8 silent"
                 "match:class ^(org.telegram.desktop)$, workspace 8 silent"

config/modules/hyprland/hyprland.nix

@@ -3,15 +3,12 @@
   inputs,
   lib,
   ...
-}:
+}: {
-{
   flake-file.inputs = {
     hyprland.url = "github:hyprwm/Hyprland";
   };
   modules.hyprland = {
-    nixos =
+    nixos = {pkgs, ...}: {
-      { pkgs, ... }:
-      {
       imports = [inputs.hyprland.nixosModules.default];
       environment.systemPackages = with pkgs; [
         wayfreeze
@@ -46,15 +43,15 @@
         # package32 = pkgs-unstable.pkgsi686Linux.mesa;
       };
     };
-    homeManager =
+    homeManager = {pkgs, ...}: {
-      { pkgs, ... }:
-      {
       gtk = {
         enable = true;
       };
+      # backupFileExtension = "backupHM";
       wayland.windowManager.hyprland = {
         enable = true;
         systemd.variables = ["--all"];
+        configType = "hyprlang";
       };
     };
   };

config/modules/kitty.nix

@@ -1,5 +1,8 @@
-{ den, modules, ... }:
 {
+  den,
+  modules,
+  ...
+}: {
   modules.kitty = {
     homeManager = {
       programs.kitty = {
@@ -12,6 +15,7 @@
           sync_to_monitor = "yes";
           background_opacity = 0.6;
           cursor_trail = 1;
+          auto_reload_config = -1;
         };
       };
     };

config/modules/nikpkgs.nix

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

config/modules/nix-ld.nix

@@ -24,19 +24,19 @@
             systemd
 
             # My own additions
-            xorg.libXcomposite
+            libxcomposite
-            xorg.libXtst
+            libxtst
-            xorg.libXrandr
+            libxrandr
-            xorg.libXext
+            libxext
-            xorg.libX11
+            libx11
-            xorg.libXfixes
+            libxfixes
             libGL
             libva
             pipewire
-            xorg.libxcb
+            libxcb
-            xorg.libXdamage
+            libxdamage
-            xorg.libxshmfence
+            libxshmfence
-            xorg.libXxf86vm
+            libxxf86vm
             libelf
 
             # Required
@@ -56,13 +56,13 @@
             # glibc_multi.bin # Seems to cause issue in ARM
 
             # # Without these it silently fails
-            xorg.libXinerama
+            libxinerama
-            xorg.libXcursor
+            libxcursor
-            xorg.libXrender
+            libxrender
-            xorg.libXScrnSaver
+            libxscrnsaver
-            xorg.libXi
+            libxi
-            xorg.libSM
+            libsm
-            xorg.libICE
+            libice
             gnome2.GConf
             nspr
             nss
@@ -88,13 +88,13 @@
             # other issue: (Unity:377230): GLib-GIO-CRITICAL **: 21:09:04.706: g_dbus_proxy_call_sync_internal: assertion 'G_IS_DBUS_PROXY (proxy)' failed
 
             # Verified games requirements
-            xorg.libXt
+            libxt
-            xorg.libXmu
+            libxmu
             libogg
             libvorbis
             SDL
             SDL2_image
-            glew110
+            glew_1_10
             libidn
             tbb
 
@@ -123,7 +123,7 @@
             libgcrypt
             libvpx
             librsvg
-            xorg.libXft
+            libxft
             libvdpau
             # ...
             # Some more libraries that I needed to run programs

config/modules/nix.nix

@@ -1,9 +1,12 @@
 {...}: {
+  flake-file.inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  };
   modules.nix = {
     nixos = {...}: {
       nixpkgs.config.allowUnfree = true;
       nix.settings = {
-        substituters = [
+        extra-substituters = [
           "https://hyprland.cachix.org"
           "https://nix-community.cachix.org"
           "https://cache.nixos.org/"

config/modules/nixvim/default.nix

@@ -4,19 +4,24 @@
   lib,
   inputs,
   ...
-}: {
+}:
+{
   # Its in its own folder for future modulizaion efforts
   flake-file.inputs = {
     nixvim = {
       url = "github:nix-community/nixvim";
-      # inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
   modules = {
     nixvim = {
-      nixos = {home-manager, ...}: {
+      nixos =
+        { home-manager, ... }:
+        {
         };
-      homeManager = {pkgs, ...}: let
+      homeManager =
+        { pkgs, ... }:
+        let
           tiny-code-action = pkgs.vimUtils.buildVimPlugin {
             name = "tiny-code-action.nvim";
             src = pkgs.fetchFromGitHub {
@@ -27,7 +32,8 @@
             };
             nvimSkipModules = [ "tiny-code-action.previewers.snacks" ];
           };
-      in {
+        in
+        {
           imports = [
             inputs.nixvim.homeModules.nixvim
           ];
@@ -40,15 +46,21 @@
               };
             };
             colorschemes.gruvbox-material.enable = true;
+            # colorschemes.melange = {
+            #   enable = true;
+            #   autoLoad = false;
+            # };
             extraPackages = with pkgs; [
               # formatters
-            alejandra
+              nixfmt-rs
               rustfmt
               # misc
               ripgrep
               nixd
               tree-sitter
               rust-analyzer
+              rustc
+              cargo
             ];
             performance.byteCompileLua = {
               enable = true;
@@ -58,8 +70,12 @@
               configs = true;
             };
             plugins = {
+              luasnip.enable = true;
+              cmp_luasnip.enable = true;
+              fidget.enable = true;
+              mini-comment.enable = true;
+              # cord.enable = true;
               todo-comments.enable = true;
-            lsp-status.enable = true;
               transparent.enable = true;
               which-key.enable = true;
               snacks.enable = true;
@@ -67,7 +83,7 @@
                 enable = true;
                 settings = {
                   formatters_by_ft = {
-                  nix = ["alejandra"];
+                    nix = [ "nixfmt" ];
                     rust = [ "rustfmt" ];
                     "_" = [
                       "squeeze_blanks"
@@ -93,12 +109,12 @@
               lsp = {
                 enable = true;
                 servers = {
-                qmlls = {
+                  # qmlls = {
-                  enable = true;
+                  #   enable = true;
-                  config = {
+                  #   config = {
-                    cmd = "-E";
+                  #     cmd = "-E";
-                  };
+                  #   };
-                };
+                  # };
                   rust_analyzer = {
                     enable = true;
                     installCargo = false;
@@ -169,7 +185,10 @@
               };
               web-devicons.enable = true;
               vim-dadbod-completion.enable = true;
-            telescope.enable = true;
+              telescope = {
+                enable = true;
+                extensions.file-browser.enable = true;
+              };
               lazygit.enable = true;
               mini-indentscope = {
                 enable = true;
@@ -188,21 +207,46 @@
                 };
               };
               lsp-lines.enable = true;
-            diaglist = {
+              trouble = {
                 enable = true;
                 settings = {
-                debug = false;
+                  auto_close = true;
+                  use_diagnostic_signs = true;
                 };
               };
               cmp = {
                 enable = true;
                 autoEnableSources = true;
+                cmdline = {
+                  ":" = {
+                    mapping.__raw = "cmp.mapping.preset.cmdline()";
+                    sources = [
+                      { name = "path"; }
+                      { name = "cmdline"; }
+                    ];
+                  };
+                  "/" = {
+                    mapping.__raw = "cmp.mapping.preset.cmdline()";
+                    sources = [
+                      { name = "buffer"; }
+                    ];
+                  };
+                };
                 settings = {
+                  snippet.expand.__raw = "function(args) require('luasnip').lsp_expand(args.body) end";
                   sources = [
                     {
                       name = "nvim_lsp";
                       priority = 100;
                     }
+                    {
+                      name = "nvim_lsp_signature_help";
+                      priority = 90;
+                    }
+                    {
+                      name = "luasnip";
+                      priority = 75;
+                    }
                     {
                       name = "buffer";
                       priority = 50;
@@ -218,8 +262,10 @@
                     "<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>" =
-                  "<Tab>" = "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() else fallback() end end, {'i', 's'})";
+                      "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() elseif require('luasnip').jumpable(-1) then require('luasnip').jump(-1) else fallback() end end, {'i', 's'})";
+                    "<Tab>" =
+                      "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() elseif require('luasnip').expand_or_jumpable() then require('luasnip').expand_or_jump() else fallback() end end, {'i', 's'})";
                   };
                   window = {
                     completion = {
@@ -271,17 +317,11 @@
                 ];
                 settings = {
                   highlight.enable = true;
-                indent.enable = true;
+                  indent.enable = false;
                 };
               };
             };
             extraPlugins = with pkgs; [
-            # vimPlugins.mini-completion
-            vimPlugins.mini-comment
-            vimPlugins.melange-nvim
-            vimPlugins.telescope-file-browser-nvim
-            vimPlugins.lsp-progress-nvim
-            vimPlugins.cmp-cmdline
               vimPlugins.cmp-nvim-lsp-signature-help
               tiny-code-action
             ];
@@ -291,35 +331,14 @@
               tabstop = 2;
               shiftwidth = 2;
               termguicolors = true;
+              completeopt = "menu,menuone,noselect";
             };
             globals = {
               mapleader = " ";
             };
             extraConfigLua = ''
-            local cmp = require('cmp')
+              -- tree-sitter-nix uses (#is-not? local) which the new nvim-treesitter main branch no longer registers
-            cmp.setup.cmdline(':', {
+              vim.treesitter.query.add_predicate("is-not?", function() return true end, { force = true })
-              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',
@@ -375,20 +394,117 @@
                 };
               }
               {
-              action = "<cmd>DiaglistToggle<cr>";
+                action = "<cmd>Trouble diagnostics toggle<cr>";
                 key = "<leader>fd";
                 options = {
                   silent = true;
+                  desc = "Toggle diagnostics (Trouble)";
                 };
               }
               {
                 action = "<cmd>lua require('tiny-code-action').code_action()<cr>";
                 key = "<leader>ca";
-              mode = ["n" "x"];
+                mode = [
+                  "n"
+                  "x"
+                ];
                 options = {
                   silent = true;
                 };
               }
+              # LSP
+              {
+                action = "<cmd>lua vim.lsp.buf.definition()<cr>";
+                key = "gd";
+                options = {
+                  silent = true;
+                  desc = "Go to definition";
+                };
+              }
+              {
+                action = "<cmd>lua vim.lsp.buf.declaration()<cr>";
+                key = "gD";
+                options = {
+                  silent = true;
+                  desc = "Go to declaration";
+                };
+              }
+              {
+                action = "<cmd>lua vim.lsp.buf.implementation()<cr>";
+                key = "gi";
+                options = {
+                  silent = true;
+                  desc = "Go to implementation";
+                };
+              }
+              {
+                action = "<cmd>lua vim.lsp.buf.type_definition()<cr>";
+                key = "<leader>D";
+                options = {
+                  silent = true;
+                  desc = "Go to type definition";
+                };
+              }
+              {
+                action = "<cmd>Telescope lsp_references<cr>";
+                key = "gr";
+                options = {
+                  silent = true;
+                  desc = "LSP references";
+                };
+              }
+              {
+                action = "<cmd>lua vim.lsp.buf.hover()<cr>";
+                key = "K";
+                options = {
+                  silent = true;
+                  desc = "Hover docs";
+                };
+              }
+              {
+                action = "<cmd>lua vim.lsp.buf.signature_help()<cr>";
+                key = "<C-k>";
+                mode = [
+                  "n"
+                  "i"
+                ];
+                options = {
+                  silent = true;
+                  desc = "Signature help";
+                };
+              }
+              {
+                action = "<cmd>lua vim.lsp.buf.rename()<cr>";
+                key = "<leader>rn";
+                options = {
+                  silent = true;
+                  desc = "Rename symbol";
+                };
+              }
+              {
+                action = "<cmd>lua vim.diagnostic.goto_prev()<cr>";
+                key = "[d";
+                options = {
+                  silent = true;
+                  desc = "Previous diagnostic";
+                };
+              }
+              {
+                action = "<cmd>lua vim.diagnostic.goto_next()<cr>";
+                key = "]d";
+                options = {
+                  silent = true;
+                  desc = "Next diagnostic";
+                };
+              }
+              {
+                action = "<cmd>lua vim.diagnostic.open_float()<cr>";
+                key = "<leader>e";
+                options = {
+                  silent = true;
+                  desc = "Show diagnostic float";
+                };
+              }
             ];
           };
         };

config/modules/obs.nix

@@ -1,14 +1,15 @@
-{ den, modules, ... }:
 {
+  den,
+  modules,
+  ...
+}: {
   modules.obs = settings: {
-    homeManager =
+    homeManager = {
-      {
       pkgs,
       lib,
       config,
       ...
-      }:
+    }: {
-      {
       programs = {
         obs-studio = {
           enable = true;
@@ -20,11 +21,12 @@
           plugins = with pkgs.obs-studio-plugins; [
             obs-pipewire-audio-capture
             obs-vkcapture
+            obs-vaapi #optional AMD hardware acceleration
+            obs-gstreamer
           ];
         };
       };
-        systemd.user.services =
+      systemd.user.services = let
-          let
         audio-set = lib.mkIf settings.audio {
           pw-discordaudio-virtual-device = {
             Unit = {
@@ -63,7 +65,7 @@
         lib.mergeAttrsList [audio-set];
 
       wayland.windowManager.hyprland.settings = {
-          exec-once = [ "${config.programs.obs-studio.finalPackage}/bin/obs --startreplaybuffer" ];
+        # exec-once = ["${config.programs.obs-studio.finalPackage}/bin/obs --startreplaybuffer"];
       };
     };
   };

config/modules/quickshell/quickshell/Audio.qml

@@ -22,15 +22,31 @@ Rectangle {
         id: content
         height: 20
         anchors.centerIn: parent
+        spacing: 4
+        Rectangle {
+            implicitWidth: 24
+            implicitHeight: 20
+            color: "transparent"
             Text {
-            id: speaker
+                anchors.centerIn: parent
-            text: root.defaultSpeaker.audio.muted ? "muted" : "unmuted"
+                text: root.defaultSpeaker.audio.muted ? "󰖁" : "󰕾"
+                font.family: "CaskaydiaCove NF"
+                font.pixelSize: 20
                 color: Colors.textPrimary
             }
+        }
+        Rectangle {
+            implicitWidth: 24
+            implicitHeight: 20
+            color: "transparent"
+            radius: 3
             Text {
-            id: mic
+                anchors.centerIn: parent
-            text: root.defaultMic.audio.muted ? "muted" : "unmuted"
+                text: root.defaultMic.audio.muted ? "" : ""
+                font.family: "CaskaydiaCove NFM"
+                font.pixelSize: 30
                 color: Colors.textPrimary
             }
         }
     }
+}

config/modules/services/caddy.nix

@@ -3,17 +3,17 @@
   __findFile,
   modules,
   ...
-}:
+}: {
-{
   # Basic caddy
   modules.services.provides.caddy = {
-    nixos =
+    nixos = {config, ...}: {
-      { config, ... }:
-      {
       services.caddy = {
         enable = true;
         email = "doloroo@proton.me";
         enableReload = true;
+        globalConfig = ''
+          acme_ca https://acme-v02.api.letsencrypt.org/directory
+        '';
       };
     };
   };

config/modules/services/ddns.nix

@@ -3,13 +3,14 @@
   __findFile,
   modules,
   ...
-}:
+}: {
-{
   # Basic traefik
   modules.services.provides.ddns = {
-    nixos =
+    nixos = {
-      { config, pkgs, ... }:
+      config,
-      let
+      pkgs,
+      ...
+    }: let
       ddnsImg = pkgs.dockerTools.pullImage {
         imageName = "qmcgaw/ddns-updater";
         imageDigest = "sha256:ee16ab4f6203bf9e5b0925d38a0b4ebf2d9f23771f933cfb2f5a2dbd5f9a2f88";
@@ -18,8 +19,7 @@
         sha256 = "sha256-dMCHkvoFaORmGwbIM9io4Vc9fq+wBks25k2dmnW7naI=";
         arch = "arm64";
       };
-      in
+    in {
-      {
       virtualisation.oci-containers.containers = {
         ddns = {
           image = "qmcgaw/ddns-updater";
@@ -28,10 +28,18 @@
             "/data/ddns:/updater/data"
             "/etc/localtime:/etc/localtime:ro"
           ];
-            # ports = [ "0.0.0.0:8123:8123" ];
+          ports = ["0.0.0.0:8125:8000"];
           # networks = [ "meow" ];
         };
       };
+      services.caddy = pkgs.lib.mkIf config.services.caddy.enable {
+        virtualHosts."ddns.h.doloro.co.uk".extraConfig = ''
+          reverse_proxy :8125
+          basic_auth {
+           	doloro $2a$14$FH.UkwC0PUsQ7IEV9XLAf.6/11KLsugCbrX/o6dPTx7NBlJWv3aiO
+          }
+        '';
+      };
     };
   };
 }

config/modules/services/registry.nix

@@ -40,7 +40,7 @@
         allowedUDPPortRanges = [];
       };
       services.caddy = pkgs.lib.mkIf config.services.caddy.enable {
-        virtualHosts."dockerRegistry.h.doloro.co.uk".extraConfig = ''
+        virtualHosts."https://reg.h.doloro.co.uk".extraConfig = ''
           reverse_proxy :5000
         '';
       };

config/modules/ssh.nix

@@ -8,10 +8,10 @@
           ssh = {
             enable = true;
             enableDefaultConfig = false;
-            matchBlocks = {
+            settings = {
               "*" = {
-                addKeysToAgent = "yes";
+                AddKeysToAgent = "yes";
-                identityFile = [
+                IdentityFile = [
                   "~/.ssh/id_ed25519"
                   "~/.ssh/id_gitea_scug"
                 ];

config/modules/stylix.nix

@@ -3,8 +3,7 @@
   modules,
   inputs,
   ...
-}:
+}: {
-{
   flake-file.inputs = {
     stylix = {
       url = "github:nix-community/stylix";
@@ -12,11 +11,9 @@
     };
   };
   modules.stylix = {
-    homeManager =
+    homeManager = {pkgs, ...}: {
-      { pkgs, ... }:
-      {
       imports = [inputs.stylix.homeModules.stylix];
-        gtk.gtk4.theme = null;
+      # gtk.gtk4.theme = null;
       stylix = {
         enable = true;
         autoEnable = false;
@@ -32,9 +29,7 @@
         base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
       };
     };
-    nixos =
+    nixos = {pkgs, ...}: {
-      { pkgs, ... }:
-      {
       imports = [inputs.stylix.nixosModules.stylix];
       stylix.enable = false;
       stylix.autoEnable = false;

config/modules/tmux.nix

@@ -1,10 +1,13 @@
-{modules, ...}: {
+{ modules, ... }:
+{
   modules.tmux = {
-    homeManager = {
+    homeManager =
+      {
         home,
         pkgs,
         ...
-    }: {
+      }:
+      {
         programs.tmux = {
           enable = true;
           plugins = with pkgs.tmuxPlugins; [
@@ -17,6 +20,7 @@
                       set -g status-bg black
                       set -g status-fg white
                       set -g mouse on
+            					set -g extended-keys on
           '';
         };
       };

config/modules/tuigreetd.nix

@@ -8,7 +8,7 @@
           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 --greeting 'meow meow meow' --time";
+              command = "${pkgs.tuigreet}/bin/tuigreet --sessions ${config.services.displayManager.sessionData.desktops}/share/xsessions:${config.services.displayManager.sessionData.desktops}/share/wayland-sessions --remember --remember-user-session --greeting 'meow meow meow' --time";
               user = "greeter";
             };
           };

config/modules/unity.nix

@@ -0,0 +1,11 @@
+{modules, ...}: {
+  modules.unity = {
+    homeManager = {pkgs, ...}: {
+      home.packages = [pkgs.unityhub pkgs.alcom pkgs.unityhub.fhsEnv];
+      home.file."unityExec" = {
+        source = "${pkgs.unityhub}/bin/unityhub";
+        recursive = true;
+      };
+    };
+  };
+}

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778620495,
+        "lastModified": 1780756231,
-        "narHash": "sha256-Gu7UhWjwKCgSiVC3Qz/Rc7cYi9DNuDTBxYzg3kfLvfM=",
+        "narHash": "sha256-tXQxKdG5716uB9/LIkLQqQwHKf5mRSpHoZhz3lyI2Cg=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "be35f75ac305f430f5f9d89b5f5a4af59ca7567e",
+        "rev": "6ecde03f47172753fe5a2f334f9d3facfb7e6784",
         "type": "github"
       },
       "original": {
@@ -120,11 +120,11 @@
     "cachyos-kernel": {
       "flake": false,
       "locked": {
-        "lastModified": 1779085181,
+        "lastModified": 1781455283,
-        "narHash": "sha256-ZdiBlGOkI9tS3ggyNlJ5gU4qCkvGWLT3sbrnHEemN2o=",
+        "narHash": "sha256-/71qSmWc0vIyGsvtADG8/uHnC/NvXPEY6TXRoDMufeo=",
         "owner": "CachyOS",
         "repo": "linux-cachyos",
-        "rev": "391e1e35d62d30dccd14ec3af01d58e5310b7d80",
+        "rev": "3bd5b77999c4180ed01bdd0669bfabc5171b090a",
         "type": "github"
       },
       "original": {
@@ -136,11 +136,11 @@
     "cachyos-kernel-patches": {
       "flake": false,
       "locked": {
-        "lastModified": 1779082750,
+        "lastModified": 1781257359,
-        "narHash": "sha256-yyk+TU5OF0JwTlTVqqvQIwsYWFZeSzGD5JqSUg52vHw=",
+        "narHash": "sha256-J2/PBS+5u6osnWZUB7UTjLaD+S8diM+6hlOWDoX/+bw=",
         "owner": "CachyOS",
         "repo": "kernel-patches",
-        "rev": "2c2eb7e421e954960dd336d7d45c24f949475958",
+        "rev": "46b45d26b536195f3ee8bc510b96b7fa47567163",
         "type": "github"
       },
       "original": {
@@ -165,16 +165,36 @@
         "type": "github"
       }
     },
-    "disko": {
+    "direnv-instant": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs",
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1779226674,
+        "lastModified": 1781161664,
-        "narHash": "sha256-wuOkjI6pRiN4sEn/EPBRnNW5cmcpvd7xtIM8y5LooAs=",
+        "narHash": "sha256-pALZH5SItoXJChOILlncSDlevnrxwaQrCmNVGrcn8ME=",
+        "owner": "Mic92",
+        "repo": "direnv-instant",
+        "rev": "57f5385e4c3df324201079553a98dd8e36c83858",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "direnv-instant",
+        "type": "github"
+      }
+    },
+    "disko": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1781152676,
+        "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "65fb947964bd44fc0008faf77d1fcb7a9f40bb32",
+        "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
         "type": "github"
       },
       "original": {
@@ -186,11 +206,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1776136500,
+        "lastModified": 1779670703,
-        "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=",
+        "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7",
+        "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9",
         "type": "github"
       },
       "original": {
@@ -264,11 +284,11 @@
     },
     "flake-file": {
       "locked": {
-        "lastModified": 1779051720,
+        "lastModified": 1781217157,
-        "narHash": "sha256-+jbXnODsR19pFKB0x/6kHhFgW6yV6N+CGClFr45eDU8=",
+        "narHash": "sha256-N3q/SP2Ropk336e9KSgLh7kpROY6P70dprYdbPIfd5c=",
         "owner": "vic",
         "repo": "flake-file",
-        "rev": "c58eb27d9434e5be0c8693f1eb18d47035bc21ba",
+        "rev": "ce63eaf7ebfe04a176653f66385a7f0a36380cee",
         "type": "github"
       },
       "original": {
@@ -280,6 +300,7 @@
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
+          "direnv-instant",
           "nixpkgs"
         ]
       },
@@ -299,7 +320,9 @@
     },
     "flake-parts_2": {
       "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
+        "nixpkgs-lib": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1778716662,
@@ -316,6 +339,24 @@
       }
     },
     "flake-parts_3": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1778716662,
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
           "nixvim",
@@ -336,7 +377,7 @@
         "type": "github"
       }
     },
-    "flake-parts_4": {
+    "flake-parts_5": {
       "inputs": {
         "nixpkgs-lib": [
           "stylix",
@@ -344,11 +385,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775087534,
+        "lastModified": 1778716662,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
         "type": "github"
       },
       "original": {
@@ -377,7 +418,7 @@
     },
     "font-patcher": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1765841187,
@@ -456,11 +497,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1778817414,
+        "lastModified": 1781324208,
-        "narHash": "sha256-U1pJAxTPbPMn/SCwePgIwoiMWD43QgUAIL7J3kxgAAU=",
+        "narHash": "sha256-bygOOsF1MFbhpl420ja6Md5bGIyRIJ2/UDS2nqEX1eA=",
         "owner": "vikingnope",
         "repo": "helium-browser-nix-flake",
-        "rev": "53a220890870c24d8c7ad6a21b8d63260e94507f",
+        "rev": "87c5dbbabd13547db8e14937c77bd3abce315d56",
         "type": "github"
       },
       "original": {
@@ -476,11 +517,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779213149,
+        "lastModified": 1781615165,
-        "narHash": "sha256-Cf+p/T4Z3n9Sw0TiR3kQaIwQI+/hfvLJcoTzeq6yS3E=",
+        "narHash": "sha256-CFF4fNNfr2GZSx1xJhBNBi7VMj8OtOqZGOV+fiBSbzw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bd868f769a69d3b6091a1da68a75cb83a181033c",
+        "rev": "34dd288e65012954cf7170658e0e6a61255b0327",
         "type": "github"
       },
       "original": {
@@ -558,17 +599,17 @@
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "hyprwire": "hyprwire",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems_2",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1779190425,
+        "lastModified": 1781551294,
-        "narHash": "sha256-C0hPhLeo3ztBXYSnpYarYjw6HDvlgZRnNyFfG5PoaVI=",
+        "narHash": "sha256-6cHkPGrQmd8RI/YdEgHmY3ebnPHHq07DxOxST70jYhI=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "203a121537d0868bd4d8258b58861ca970483157",
+        "rev": "88262e1f860adc56f528ef68b2909ee33a27186b",
         "type": "github"
       },
       "original": {
@@ -741,11 +782,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778234770,
+        "lastModified": 1780251518,
-        "narHash": "sha256-jAcsogZwWMfXT9MfXxZzkwliAqIuZUV0p71h6Ba9ReE=",
+        "narHash": "sha256-fG9xbb1SOAAJ+2kJRakp3ch+BmA/3dEg/K3PoAZTKkw=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "a2dbd8a4cc51f7cbe4224732668392bb1aa79df2",
+        "rev": "40ede2e7bdec80ba5d4c443160d905e9f841ae5f",
         "type": "github"
       },
       "original": {
@@ -860,16 +901,14 @@
     "nik-pkgs": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_5"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1779050451,
+        "lastModified": 1780649164,
-        "narHash": "sha256-tnytppL6f/7YJ4hKceNmkKpmwwZOKuqBFKmIEKUmy6c=",
+        "narHash": "sha256-r/mEL19Zf331vj31IWK51jdPfjyzpdRn/JLGtZ9rWqI=",
         "ref": "refs/heads/main",
-        "rev": "6c53c5847556d335f7a5ef97820d8bfae79fd280",
+        "rev": "5ae28029ef039da228ecbb9f55ab460a63093957",
-        "revCount": 66,
+        "revCount": 74,
         "type": "git",
         "url": "https://git.scug.io/nikkuss/pkgs.git"
       },
@@ -890,11 +929,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1779213531,
+        "lastModified": 1781610921,
-        "narHash": "sha256-B4pOfIX6CpCD/cKckwNP3DYDxEUBG1x/K3vqwYNonx4=",
+        "narHash": "sha256-PXyfDFGyW+UYteu3uHJgp49sFHRU16iocf5K2ltqn3M=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "f4027707431220ffb660ae0da0e03fd5229ab4d9",
+        "rev": "e5857dc58304b3d5bbac6340820f7d4450688538",
         "type": "github"
       },
       "original": {
@@ -923,11 +962,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1778858756,
+        "lastModified": 1781588278,
-        "narHash": "sha256-9VvAHNoi2wd0fxLfJOPChZMS7l6rhCtAJmpd59Hv5rw=",
+        "narHash": "sha256-Fw/Zo0hwgn9ulgY5duQy51WHtqpNoLjNDZYLdEI1SS4=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "cd5ac3e5e04bb5a11276d3c755fa25242818e05f",
+        "rev": "fdb6d85fc78355762bcf3cf71fe4037681a766f9",
         "type": "github"
       },
       "original": {
@@ -941,15 +980,15 @@
         "cachyos-kernel": "cachyos-kernel",
         "cachyos-kernel-patches": "cachyos-kernel-patches",
         "flake-compat": "flake-compat_2",
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts_3",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1779131761,
+        "lastModified": 1781463250,
-        "narHash": "sha256-DIdXwxWzhECkp2n/OF15llkEHoGXLjwjCCg7oU+Qd2o=",
+        "narHash": "sha256-gYE/0gtSedmA21UWRZ2DA+iXhySh1JGKOssuqejV7cQ=",
         "owner": "xddxdd",
         "repo": "nix-cachyos-kernel",
-        "rev": "56707a2b9725fd5b030f508565ae3a1327d6ac44",
+        "rev": "4039d20f1495f2c521e7d12723a0c45348b118e8",
         "type": "github"
       },
       "original": {
@@ -959,13 +998,32 @@
         "type": "github"
       }
     },
-    "nixos-hardware": {
+    "nix-flatpak": {
       "locked": {
-        "lastModified": 1779258371,
+        "lastModified": 1767983141,
-        "narHash": "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU=",
+        "narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "440818969ac2cbd77bfe025e884d0aa528991374",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "ref": "latest",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
+    "nixos-hardware": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_7"
+      },
+      "locked": {
+        "lastModified": 1781168557,
+        "narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77",
+        "rev": "6358ff76821101c178e3ab4919a62799bfe3652e",
         "type": "github"
       },
       "original": {
@@ -1006,7 +1064,7 @@
         "argononed": "argononed",
         "flake-compat": "flake-compat_3",
         "nixos-images": "nixos-images",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
         "lastModified": 1779023229,
@@ -1026,14 +1084,14 @@
     "nixos-wsl": {
       "inputs": {
         "flake-compat": "flake-compat_4",
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1777732699,
+        "lastModified": 1781182279,
-        "narHash": "sha256-2uX/XtOWZ/oy2rerRynVhqVA//ZXZ3Fo60PikLHEPQc=",
+        "narHash": "sha256-V5EQQbDnmdiXGQXrEF1PEL7QYsFqfH8N1E89Z5ONwFk=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "5482f113fd31ebac131d1ebeb2ae90bf0d5e41f5",
+        "rev": "5675822ba756e6e56f8f6a5a76e90e0da2ece94d",
         "type": "github"
       },
       "original": {
@@ -1044,16 +1102,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1778036283,
+        "lastModified": 1780749050,
-        "narHash": "sha256-62EWg6lI0qyzm7oAx5cAnGkLutvJsRBe0KkEW2JDZCE=",
+        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ed67bc86e84e51d4a88e73c7fd36006dc876476f",
+        "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -1075,11 +1133,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1779102034,
+        "lastModified": 1781509190,
-        "narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=",
+        "narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "687f05a9184cad4eaf905c48b63649e3a86f5433",
+        "rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4",
         "type": "github"
       },
       "original": {
@@ -1091,140 +1149,21 @@
     },
     "nixpkgs_10": {
       "locked": {
-        "lastModified": 1745279238,
+        "lastModified": 1781074563,
-        "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=",
+        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3",
+        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_11": {
-      "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,
-        "narHash": "sha256-rGPSWjXTXTurQN9beuHdyJhB8O761w1Zc5BqSSmHvoM=",
-        "path": "/nix/store/kh5mw1hsalj27ha1wfvksljxyaikcmyb-source",
-        "rev": "d44d59d2b5bd694cd9d996fd8c51d03e3e9ba7f7",
-        "type": "path"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1778443072,
-        "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1779024751,
-        "narHash": "sha256-fIE/HazjcoU/27WI3//uVg5AIntnVo1Q/GjMuBwPuHw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3849902757e881ccbf21df80d592e3b94a35131c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1778737229,
-        "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1776169885,
-        "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1778869304,
-        "narHash": "sha256-vZOcDniDPc1cS8A4Xi5YE6AGyPIvEpy4GMyayA3SWIM=",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre998534.d233902339c0/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
-      }
-    },
-    "nixpkgs_8": {
-      "locked": {
-        "lastModified": 1778869304,
-        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_9": {
       "locked": {
         "lastModified": 1774709303,
         "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
@@ -1240,18 +1179,171 @@
         "type": "github"
       }
     },
+    "nixpkgs_12": {
+      "locked": {
+        "lastModified": 1745279238,
+        "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_13": {
+      "locked": {
+        "lastModified": 1781074563,
+        "narHash": "sha256-d34lhgOet4IqYMnCxbIvwFBMOyTV6PT4TyNEOP0/ZhU=",
+        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1014179.9ae611a455b9/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1780930886,
+        "narHash": "sha256-rppURzHviaQN131F+nLiLdGfcb0uCd9gGP0E5+iw9MI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8c3cede7ddc26bd659d2d383b5610efbd2c7a16e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1704008649,
+        "narHash": "sha256-rGPSWjXTXTurQN9beuHdyJhB8O761w1Zc5BqSSmHvoM=",
+        "path": "/nix/store/kh5mw1hsalj27ha1wfvksljxyaikcmyb-source",
+        "rev": "d44d59d2b5bd694cd9d996fd8c51d03e3e9ba7f7",
+        "type": "path"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1780749050,
+        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1780011192,
+        "narHash": "sha256-luHrZG6I7Mwdt413XoDOYBpp9z1z6X23/5SNktwjM+k=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3242faf14b7611a62ce0f0071619438a08b65c12",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable-small",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1781421111,
+        "narHash": "sha256-2xSTHlKBF5h/tgAeHyQPR/g48qk9ACz7dED3jc3pGKA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "7fe8f446d9475534dc54591ccb5c87c1ce6eaf8b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable-small",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1767892417,
+        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
+        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
+      }
+    },
+    "nixpkgs_8": {
+      "locked": {
+        "lastModified": 1778737229,
+        "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_9": {
+      "locked": {
+        "lastModified": 1780243769,
+        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixvim": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_4",
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1779231450,
+        "lastModified": 1781713417,
-        "narHash": "sha256-5YgsQE2pzHw1YLiemIo55tQDWEeI7Og1n2D/X77kP2A=",
+        "narHash": "sha256-Kaj44jTNmnaFhKrcADx8nXmUYPa7l2HYfb7m6lEPy7Q=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "5de0b035974d6281f0bab3e8ec46015c8ffbeed9",
+        "rev": "caee4e5d4161778815f522d9ea1c9e3dc42462b7",
         "type": "github"
       },
       "original": {
@@ -1272,11 +1364,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777598946,
+        "lastModified": 1780281641,
-        "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=",
+        "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "5d55af01c0f86be583931fe99207fc56c14134b3",
+        "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01",
         "type": "github"
       },
       "original": {
@@ -1287,14 +1379,14 @@
     },
     "omp-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_9"
+        "nixpkgs": "nixpkgs_11"
       },
       "locked": {
-        "lastModified": 1779271700,
+        "lastModified": 1781618766,
-        "narHash": "sha256-KtWAf0d6xkldTiR4J+m0qDn7uXb8zp/BlLWcHRbRAkg=",
+        "narHash": "sha256-4PFt9cI8ZeBTwd0vOmf6NGES+AwkEcigjbWq3TgjtdY=",
         "ref": "main",
-        "rev": "a5095961bde9827989cf4ed2d6efac2781b9ce3e",
+        "rev": "cb27b28f71d5c86d950b055fa12037beab343423",
-        "revCount": 66,
+        "revCount": 187,
         "type": "git",
         "url": "https://git.molez.org/mandlm/omp-nix"
       },
@@ -1331,7 +1423,7 @@
       "inputs": {
         "libcamera-src": "libcamera-src",
         "libpisp-src": "libpisp-src",
-        "nixpkgs": "nixpkgs_10",
+        "nixpkgs": "nixpkgs_12",
         "rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
         "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
         "rpi-firmware-src": "rpi-firmware-src",
@@ -1355,9 +1447,10 @@
     "root": {
       "inputs": {
         "den": "den",
+        "direnv-instant": "direnv-instant",
         "disko": "disko",
         "flake-file": "flake-file",
-        "flake-parts": "flake-parts",
+        "flake-parts": "flake-parts_2",
         "font-patcher": "font-patcher",
         "heliumFlake": "heliumFlake",
         "home-manager": "home-manager",
@@ -1366,10 +1459,11 @@
         "nik-pkgs": "nik-pkgs",
         "niri-flake": "niri-flake",
         "nix-cachyos-kernel": "nix-cachyos-kernel",
+        "nix-flatpak": "nix-flatpak",
         "nixos-hardware": "nixos-hardware",
         "nixos-raspberrypi": "nixos-raspberrypi",
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": "nixpkgs_10",
         "nixvim": "nixvim",
         "omp-nix": "omp-nix",
         "raspberry-pi-nix": "raspberry-pi-nix",
@@ -1472,11 +1566,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777944972,
+        "lastModified": 1780547341,
-        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
+        "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
+        "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
         "type": "github"
       },
       "original": {
@@ -1487,15 +1581,15 @@
     },
     "spicetify-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_11",
+        "nixpkgs": "nixpkgs_13",
         "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1779000518,
+        "lastModified": 1781425310,
-        "narHash": "sha256-wdtytSnzMe85J/qeXJALMzSLRFTZ1gBHwn81l1PtT8k=",
+        "narHash": "sha256-GTBka4Df/ZOacmisI/DI2LICyNChEqn/giah83LucdM=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "5dde76b38418892ccb3d99e99bed7f8a43ac294c",
+        "rev": "aeaf7c81a45d3761da61cb05bfc370ac6d1b0441",
         "type": "github"
       },
       "original": {
@@ -1511,7 +1605,7 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_4",
+        "flake-parts": "flake-parts_5",
         "gnome-shell": "gnome-shell",
         "nixpkgs": [
           "nixpkgs"
@@ -1524,11 +1618,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1778776709,
+        "lastModified": 1781018772,
-        "narHash": "sha256-YhnEcpiY6+l3RFA+cPmdTaeODGvNRuqE8B7VBjPVIxo=",
+        "narHash": "sha256-C+cGIUaC6dqfwTbI+BwCd572PbESGA3WYxR1sLTqxkY=",
         "owner": "nix-community",
         "repo": "stylix",
-        "rev": "e8ea85b4f7dddda9603e0f1ac86cd92cee3b2819",
+        "rev": "a378e4c09031fb15a4d65da88aa628f71fc52f6b",
         "type": "github"
       },
       "original": {
@@ -1584,15 +1678,16 @@
     },
     "systems_4": {
       "locked": {
-        "lastModified": 1681028828,
+        "lastModified": 1774449309,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
         "owner": "nix-systems",
         "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "c29398b59d2048c4ab79345812849c9bd15e9150",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
+        "ref": "future-26.11",
         "repo": "default",
         "type": "github"
       }
@@ -1646,11 +1741,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1777041405,
+        "lastModified": 1777806186,
-        "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=",
+        "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "5f868b3a338b6904c47f3833b9c411be641983a8",
+        "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795",
         "type": "github"
       },
       "original": {
@@ -1662,11 +1757,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1777169200,
+        "lastModified": 1778379944,
-        "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=",
+        "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac",
+        "rev": "fe0203a198690e71a5ff11e08812a4673de3678d",
         "type": "github"
       },
       "original": {
@@ -1678,11 +1773,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1777463218,
+        "lastModified": 1778378178,
-        "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=",
+        "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae",
+        "rev": "9cd816033ff969415b190722cddf134e78a5665f",
         "type": "github"
       },
       "original": {
@@ -1691,6 +1786,27 @@
         "type": "github"
       }
     },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "direnv-instant",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1780220602,
+        "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "db947814a175b7ca6ded66e21383d938df01c227",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "utils": {
       "inputs": {
         "systems": "systems"
@@ -1711,11 +1827,11 @@
     },
     "x1e-kernel": {
       "locked": {
-        "lastModified": 1776849143,
+        "lastModified": 1781581349,
-        "narHash": "sha256-41YSWFxindwVTkQF6UlRtkkIryNYWX0mpChvz/av4uc=",
+        "narHash": "sha256-KCKvmmFhLVrUQ10qUfPPam7nTvriMrlVPHeo2Ey0CO8=",
         "ref": "refs/heads/main",
-        "rev": "0569ea2dd459957d424b734e815860c52ecaaab3",
+        "rev": "30c7f18e474fe8b6584600946c1fe9f688def838",
-        "revCount": 5,
+        "revCount": 7,
         "type": "git",
         "url": "https://git.scug.io/nikkuss/x1e-nixos.git"
       },
@@ -1752,11 +1868,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778265244,
+        "lastModified": 1780133819,
-        "narHash": "sha256-8jlPtGSsv/CQY6tVVyLF4Jjd0gnS+Zbn9yk/V13A9nM=",
+        "narHash": "sha256-0YPKIY3dlnR7SPq7Z8ekFVvzFsfeiAtEj+QUI3KHrlI=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "813ea5ca9a1702a9a2d1f5836bc00172ef698968",
+        "rev": "4a170c0ba96fd37374f93d8f91c9ed91814828ac",
         "type": "github"
       },
       "original": {
@@ -1785,11 +1901,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1773622265,
+        "lastModified": 1781226823,
-        "narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=",
+        "narHash": "sha256-28696iIw8uE0ZUyFTtzhEM8xMh85clCYypMxkvUi+sc=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "a879e5e0896a326adc79c474bf457b8b99011027",
+        "rev": "8575d0ef55d70f9b4c46b6bffb3accf912217e1e",
         "type": "github"
       },
       "original": {
@@ -1805,11 +1921,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778822459,
+        "lastModified": 1781415399,
-        "narHash": "sha256-hJlFMK7Es783KU/mhLEGC+xim/EqBMVdbsWgthquo6Y=",
+        "narHash": "sha256-t7l/1scSsVAlw1r/vjEIX+SquZa/z6ibcOLBuXdJH7E=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "90d4d395e2be09b2d314816dadd34660528c4ee4",
+        "rev": "83ab3c3da2ba1a76a20882dbd253711d2cb8dcba",
         "type": "github"
       },
       "original": {

flake.nix

@@ -4,6 +4,7 @@
 
   inputs = {
     den.url = "github:vic/den?ref=8101ec865c0bf4027d40b9fd8951e3e435a86d64";
+    direnv-instant.url = "github:Mic92/direnv-instant";
     disko.url = "github:nix-community/disko";
     flake-file.url = "github:vic/flake-file";
     flake-parts = {
@@ -21,20 +22,21 @@
     };
     hyprland.url = "github:hyprwm/Hyprland";
     import-tree.url = "github:vic/import-tree";
-    nik-pkgs = {
+    nik-pkgs.url = "git+https://git.scug.io/nikkuss/pkgs.git";
-      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";
+    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main";
     nixos-wsl.url = "github:nix-community/NixOS-WSL";
-    nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixvim.url = "github:nix-community/nixvim";
+    nixvim = {
+      url = "github:nix-community/nixvim";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     omp-nix.url = "git+https://git.molez.org/mandlm/omp-nix?ref=main";
     raspberry-pi-nix.url = "github:cmyk/raspberry-pi-nix";
     sops-nix = {