meow

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

@@ -4,12 +4,14 @@
   modules,
   inputs,
   ...
-}: {
+}:
+{
   den.aspects.doloro-desktop = {
     includes = [
       <den/primary-user>
       den.aspects.doloro-shared
       modules.sops
+      modules.flatpaks
       modules.hyprland
       modules.fish
       modules.tuigreet
@@ -35,70 +37,91 @@
       # modules.easyeffects
       modules.lavd
       modules.ai
-      modules.omp
+      # modules.omp
       modules.podman
       <modules/ai/ollama-cuda>
     ];
-    nixos = {
+    nixos =
-      config,
+      {
-      pkgs,
+        config,
-      ...
+        pkgs,
-    }: {
+        ...
-      users.users.doloro = {
+      }:
-        shell = pkgs.fish;
+      {
-        hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path;
+        users.users.doloro = {
-        extraGroups = ["libvirtd"];
+          shell = pkgs.fish;
-      };
+          hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path;
-      virtualisation.libvirtd.enable = true;
+          extraGroups = [ "libvirtd" ];
-      programs.virt-manager.enable = true;
-    };
-    homeManager = {
-      home,
-      pkgs,
-      ...
-    }: {
-      wayland.windowManager.hyprland.settings = {
-        monitor = [
-          "HDMI-A-1, 1920x1080@60, 0x0, 1"
-          "DP-2, 1920x1080@120, 1920x0, 1"
-        ];
-        exec-once = [
-          "hyprctl dispatch workspace 2" # shit solution to get quickshell on the right monitor
-        ];
-        workspace = [
-          "name:2, monitor:DP-3"
-        ];
-        input = {
-          kb_layout = "gb";
-          follow_mouse = 2;
-          sensitivity = -0.5;
         };
+        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 =
+      {
+        home,
+        pkgs,
+        ...
+      }:
+      {
+        wayland.windowManager.hyprland.settings = {
+          monitor = [
+            "HDMI-A-1, 1920x1080@60, 0x0, 1"
+            "DP-2, 1920x1080@120, 1920x0, 1"
+          ];
+          exec-once = [
+            "hyprctl dispatch workspace 2" # shit solution to get quickshell on the right monitor
+          ];
+          workspace = [
+            "name:2, monitor:DP-3"
+          ];
+          input = {
+            kb_layout = "gb";
+            follow_mouse = 2;
+            sensitivity = -0.5;
+          };
+        };
+        home.packages = with pkgs; [
+          equibop
+          telegram-desktop
+          obsidian
+          # pear-desktop
+          prismlauncher
+          # 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 = [
+          # 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;
       };
-      home.packages = with pkgs; [
-        equibop
-        telegram-desktop
-        obsidian
-        # pear-desktop
-        prismlauncher
-        # deadlock-mod-manager
-        inputs.nik-pkgs.packages.x86_64-linux.grimorie
-        gamescope
-        android-studio
-        blender
-        bottles
-      ];
-      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,95 +6,98 @@
   __findFile,
   lib,
   ...
-}: {
+}:
+{
   den.aspects.desktop = {
     includes = [
       modules.nix
     ];
-    nixos = {
+    nixos =
-      pkgs,
+      {
-      config,
+        pkgs,
-      ...
+        config,
-    }: {
+        ...
-      boot.loader.grub.enable = true;
+      }:
-      boot.loader.grub.device = "nodev";
+      {
-      boot.loader.grub.devices = [
+        boot.loader.grub.enable = true;
-        "/dev/disk/by-id/nvme-CT1000P2SSD8_2221E632CD1F"
+        boot.loader.grub.device = "nodev";
-        "nodev"
+        boot.loader.grub.devices = [
-      ];
+          "/dev/disk/by-id/nvme-CT1000P2SSD8_2221E632CD1F"
-      #boot.loader.efi.canTouchEfiVariables = true;
+          "nodev"
-      boot.loader.grub.efiSupport = true;
+        ];
-      boot.loader.grub.efiInstallAsRemovable = true;
+        #boot.loader.efi.canTouchEfiVariables = true;
-      networking.hostName = "doloroo-main"; # Define your hostname.
+        boot.loader.grub.efiSupport = true;
+        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.initrd.verbose = false;
-      boot.kernelParams = [
+        boot.kernelParams = [
-        "boot.shell_on_fail"
+          "boot.shell_on_fail"
-        "rd.systemd.show_status=auto"
+          "rd.systemd.show_status=auto"
-      ];
+        ];
 
-      services.openssh.enable = true;
+        services.openssh.enable = true;
 
-      networking.networkmanager.enable = true;
+        networking.networkmanager.enable = true;
-      networking.firewall.enable = false;
+        networking.firewall.enable = false;
 
-      security.rtkit.enable = true;
+        security.rtkit.enable = true;
 
-      hardware.graphics = {
+        hardware.graphics = {
-        enable = true;
+          enable = true;
-      };
+        };
 
-      services.xserver.videoDrivers = ["nvidia"];
+        services.xserver.videoDrivers = [ "nvidia" ];
 
-      fileSystems."/mnt/2tb" = {
+        fileSystems."/mnt/2tb" = {
-        device = "/dev/disk/by-uuid/0f49aec7-4af2-4f4f-b475-3f4fad2b59c2";
+          device = "/dev/disk/by-uuid/0f49aec7-4af2-4f4f-b475-3f4fad2b59c2";
-        fsType = "ext4";
+          fsType = "ext4";
-        options = [
+          options = [
-          # If you don't have this options attribute, it'll default to "defaults"
+            # If you don't have this options attribute, it'll default to "defaults"
-          # boot options for fstab. Search up fstab mount options you can use
+            # boot options for fstab. Search up fstab mount options you can use
-          "defaults"
+            "defaults"
-          "users" # Allows any user to mount and unmount
+            "users" # Allows any user to mount and unmount
-          "nofail" # Prevent system from failing if this drive doesn't mount
+            "nofail" # Prevent system from failing if this drive doesn't mount
-          "exec"
+            "exec"
+          ];
+        };
+        services.gnome.gnome-keyring.enable = true;
+
+        hardware.nvidia = {
+          # Modesetting is required.
+          modesetting.enable = true;
+
+          # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
+          # 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 = false;
+
+          # Fine-grained power management. Turns off GPU when not in use.
+          # Experimental and only works on modern Nvidia GPUs (Turing or newer).
+          powerManagement.finegrained = false;
+          # prime.offload.enable = true;
+
+          # Use the NVidia open source kernel module (not to be confused with the
+          # independent third-party "nouveau" open source driver).
+          # Support is limited to the Turing and later architectures. Full list of
+          # supported GPUs is at:
+          # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
+          # Only available from driver 515.43.04+
+          open = false;
+
+          # Enable the Nvidia settings menu,
+          # accessible via `nvidia-settings`.
+          nvidiaSettings = true;
+
+          # Optionally, you may need to select the appropriate driver version for your specific GPU.
+          package = config.boot.kernelPackages.nvidiaPackages.stable;
+        };
+        boot.binfmt.emulatedSystems = [
+          "aarch64-linux"
         ];
       };
-      services.gnome.gnome-keyring.enable = true;
-
-      hardware.nvidia = {
-        # Modesetting is required.
-        modesetting.enable = true;
-
-        # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
-        # 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 = false;
-
-        # Fine-grained power management. Turns off GPU when not in use.
-        # Experimental and only works on modern Nvidia GPUs (Turing or newer).
-        powerManagement.finegrained = false;
-        # prime.offload.enable = true;
-
-        # Use the NVidia open source kernel module (not to be confused with the
-        # independent third-party "nouveau" open source driver).
-        # Support is limited to the Turing and later architectures. Full list of
-        # supported GPUs is at:
-        # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
-        # Only available from driver 515.43.04+
-        open = false;
-
-        # Enable the Nvidia settings menu,
-        # accessible via `nvidia-settings`.
-        nvidiaSettings = true;
-
-        # Optionally, you may need to select the appropriate driver version for your specific GPU.
-        package = config.boot.kernelPackages.nvidiaPackages.stable;
-      };
-      boot.binfmt.emulatedSystems = [
-        "aarch64-linux"
-      ];
-    };
   };
 }

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,12 +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;
     };
   };
 }

config/modules/dunst.nix

@@ -1,4 +1,5 @@
-{modules, ...}: {
+{ modules, ... }:
+{
   modules.dunst = {
     homeManager = {
       services.dunst = {
@@ -6,6 +7,7 @@
         settings = {
           global = {
             font = "Noto Nerd Font 8";
+            monitor = "DP-2";
           };
         };
       };

config/modules/fish.nix

@@ -14,8 +14,6 @@
     homeManager =
       { pkgs, ... }:
       {
-        imports = [ inputs.direnv-instant.homeModules.direnv-instant ];
-        programs.direnv-instant.enable = true;
         home.shell.enableFishIntegration = true;
         home.packages = [
           pkgs.nix-output-monitor
@@ -35,19 +33,6 @@
                 set -gx COLORTERM truecolor
               end
             '';
-            interactiveShellInit = ''
-              # direnv-instant registers its hook on both fish_prompt and PWD,
-              # causing double execution on every cd. Re-register on PWD only.
-              functions --erase _direnv_hook
-              function _direnv_hook --on-variable PWD
-                set -gx DIRENV_INSTANT_SHELL fish
-                set -gx DIRENV_INSTANT_SHELL_PID $fish_pid
-                if test "$DIRENV_INSTANT_USE_CACHE" != 0 -a -n "$__DIRENV_INSTANT_ENV_FILE" -a -f "$__DIRENV_INSTANT_ENV_FILE"
-                  source "$__DIRENV_INSTANT_ENV_FILE"
-                end
-                direnv-instant start | source
-              end
-            '';
             plugins = [
               {
                 name = "bobthefish";
@@ -69,7 +54,7 @@
           };
           direnv = {
             enable = true;
-            enableFishIntegration = false;
+            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/hyprland/doloro-settings.nix

@@ -1,116 +1,134 @@
-{modules, ...}: {
+{ modules, ... }:
+{
   modules.hyprland = {
     provides = {
       doloro-settings = {
         includes = [
           modules.dunst
         ];
-        homeManager = {
+        homeManager =
-          pkgs,
+          {
-          home,
+            pkgs,
-          ...
+            home,
-        }: {
+            ...
-          home.packages = [
+          }:
-            pkgs.hyprcursor
+          {
-            pkgs.wlogout
+            home.packages = [
-            pkgs.tofi
+              pkgs.hyprcursor
-            pkgs.killall
+              pkgs.wlogout
-            pkgs.grim
+              pkgs.tofi
-            pkgs.slurp
+              pkgs.killall
-            pkgs.wayclip
+              pkgs.grim
-          ];
+              pkgs.slurp
-          home.pointerCursor = {
+              pkgs.wayclip
-            enable = true;
-            name = "rose-pine-hyprcursor";
-            package = pkgs.rose-pine-hyprcursor;
-            hyprcursor.enable = true;
-          };
-          wayland.windowManager.hyprland.settings = {
-            env = [
-              "XCURSOR_THEME,BreezeX-RosePine-Linux"
-              "XCURSOR_SIZE,24"
-              "HYPRCURSOR_SIZE,24"
-              "__GLX_VENDOR_LIBRARY_NAME,nvidia"
-              "WEBKIT_DISABLE_DMABUF_RENDERER,1" # maybe disable if nixos fixes alcom
             ];
-            general = {
+            home.pointerCursor = {
-              gaps_in = 1;
+              enable = true;
-              gaps_out = 1;
+              name = "rose-pine-hyprcursor";
-              border_size = 1;
+              package = pkgs.rose-pine-hyprcursor;
-              # "col.active_border" =
+              hyprcursor.enable = true;
-              #   "rgb(${toString base16.rgb."base06".r},${toString base16.rgb."base06".g},${toString base16.rgb."base06".b})";
-              # "col.inactive_border" =
-              #   "rgb(${toString base16.rgb."base03".r},${toString base16.rgb."base03".g},${toString base16.rgb."base03".b})";
-              resize_on_border = false;
-              allow_tearing = true;
-              layout = "dwindle";
             };
-            decoration = {
+            services.hyprpaper = {
-              rounding = 4;
+              enable = true;
-              rounding_power = 1;
+              settings = {
-              active_opacity = 1.0;
+                splash = true;
-              inactive_opacity = 1.0;
+                wallpaper = [
-
+                  {
-              shadow = {
+                    monitor = "HDMI-A-1";
-                enabled = false;
+                    path = "/home/doloro/Wallpaper.jpg";
+                  }
+                  {
+                    monitor = "DP-2";
+                    path = "/home/doloro/Wallpaper.jpg";
+                  }
+                ];
               };
+            };
+            wayland.windowManager.hyprland.settings = {
+              env = [
+                "XCURSOR_THEME,BreezeX-RosePine-Linux"
+                "XCURSOR_SIZE,24"
+                "HYPRCURSOR_SIZE,24"
+                "__GLX_VENDOR_LIBRARY_NAME,nvidia"
+                "WEBKIT_DISABLE_DMABUF_RENDERER,1" # maybe disable if nixos fixes alcom
+              ];
+              general = {
+                gaps_in = 1;
+                gaps_out = 1;
+                border_size = 1;
+                # "col.active_border" =
+                #   "rgb(${toString base16.rgb."base06".r},${toString base16.rgb."base06".g},${toString base16.rgb."base06".b})";
+                # "col.inactive_border" =
+                #   "rgb(${toString base16.rgb."base03".r},${toString base16.rgb."base03".g},${toString base16.rgb."base03".b})";
+                resize_on_border = false;
+                allow_tearing = true;
+                layout = "dwindle";
+              };
+              decoration = {
+                rounding = 4;
+                rounding_power = 1;
+                active_opacity = 1.0;
+                inactive_opacity = 1.0;
 
-              blur = {
+                shadow = {
+                  enabled = false;
+                };
+
+                blur = {
+                  enabled = true;
+                  passes = 1;
+                  new_optimizations = true;
+                  ignore_opacity = false;
+                };
+              };
+              cursor = {
+                no_hardware_cursors = false;
+              };
+              animations = {
                 enabled = true;
-                passes = 1;
+                bezier = [
-                new_optimizations = true;
+                  "easeOutQuint,0.23,1,0.32,1"
-                ignore_opacity = false;
+                  "easeInOutCubic,0.65,0.05,0.36,1"
+                  "linear,0,0,1,1"
+                  "almostLinear,0.5,0.5,0.75,1.0"
+                  "quick,0.15,0,0.1,1"
+                ];
+                animation = [
+                  "global, 1, 10, default"
+                  "border, 1, 5.39, easeOutQuint"
+                  "windows, 1, 2.79, easeOutQuint"
+                  "windowsIn, 1, 1, easeOutQuint, popin 87%"
+                  "windowsOut, 1, 1, linear, popin 87%"
+                  "windowsMove, 1, 1, easeInOutCubic"
+                  "fadeIn, 1, 0.5, almostLinear"
+                  "fadeOut, 1, 0.5, almostLinear"
+                  "fade, 1, 1, quick"
+                  "layers, 1, 3.81, easeOutQuint"
+                  "layersIn, 1, 4, easeOutQuint, fade"
+                  "layersOut, 1, 1.5, linear, fade"
+                  "fadeLayersIn, 1, 1.79, almostLinear"
+                  "fadeLayersOut, 1, 1.39, almostLinear"
+                  "workspaces, 1, 1, almostLinear, slide"
+                  "workspacesIn, 1, 1, easeInOutCubic, slide"
+                  "workspacesOut, 1, 1, easeInOutCubic, slide"
+                  "zoomFactor, 1, 7, quick"
+                ];
               };
-            };
+              dwindle = {
-            cursor = {
+                # pseudotile = true;
-              no_hardware_cursors = false;
+                preserve_split = true;
-            };
+              };
-            animations = {
+              # master = {
-              enabled = true;
+              # 	new_status = master;
-              bezier = [
+              # };
-                "easeOutQuint,0.23,1,0.32,1"
+              misc = {
-                "easeInOutCubic,0.65,0.05,0.36,1"
+                force_default_wallpaper = -1;
-                "linear,0,0,1,1"
+                disable_hyprland_logo = false;
-                "almostLinear,0.5,0.5,0.75,1.0"
+                enable_anr_dialog = false;
-                "quick,0.15,0,0.1,1"
+                # vfr = true;
-              ];
+              };
-              animation = [
+              "$mainMod" = "SUPER";
-                "global, 1, 10, default"
+              bind = [
-                "border, 1, 5.39, easeOutQuint"
-                "windows, 1, 2.79, easeOutQuint"
-                "windowsIn, 1, 1, easeOutQuint, popin 87%"
-                "windowsOut, 1, 1, linear, popin 87%"
-                "windowsMove, 1, 1, easeInOutCubic"
-                "fadeIn, 1, 0.5, almostLinear"
-                "fadeOut, 1, 0.5, almostLinear"
-                "fade, 1, 1, quick"
-                "layers, 1, 3.81, easeOutQuint"
-                "layersIn, 1, 4, easeOutQuint, fade"
-                "layersOut, 1, 1.5, linear, fade"
-                "fadeLayersIn, 1, 1.79, almostLinear"
-                "fadeLayersOut, 1, 1.39, almostLinear"
-                "workspaces, 1, 1, almostLinear, slide"
-                "workspacesIn, 1, 1, easeInOutCubic, slide"
-                "workspacesOut, 1, 1, easeInOutCubic, slide"
-                "zoomFactor, 1, 7, quick"
-              ];
-            };
-            dwindle = {
-              # pseudotile = true;
-              preserve_split = true;
-            };
-            # master = {
-            # 	new_status = master;
-            # };
-            misc = {
-              force_default_wallpaper = -1;
-              disable_hyprland_logo = false;
-              enable_anr_dialog = false;
-              # vfr = true;
-            };
-            "$mainMod" = "SUPER";
-            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"
@@ -150,7 +169,7 @@
                       fish -c 'grim -g $(slurp) -t png - &| wl-copy -t image/png; killall wayfreeze'
                     '';
                   in
-                    "$mainMod, S, exec, " + "wayfreeze --after-freeze-cmd '${script}'"
+                  "$mainMod, S, exec, " + "wayfreeze --after-freeze-cmd '${script}'"
                 )
                 "$mainMod, F, fullscreen"
                 "$mainMod, mouse_down, workspace, e+1"
@@ -163,40 +182,41 @@
               ]
               ++ (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 = [
+              bindm = [
-              "$mainMod, mouse:272, movewindow"
+                "$mainMod, mouse:272, movewindow"
-              "$mainMod, mouse:273, resizewindow"
+                "$mainMod, mouse:273, resizewindow"
-            ];
+              ];
-            windowrule = [
+              windowrule = [
-              "match:class .*, suppress_event maximize"
+                "match:class .*, suppress_event maximize"
-              "match:class ^(gamescope)$, workspace 5"
+                "match:class ^(gamescope)$, workspace 5"
-              "match:class ^(gamescope)$, immediate true"
+                "match:class ^(gamescope)$, immediate true"
-              "match:class ^(gamescope)$, confine_pointer true"
+                "match:class ^(gamescope)$, confine_pointer true"
-              "match:class ^(steam)$, workspace 6 silent"
+                "match:class ^(steam)$, workspace 6 silent"
-              "match:class ^(vesktop)$, workspace 8 silent"
+                "match:class ^(vesktop)$, workspace 8 silent"
-              "match:class ^(org.telegram.desktop)$, workspace 8 silent"
+                "match:class ^(org.telegram.desktop)$, workspace 8 silent"
-              "match:class ^(com.obsproject.Studio)$, workspace 10 silent"
+                "match:class ^(com.obsproject.Studio)$, workspace 10 silent"
-              "match:initial_title ^(OBS Studio Crash Detected)$, pin true"
+                "match:initial_title ^(OBS Studio Crash Detected)$, pin true"
-              "match:initial_title ^(Discord Popout)$, workspace 1 silent"
+                "match:initial_title ^(Discord Popout)$, workspace 1 silent"
-            ];
+              ];
-            layerrule = [
+              layerrule = [
-              "match:namespace ^(notifications)$, no_screen_share true"
+                "match:namespace ^(notifications)$, no_screen_share true"
-              # "match:namespace ^(quickshell)$, blur true"
+                # "match:namespace ^(quickshell)$, blur true"
-            ];
+              ];
-            # exec-once = [
+              # exec-once = [
-            # ];
+              # ];
-            # we need to auto launch: quickshell, steam, ar_rpc (maybe), vesktop, telegram, qbit, and obs
+              # we need to auto launch: quickshell, steam, ar_rpc (maybe), vesktop, telegram, qbit, and obs
+            };
           };
-        };
       };
     };
   };

config/modules/nixvim/default.nix

@@ -4,398 +4,510 @@
   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
+        {
-        tiny-code-action = pkgs.vimUtils.buildVimPlugin {
-          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 {
+      homeManager =
-        imports = [
+        { pkgs, ... }:
-          inputs.nixvim.homeModules.nixvim
+        let
-        ];
+          tiny-code-action = pkgs.vimUtils.buildVimPlugin {
-        programs.nixvim = {
+            name = "tiny-code-action.nvim";
-          enable = true;
+            src = pkgs.fetchFromGitHub {
-          defaultEditor = true;
+              owner = "rachartier";
-          nixpkgs = {
+              repo = "tiny-code-action.nvim";
-            config = {
+              rev = "main";
-              allowUnfree = true;
+              hash = "sha256-UF9zeO5Uujdt2MEwy2d2Lhk6JRnEN4vrEvYslv0/zaA";
             };
+            nvimSkipModules = [ "tiny-code-action.previewers.snacks" ];
           };
-          colorschemes.gruvbox-material.enable = true;
+        in
-          extraPackages = with pkgs; [
+        {
-            # formatters
+          imports = [
-            nixfmt-rs
+            inputs.nixvim.homeModules.nixvim
-            rustfmt
-            # misc
-            ripgrep
-            nixd
-            tree-sitter
-            rust-analyzer
           ];
-          performance.byteCompileLua = {
+          programs.nixvim = {
             enable = true;
-            plugins = true;
+            defaultEditor = true;
-            nvimRuntime = true;
+            nixpkgs = {
-            luaLib = true;
+              config = {
-            configs = true;
+                allowUnfree = true;
-          };
-          plugins = {
-            todo-comments.enable = true;
-            lsp-status.enable = true;
-            transparent.enable = true;
-            which-key.enable = true;
-            snacks.enable = true;
-            conform-nvim = {
-              enable = true;
-              settings = {
-                formatters_by_ft = {
-                  nix = ["nixfmt"];
-                  rust = ["rustfmt"];
-                  "_" = [
-                    "squeeze_blanks"
-                    "trim_whitespace"
-                    "trim_newlines"
-                  ];
-                };
-                format_on_save = {
-                  timeout_ms = 500;
-                  lsp_format = "fallback";
-                };
               };
             };
-            # efmls-configs = {
+            colorschemes.gruvbox-material.enable = true;
+            # colorschemes.melange = {
             #   enable = true;
-            #   languages = {
+            #   autoLoad = false;
-            #     scss = {
-            #       formatter = "prettier";
-            #       linter = "stylelint";
-            #     };
-            #   };
             # };
-            lsp = {
+            extraPackages = with pkgs; [
+              # formatters
+              nixfmt-rs
+              rustfmt
+              # misc
+              ripgrep
+              nixd
+              tree-sitter
+              rust-analyzer
+              rustc
+              cargo
+            ];
+            performance.byteCompileLua = {
               enable = true;
-              servers = {
+              plugins = true;
-                qmlls = {
+              nvimRuntime = true;
-                  enable = true;
+              luaLib = true;
-                  config = {
+              configs = true;
-                    cmd = "-E";
+            };
+            plugins = {
+              luasnip.enable = true;
+              cmp_luasnip.enable = true;
+              fidget.enable = true;
+              mini-comment.enable = true;
+              # cord.enable = true;
+              todo-comments.enable = true;
+              transparent.enable = true;
+              which-key.enable = true;
+              snacks.enable = true;
+              conform-nvim = {
+                enable = true;
+                settings = {
+                  formatters_by_ft = {
+                    nix = [ "nixfmt" ];
+                    rust = [ "rustfmt" ];
+                    "_" = [
+                      "squeeze_blanks"
+                      "trim_whitespace"
+                      "trim_newlines"
+                    ];
+                  };
+                  format_on_save = {
+                    timeout_ms = 500;
+                    lsp_format = "fallback";
                   };
                 };
-                rust_analyzer = {
+              };
-                  enable = true;
+              # efmls-configs = {
-                  installCargo = false;
+              #   enable = true;
-                  installRustc = false;
+              #   languages = {
-                };
+              #     scss = {
-                nixd = {
+              #       formatter = "prettier";
-                  enable = true;
+              #       linter = "stylelint";
-                  settings = {
+              #     };
-                    nixd = {
+              #   };
-                      nixpkgs.expr = "import (builtins.getFlake \"${toString /home/doloro/dotfiles}\").inputs.nixpkgs { }";
+              # };
-                      options = {
+              lsp = {
-                        nixos.expr = "(builtins.getFlake \"${toString /home/doloro/dotfiles}\").nixosConfigurations.desktop.options";
+                enable = true;
-                        home_manager.expr = "(builtins.getFlake \"${toString /home/doloro/dotfiles}\").homeConfigurations.doloro-desktop.options";
+                servers = {
+                  # qmlls = {
+                  #   enable = true;
+                  #   config = {
+                  #     cmd = "-E";
+                  #   };
+                  # };
+                  rust_analyzer = {
+                    enable = true;
+                    installCargo = false;
+                    installRustc = false;
+                  };
+                  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 = {
-                astro = {
+                    enable = true;
-                  enable = true;
-                };
-                ts_ls = {
-                  enable = true;
-                };
-                cssls.enable = true;
-                svelte.enable = true;
-              };
-            };
-            lsp-format = {
-              enable = true;
-              # lspServersToEnable = [ "qmlls" ];
-            };
-            notify = {
-              enable = true;
-              settings = {
-                background_color = "#00000000";
-              };
-            };
-            mini-cursorword.enable = true;
-            # mini-statusline.enable = true;
-            lualine = {
-              enable = true;
-              settings = {
-                sections = {
-                  lualine_a = ["mode"];
-                  lualine_b = [
-                    "branch"
-                    "diff"
-                    "diagnostics"
-                  ];
-                  lualine_c = ["filename"];
-                  lualine_x = [
-                    "encoding"
-                    "fileformat"
-                    "filetype"
-                  ];
-                  lualine_y = ["progress"];
-                  lualine_z = ["location"];
-                };
-                inactive_sections = {
-                  lualine_a = [];
-                  lualine_b = [];
-                  lualine_c = ["filename"];
-                  lualine_x = ["location"];
-                  lualine_y = [];
-                  lualine_z = [];
-                };
-              };
-            };
-            web-devicons.enable = true;
-            vim-dadbod-completion.enable = true;
-            telescope.enable = true;
-            lazygit.enable = true;
-            mini-indentscope = {
-              enable = true;
-              settings = {
-                draw = {
-                  delay = 10;
-                };
-              };
-            };
-            mini-files = {
-              enable = true;
-              settings = {
-                windows = {
-                  preview = true;
-                };
-              };
-            };
-            lsp-lines.enable = true;
-            diaglist = {
-              enable = true;
-              settings = {
-                debug = false;
-              };
-            };
-            cmp = {
-              enable = true;
-              autoEnableSources = true;
-              settings = {
-                sources = [
-                  {
-                    name = "nvim_lsp";
-                    priority = 100;
-                  }
-                  {
-                    name = "buffer";
-                    priority = 50;
-                  }
-                  {
-                    name = "path";
-                    priority = 40;
-                  }
-                ];
-                mapping = {
-                  "<C-Space>" = "cmp.mapping.complete()";
-                  "<C-d>" = "cmp.mapping.scroll_docs(-4)";
-                  "<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'})";
-                  "<Tab>" = "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() else fallback() end end, {'i', 's'})";
-                };
-                window = {
-                  completion = {
-                    border = "rounded";
-                    winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,CursorLine:PmenuSel,Search:None";
                   };
-                  documentation = {
+                  ts_ls = {
-                    border = "rounded";
+                    enable = true;
-                    winhighlight = "Normal:Pmenu,FloatBorder:Pmenu";
                   };
+                  cssls.enable = true;
+                  svelte.enable = true;
                 };
               };
-            };
+              lsp-format = {
-            lspkind.enable = true;
+                enable = true;
-            tiny-inline-diagnostic.enable = true;
+                # lspServersToEnable = [ "qmlls" ];
-            # tiny-code-action.enable = true;
-            # persisted.enable = true;
-            auto-session = {
-              enable = false;
-              settings = {
-                enabled = true;
-                auto_save = true;
-                auto_restore = true;
               };
-            };
-            wakatime.enable = true;
-            treesitter = {
-              enable = true;
-              grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
-                bash
-                css
-                html
-                javascript
-                json
-                lua
-                make
-                markdown
-                rust
-                nix
-                regex
-                toml
-                tsx
-                typescript
-                vim
-                vimdoc
-                xml
-                yaml
-                svelte
-              ];
-              settings = {
-                highlight.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
-            vimPlugins.cord-nvim
-            tiny-code-action
-          ];
-          opts = {
-            number = true;
-            bg = "dark";
-            tabstop = 2;
-            shiftwidth = 2;
-            termguicolors = true;
-          };
-          globals = {
-            mapleader = " ";
-          };
-          extraConfigLua = ''
-            -- tree-sitter-nix uses (#is-not? local) which the new nvim-treesitter main branch no longer registers
-            vim.treesitter.query.add_predicate("is-not?", function() return true end, { force = true })
-
-            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,
+                enable = true;
-                on_empty = true,
+                settings = {
-              },
+                  background_color = "#00000000";
-            })
+                };
-          '';
-          keymaps = [
-            {
-              action = "<cmd>Telescope persisted<cr>";
-              key = "<leader>fs";
-              options = {
-                silent = true;
               };
-            }
+              mini-cursorword.enable = true;
-            {
+              # mini-statusline.enable = true;
-              action = "<cmd>Telescope find_files<cr>";
+              lualine = {
-              key = "<leader>ff";
+                enable = true;
-              options = {
+                settings = {
-                silent = true;
+                  sections = {
+                    lualine_a = [ "mode" ];
+                    lualine_b = [
+                      "branch"
+                      "diff"
+                      "diagnostics"
+                    ];
+                    lualine_c = [ "filename" ];
+                    lualine_x = [
+                      "encoding"
+                      "fileformat"
+                      "filetype"
+                    ];
+                    lualine_y = [ "progress" ];
+                    lualine_z = [ "location" ];
+                  };
+                  inactive_sections = {
+                    lualine_a = [ ];
+                    lualine_b = [ ];
+                    lualine_c = [ "filename" ];
+                    lualine_x = [ "location" ];
+                    lualine_y = [ ];
+                    lualine_z = [ ];
+                  };
+                };
               };
-            }
+              web-devicons.enable = true;
-            {
+              vim-dadbod-completion.enable = true;
-              action = "<cmd>:lua MiniFiles.open()<cr>";
+              telescope = {
-              key = "<leader>fv";
+                enable = true;
-              options = {
+                extensions.file-browser.enable = true;
-                silent = true;
               };
-            }
+              lazygit.enable = true;
-            {
+              mini-indentscope = {
-              action = "<cmd>LazyGit<cr>";
+                enable = true;
-              key = "<leader>lg";
+                settings = {
-              options = {
+                  draw = {
-                silent = true;
+                    delay = 10;
+                  };
+                };
               };
-            }
+              mini-files = {
-            {
+                enable = true;
-              action = "<cmd>Telescope buffers<cr>";
+                settings = {
-              key = "<leader>fb";
+                  windows = {
-              options = {
+                    preview = true;
-                silent = true;
+                  };
+                };
               };
-            }
+              lsp-lines.enable = true;
-            {
+              trouble = {
-              action = "<cmd>Telescope live_grep<cr>";
+                enable = true;
-              key = "<leader>fg";
+                settings = {
-              options = {
+                  auto_close = true;
-                silent = true;
+                  use_diagnostic_signs = true;
+                };
               };
-            }
+              cmp = {
-            {
+                enable = true;
-              action = "<cmd>DiaglistToggle<cr>";
+                autoEnableSources = true;
-              key = "<leader>fd";
+                cmdline = {
-              options = {
+                  ":" = {
-                silent = true;
+                    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;
+                    }
+                    {
+                      name = "path";
+                      priority = 40;
+                    }
+                  ];
+                  mapping = {
+                    "<C-Space>" = "cmp.mapping.complete()";
+                    "<C-d>" = "cmp.mapping.scroll_docs(-4)";
+                    "<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() 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 = {
+                      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;
-              action = "<cmd>lua require('tiny-code-action').code_action()<cr>";
+              # tiny-code-action.enable = true;
-              key = "<leader>ca";
+              # persisted.enable = true;
-              mode = ["n" "x"];
+              auto-session = {
-              options = {
+                enable = false;
-                silent = true;
+                settings = {
+                  enabled = true;
+                  auto_save = true;
+                  auto_restore = true;
+                };
               };
-            }
+              wakatime.enable = true;
-          ];
+              treesitter = {
+                enable = true;
+                grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
+                  bash
+                  css
+                  html
+                  javascript
+                  json
+                  lua
+                  make
+                  markdown
+                  rust
+                  nix
+                  regex
+                  toml
+                  tsx
+                  typescript
+                  vim
+                  vimdoc
+                  xml
+                  yaml
+                  svelte
+                ];
+                settings = {
+                  highlight.enable = true;
+                  indent.enable = false;
+                };
+              };
+            };
+            extraPlugins = with pkgs; [
+              vimPlugins.cmp-nvim-lsp-signature-help
+              tiny-code-action
+            ];
+            opts = {
+              number = true;
+              bg = "dark";
+              tabstop = 2;
+              shiftwidth = 2;
+              termguicolors = true;
+              completeopt = "menu,menuone,noselect";
+            };
+            globals = {
+              mapleader = " ";
+            };
+            extraConfigLua = ''
+              -- tree-sitter-nix uses (#is-not? local) which the new nvim-treesitter main branch no longer registers
+              vim.treesitter.query.add_predicate("is-not?", function() return true end, { force = true })
+
+              require('tiny-code-action').setup({
+                backend = 'vim',
+                picker = 'snacks',
+                resolve_timeout = 100,
+                notify = {
+                  enabled = true,
+                  on_empty = true,
+                },
+              })
+            '';
+            keymaps = [
+              {
+                action = "<cmd>Telescope persisted<cr>";
+                key = "<leader>fs";
+                options = {
+                  silent = true;
+                };
+              }
+              {
+                action = "<cmd>Telescope find_files<cr>";
+                key = "<leader>ff";
+                options = {
+                  silent = true;
+                };
+              }
+              {
+                action = "<cmd>:lua MiniFiles.open()<cr>";
+                key = "<leader>fv";
+                options = {
+                  silent = true;
+                };
+              }
+              {
+                action = "<cmd>LazyGit<cr>";
+                key = "<leader>lg";
+                options = {
+                  silent = true;
+                };
+              }
+              {
+                action = "<cmd>Telescope buffers<cr>";
+                key = "<leader>fb";
+                options = {
+                  silent = true;
+                };
+              }
+              {
+                action = "<cmd>Telescope live_grep<cr>";
+                key = "<leader>fg";
+                options = {
+                  silent = true;
+                };
+              }
+              {
+                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"
+                ];
+                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/tmux.nix

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

flake.lock

@@ -120,11 +120,11 @@
     "cachyos-kernel": {
       "flake": false,
       "locked": {
-        "lastModified": 1780413908,
+        "lastModified": 1781455283,
-        "narHash": "sha256-T15bnskj20rdc4vJ55bFF2lVCVR8edilWn0hiYR7vVs=",
+        "narHash": "sha256-/71qSmWc0vIyGsvtADG8/uHnC/NvXPEY6TXRoDMufeo=",
         "owner": "CachyOS",
         "repo": "linux-cachyos",
-        "rev": "a61f943f5e94b75c5600a2968cb699d0e37945b3",
+        "rev": "3bd5b77999c4180ed01bdd0669bfabc5171b090a",
         "type": "github"
       },
       "original": {
@@ -136,11 +136,11 @@
     "cachyos-kernel-patches": {
       "flake": false,
       "locked": {
-        "lastModified": 1780462466,
+        "lastModified": 1781257359,
-        "narHash": "sha256-t6c7FTqMB0skEz+4tei5v8GEyL4fRDgx24oW3LrnYiE=",
+        "narHash": "sha256-J2/PBS+5u6osnWZUB7UTjLaD+S8diM+6hlOWDoX/+bw=",
         "owner": "CachyOS",
         "repo": "kernel-patches",
-        "rev": "bb41330bd4372672f552beda66712fb70b17f0fa",
+        "rev": "46b45d26b536195f3ee8bc510b96b7fa47567163",
         "type": "github"
       },
       "original": {
@@ -172,11 +172,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1780557299,
+        "lastModified": 1781161664,
-        "narHash": "sha256-FF1zYCdsh9q1QS8kFMYYGiaDUzxdBBfdtQT+x/15CpA=",
+        "narHash": "sha256-pALZH5SItoXJChOILlncSDlevnrxwaQrCmNVGrcn8ME=",
         "owner": "Mic92",
         "repo": "direnv-instant",
-        "rev": "0df681e3c0d544d7dc723cc9750a50cfc37b0095",
+        "rev": "57f5385e4c3df324201079553a98dd8e36c83858",
         "type": "github"
       },
       "original": {
@@ -190,11 +190,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1780894562,
+        "lastModified": 1781152676,
-        "narHash": "sha256-c3430xwxwhHipl3jigUGMMBfpaMylDqytW/kdmB3ZGs=",
+        "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "24fed06cac83bcc44ac8efbb57cab1a82fa0bedc",
+        "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
         "type": "github"
       },
       "original": {
@@ -284,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": {
@@ -497,11 +497,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1780855759,
+        "lastModified": 1781324208,
-        "narHash": "sha256-1x5KfTHXzsxyeixg0q7+WhBX6uKPHDHLdBDEUV4dR4I=",
+        "narHash": "sha256-bygOOsF1MFbhpl420ja6Md5bGIyRIJ2/UDS2nqEX1eA=",
         "owner": "vikingnope",
         "repo": "helium-browser-nix-flake",
-        "rev": "59981da497f383c61e1d2d20b86743a6663355bf",
+        "rev": "87c5dbbabd13547db8e14937c77bd3abce315d56",
         "type": "github"
       },
       "original": {
@@ -517,11 +517,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781009359,
+        "lastModified": 1781615165,
-        "narHash": "sha256-w/mZkRscTatf8NWyUstli8ROzM/eopxZzi0WRjoeYkU=",
+        "narHash": "sha256-CFF4fNNfr2GZSx1xJhBNBi7VMj8OtOqZGOV+fiBSbzw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c58ead12efcac436afffa93a22099a5595eb4157",
+        "rev": "34dd288e65012954cf7170658e0e6a61255b0327",
         "type": "github"
       },
       "original": {
@@ -605,11 +605,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1781028094,
+        "lastModified": 1781551294,
-        "narHash": "sha256-SIhZzLadXftCPHaSC56brK85oPFN7DPlG/a8Qq7EhRM=",
+        "narHash": "sha256-6cHkPGrQmd8RI/YdEgHmY3ebnPHHq07DxOxST70jYhI=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "b6633c4120a3f9607d6af719ceb6b0cbaa4605f9",
+        "rev": "88262e1f860adc56f528ef68b2909ee33a27186b",
         "type": "github"
       },
       "original": {
@@ -929,11 +929,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1781038035,
+        "lastModified": 1781610921,
-        "narHash": "sha256-X+uFuOQVWiouzl7eSV5JUgg4CAbv779QgEqOxIo6Gls=",
+        "narHash": "sha256-PXyfDFGyW+UYteu3uHJgp49sFHRU16iocf5K2ltqn3M=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "27982962e1dee4994b05d2b0b4a29f8de2529a55",
+        "rev": "e5857dc58304b3d5bbac6340820f7d4450688538",
         "type": "github"
       },
       "original": {
@@ -962,11 +962,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1780938415,
+        "lastModified": 1781588278,
-        "narHash": "sha256-QHyIMGSbCQW8d5qbOrMsm6gem10bO3Au2YLa3alJfHo=",
+        "narHash": "sha256-Fw/Zo0hwgn9ulgY5duQy51WHtqpNoLjNDZYLdEI1SS4=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "6f1a2c5f0e8274223d4204b1f8d6f7f91538967e",
+        "rev": "fdb6d85fc78355762bcf3cf71fe4037681a766f9",
         "type": "github"
       },
       "original": {
@@ -984,11 +984,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1780771919,
+        "lastModified": 1781463250,
-        "narHash": "sha256-cbace1ZTWYFG0luPL7OFlUxDh/t9lmPj+Isvg9hLN0k=",
+        "narHash": "sha256-gYE/0gtSedmA21UWRZ2DA+iXhySh1JGKOssuqejV7cQ=",
         "owner": "xddxdd",
         "repo": "nix-cachyos-kernel",
-        "rev": "3d940a534da0ba6bce60e345ff2c9c7b062087fb",
+        "rev": "4039d20f1495f2c521e7d12723a0c45348b118e8",
         "type": "github"
       },
       "original": {
@@ -998,16 +998,32 @@
         "type": "github"
       }
     },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1767983141,
+        "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": 1781020964,
+        "lastModified": 1781168557,
-        "narHash": "sha256-fS7xTi2j2iso5Hj7RNZLv/acDlCT+fgMVkVk40A7Uco=",
+        "narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "32c2cd9e46286c4eced3dc6b613c659126bf3cca",
+        "rev": "6358ff76821101c178e3ab4919a62799bfe3652e",
         "type": "github"
       },
       "original": {
@@ -1071,11 +1087,11 @@
         "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1780765279,
+        "lastModified": 1781182279,
-        "narHash": "sha256-md6QHmlIx40bQkun43M2eT8aav5GURGkXEMFwof6uZs=",
+        "narHash": "sha256-V5EQQbDnmdiXGQXrEF1PEL7QYsFqfH8N1E89Z5ONwFk=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "3e6d8af994e2a2d31af7a91863d7c0d6e278d951",
+        "rev": "5675822ba756e6e56f8f6a5a76e90e0da2ece94d",
         "type": "github"
       },
       "original": {
@@ -1086,11 +1102,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1780243769,
+        "lastModified": 1780749050,
-        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
+        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
+        "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
         "type": "github"
       },
       "original": {
@@ -1117,11 +1133,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1780952837,
+        "lastModified": 1781509190,
-        "narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=",
+        "narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe",
+        "rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4",
         "type": "github"
       },
       "original": {
@@ -1133,11 +1149,11 @@
     },
     "nixpkgs_10": {
       "locked": {
-        "lastModified": 1780749050,
+        "lastModified": 1781074563,
-        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
+        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
+        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
         "type": "github"
       },
       "original": {
@@ -1148,22 +1164,6 @@
       }
     },
     "nixpkgs_11": {
-      "locked": {
-        "lastModified": 1780336545,
-        "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_12": {
       "locked": {
         "lastModified": 1774709303,
         "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
@@ -1179,7 +1179,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_13": {
+    "nixpkgs_12": {
       "locked": {
         "lastModified": 1745279238,
         "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=",
@@ -1195,13 +1195,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_14": {
+    "nixpkgs_13": {
       "locked": {
-        "lastModified": 1779560665,
+        "lastModified": 1781074563,
-        "narHash": "sha256-NpH8iEQ5JHv/BtUuzTEXUMDxPLetCDzIv4OxL8H7Kps=",
+        "narHash": "sha256-d34lhgOet4IqYMnCxbIvwFBMOyTV6PT4TyNEOP0/ZhU=",
-        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
+        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre1004030.64c08a7ca051/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1014179.9ae611a455b9/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
@@ -1210,11 +1210,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1780747962,
+        "lastModified": 1780930886,
-        "narHash": "sha256-IX7G1dlKrOqPOImfbo7ADDfV5yU1+j+MRChI3TL4tAA=",
+        "narHash": "sha256-rppURzHviaQN131F+nLiLdGfcb0uCd9gGP0E5+iw9MI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73",
+        "rev": "8c3cede7ddc26bd659d2d383b5610efbd2c7a16e",
         "type": "github"
       },
       "original": {
@@ -1271,11 +1271,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1780751787,
+        "lastModified": 1781421111,
-        "narHash": "sha256-nWR7F46SyrLvN8Ot39XJDpVCswekGakXlOD4KsTYKW0=",
+        "narHash": "sha256-2xSTHlKBF5h/tgAeHyQPR/g48qk9ACz7dED3jc3pGKA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "00fa9a692bafc08a86061886f888b843bf7fbdb0",
+        "rev": "7fe8f446d9475534dc54591ccb5c87c1ce6eaf8b",
         "type": "github"
       },
       "original": {
@@ -1333,15 +1333,17 @@
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts_4",
-        "nixpkgs": "nixpkgs_11",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1781034432,
+        "lastModified": 1781713417,
-        "narHash": "sha256-+UuS36un3lXLtKsGCYQnOn51hDhB+dZ1SHoHXClnV/0=",
+        "narHash": "sha256-Kaj44jTNmnaFhKrcADx8nXmUYPa7l2HYfb7m6lEPy7Q=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "e9fbbd56eab78751ba4c166c31a1667042528ced",
+        "rev": "caee4e5d4161778815f522d9ea1c9e3dc42462b7",
         "type": "github"
       },
       "original": {
@@ -1377,14 +1379,14 @@
     },
     "omp-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_12"
+        "nixpkgs": "nixpkgs_11"
       },
       "locked": {
-        "lastModified": 1780981246,
+        "lastModified": 1781618766,
-        "narHash": "sha256-3q8dZYqYwRkslQZvhqvs/xZfz32L8EayTVIS6zKwUqU=",
+        "narHash": "sha256-4PFt9cI8ZeBTwd0vOmf6NGES+AwkEcigjbWq3TgjtdY=",
         "ref": "main",
-        "rev": "611f0b280b81c0187eb8612f2d335dbab90e5071",
+        "rev": "cb27b28f71d5c86d950b055fa12037beab343423",
-        "revCount": 115,
+        "revCount": 187,
         "type": "git",
         "url": "https://git.molez.org/mandlm/omp-nix"
       },
@@ -1421,7 +1423,7 @@
       "inputs": {
         "libcamera-src": "libcamera-src",
         "libpisp-src": "libpisp-src",
-        "nixpkgs": "nixpkgs_13",
+        "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",
@@ -1457,6 +1459,7 @@
         "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",
@@ -1578,15 +1581,15 @@
     },
     "spicetify-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_14",
+        "nixpkgs": "nixpkgs_13",
         "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1780857688,
+        "lastModified": 1781425310,
-        "narHash": "sha256-e4E6M6erJIus5Cm/A4faaaTuUfof1uvcviAPSh7tmLU=",
+        "narHash": "sha256-GTBka4Df/ZOacmisI/DI2LICyNChEqn/giah83LucdM=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "aad629e8261f219b0a5b3a2189b09d65216a0983",
+        "rev": "aeaf7c81a45d3761da61cb05bfc370ac6d1b0441",
         "type": "github"
       },
       "original": {
@@ -1824,11 +1827,11 @@
     },
     "x1e-kernel": {
       "locked": {
-        "lastModified": 1780078420,
+        "lastModified": 1781581349,
-        "narHash": "sha256-ZQ2gZRcE227EhG8YrEHnWkSbw5Wgd5IckLmpEV2SkN8=",
+        "narHash": "sha256-KCKvmmFhLVrUQ10qUfPPam7nTvriMrlVPHeo2Ey0CO8=",
         "ref": "refs/heads/main",
-        "rev": "931cf9966ba3a213946329ce95b07635a34cd839",
+        "rev": "30c7f18e474fe8b6584600946c1fe9f688def838",
-        "revCount": 6,
+        "revCount": 7,
         "type": "git",
         "url": "https://git.scug.io/nikkuss/x1e-nixos.git"
       },
@@ -1898,11 +1901,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1779745227,
+        "lastModified": 1781226823,
-        "narHash": "sha256-yqY7RtEJGJiENzR0GwL6q69tSAy6xAAmAcLuIhLjPf8=",
+        "narHash": "sha256-28696iIw8uE0ZUyFTtzhEM8xMh85clCYypMxkvUi+sc=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "5d1efbc9dc3ab1c10160b656e0247f3325daf0f2",
+        "rev": "8575d0ef55d70f9b4c46b6bffb3accf912217e1e",
         "type": "github"
       },
       "original": {
@@ -1918,11 +1921,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780637620,
+        "lastModified": 1781415399,
-        "narHash": "sha256-ngPdHinPyF0AMxRr32qt+TZCv0sagmooBW14u6DfjSU=",
+        "narHash": "sha256-t7l/1scSsVAlw1r/vjEIX+SquZa/z6ibcOLBuXdJH7E=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "8c62bc6a72ac5a5b8d1b41b2b88dfed9d9932c48",
+        "rev": "83ab3c3da2ba1a76a20882dbd253711d2cb8dcba",
         "type": "github"
       },
       "original": {

flake.nix

@@ -28,11 +28,15 @@
       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 = "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 = {