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"];
+          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 = [
@@ -46,7 +49,7 @@
           enable = true;
         };
 
-      services.xserver.videoDrivers = ["nvidia"];
+        services.xserver.videoDrivers = [ "nvidia" ];
 
         fileSystems."/mnt/2tb" = {
           device = "/dev/disk/by-uuid/0f49aec7-4af2-4f4f-b475-3f4fad2b59c2";
@@ -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];
+      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,16 +3,13 @@
   inputs,
   lib,
   ...
-}:
+}: {
-{
   flake-file.inputs = {
     hyprland.url = "github:hyprwm/Hyprland";
   };
   modules.hyprland = {
-    nixos =
+    nixos = {pkgs, ...}: {
-      { pkgs, ... }:
+      imports = [inputs.hyprland.nixosModules.default];
-      {
-        imports = [ inputs.hyprland.nixosModules.default ];
       environment.systemPackages = with pkgs; [
         wayfreeze
         grim
@@ -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" ];
+        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 ];
+      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 {
@@ -25,9 +30,10 @@
               rev = "main";
               hash = "sha256-UF9zeO5Uujdt2MEwy2d2Lhk6JRnEN4vrEvYslv0/zaA";
             };
-          nvimSkipModules = ["tiny-code-action.previewers.snacks"];
+            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,8 +83,8 @@
                 enable = true;
                 settings = {
                   formatters_by_ft = {
-                  nix = ["alejandra"];
+                    nix = [ "nixfmt" ];
-                  rust = ["rustfmt"];
+                    rust = [ "rustfmt" ];
                     "_" = [
                       "squeeze_blanks"
                       "trim_whitespace"
@@ -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;
@@ -142,34 +158,37 @@
                 enable = true;
                 settings = {
                   sections = {
-                  lualine_a = ["mode"];
+                    lualine_a = [ "mode" ];
                     lualine_b = [
                       "branch"
                       "diff"
                       "diagnostics"
                     ];
-                  lualine_c = ["filename"];
+                    lualine_c = [ "filename" ];
                     lualine_x = [
                       "encoding"
                       "fileformat"
                       "filetype"
                     ];
-                  lualine_y = ["progress"];
+                    lualine_y = [ "progress" ];
-                  lualine_z = ["location"];
+                    lualine_z = [ "location" ];
                   };
                   inactive_sections = {
-                  lualine_a = [];
+                    lualine_a = [ ];
-                  lualine_b = [];
+                    lualine_b = [ ];
-                  lualine_c = ["filename"];
+                    lualine_c = [ "filename" ];
-                  lualine_x = ["location"];
+                    lualine_x = [ "location" ];
-                  lualine_y = [];
+                    lualine_y = [ ];
-                  lualine_z = [];
+                    lualine_z = [ ];
                   };
                 };
               };
               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,19 +21,20 @@
           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 = {
               Description = "OBS daemon";
-                  After = [ "hyprland-session.target" ];
+              After = ["hyprland-session.target"];
             };
             Install = {
-                  WantedBy = [ "default.target" ];
+              WantedBy = ["default.target"];
             };
             Service = {
               ExecStart = "${pkgs.writeShellScript "discord_audio_virt_device" ''
@@ -45,10 +47,10 @@
           pw-gameaudio-virtual-device = {
             Unit = {
               Description = "OBS daemon";
-                  After = [ "hyprland-session.target" ];
+              After = ["hyprland-session.target"];
             };
             Install = {
-                  WantedBy = [ "default.target" ];
+              WantedBy = ["default.target"];
             };
             Service = {
               ExecStart = "${pkgs.writeShellScript "game_audio_virt_device" ''
@@ -60,10 +62,10 @@
           };
         };
       in
-          lib.mergeAttrsList [ audio-set ];
+        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/raspberry-pi.nix

@@ -7,32 +7,58 @@
 }: {
   flake-file.inputs = {
     raspberry-pi-nix.url = "github:cmyk/raspberry-pi-nix";
+    nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
   modules.raspberry-pi = {
     provides = {
       "5" = {
-        nixos = {
+        nixos = {pkgs, ...}: {
-          pkgs,
-          modulesPath,
-          ...
-        }: {
           imports = [
-            inputs.nixos-hardware.nixosModules.raspberry-pi-5
+            # inputs.nixos-hardware.nixosModules.raspberry-pi-5
-            "${modulesPath}/installer/sd-card/sd-image-aarch64.nix"
+            inputs.nixos-raspberrypi.lib.inject-overlays-global
+            inputs.nixos-raspberrypi.nixosModules.trusted-nix-caches
+            inputs.nixos-raspberrypi.lib.inject-overlays
+
+            inputs.nixos-raspberrypi.nixosModules.raspberry-pi-5.base
+            inputs.nixos-raspberrypi.nixosModules.raspberry-pi-5.page-size-16k
+            inputs.nixos-raspberrypi.nixosModules.raspberry-pi-5.display-vc4
+            inputs.nixos-raspberrypi.nixosModules.raspberry-pi-5.bluetooth
+
+            inputs.nixos-raspberrypi.nixosModules.sd-image
           ];
 
           environment.systemPackages = with pkgs; [
             libraspberrypi
           ];
 
+          _module.args = {inherit (inputs) nixos-raspberrypi;};
+
           sdImage.compressImage = false;
 
-          boot.initrd.systemd.tpm2.enable = false;
+          boot.loader.raspberry-pi.bootloader = "kernel";
-          boot.initrd.allowMissingModules = true;
+          # boot.initrd.systemd.tpm2.enable = false;
-          boot.zfs.forceImportRoot = false;
+          # boot.initrd.allowMissingModules = true;
+          boot.supportedFilesystems.zfs = false;
 
           # hardware.enableRedistributableFirmware = true;
+          # fileSystems = {
+          #   "/boot/firmware" = {
+          #     device = "/dev/disk/by-uuid/2175-794E";
+          #     fsType = "vfat";
+          #     options = [
+          #       "noatime"
+          #       "noauto"
+          #       "x-systemd.automount"
+          #       "x-systemd.idle-timeout=1min"
+          #     ];
+          #   };
+          #   "/" = {
+          #     device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
+          #     fsType = "ext4";
+          #     options = ["noatime"];
+          #   };
+          # };
         };
       };
     };

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;
-        imports = [ inputs.stylix.homeModules.stylix ];
-        gtk.gtk4.theme = null;
       stylix = {
         enable = true;
         autoEnable = false;
@@ -32,10 +29,8 @@
         base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
       };
     };
-    nixos =
+    nixos = {pkgs, ...}: {
-      { pkgs, ... }:
+      imports = [inputs.stylix.nixosModules.stylix];
-      {
-        imports = [ inputs.stylix.nixosModules.stylix ];
       stylix.enable = false;
       stylix.autoEnable = false;
       stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";

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.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,19 +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 = {