meow

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

@@ -4,7 +4,8 @@
   modules,
   inputs,
   ...
-}: {
+}:
+{
   den.aspects.doloro-desktop = {
     includes = [
       <den/primary-user>
@@ -14,9 +15,7 @@
       modules.fish
       modules.tuigreet
       modules.kitty
-      modules.nikpkgs
       modules.fonts
-      modules.unity
       <modules/hyprland/doloro-settings>
       (modules.obs {
         audio = true;
@@ -32,35 +31,26 @@
       modules.quickshell
       modules.nix-ld
       modules.spotify
-      # modules.easyeffects
+      modules.easyeffects
       modules.lavd
       modules.ai
-      modules.omp
-      modules.podman
       <modules/ai/ollama-cuda>
     ];
-    nixos = {
-      config,
-      pkgs,
-      ...
-    }: {
+    nixos =
+      { config, pkgs, ... }:
+      {
         users.users.doloro = {
           shell = pkgs.fish;
           hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path;
-        extraGroups = ["libvirtd"];
         };
-      virtualisation.libvirtd.enable = true;
-      programs.virt-manager.enable = true;
       };
-    homeManager = {
-      home,
-      pkgs,
-      ...
-    }: {
+    homeManager =
+      { home, pkgs, ... }:
+      {
         wayland.windowManager.hyprland.settings = {
           monitor = [
             "HDMI-A-1, 1920x1080@60, 0x0, 1"
-          "DP-2, 1920x1080@120, 1920x0, 1"
+            "DP-3, 1920x1080@144, 1920x0, 1"
           ];
           exec-once = [
             "hyprctl dispatch workspace 2" # shit solution to get quickshell on the right monitor
@@ -80,22 +70,9 @@
           obsidian
           # pear-desktop
           prismlauncher
-        # deadlock-mod-manager
-        inputs.nik-pkgs.packages.x86_64-linux.grimorie
+          deadlock-mod-manager
           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,16 +6,15 @@
   __findFile,
   lib,
   ...
-}: {
+}:
+{
   den.aspects.desktop = {
     includes = [
       modules.nix
     ];
-    nixos = {
-      pkgs,
-      config,
-      ...
-    }: {
+    nixos =
+      { pkgs, config, ... }:
+      {
         boot.loader.grub.enable = true;
         boot.loader.grub.device = "nodev";
         boot.loader.grub.devices = [
@@ -46,7 +45,7 @@
           enable = true;
         };
 
-      services.xserver.videoDrivers = ["nvidia"];
+        services.xserver.videoDrivers = [ "nvidia" ];
 
         fileSystems."/mnt/2tb" = {
           device = "/dev/disk/by-uuid/0f49aec7-4af2-4f4f-b475-3f4fad2b59c2";
@@ -63,6 +62,7 @@
         services.gnome.gnome-keyring.enable = true;
 
         hardware.nvidia = {
+
           # Modesetting is required.
           modesetting.enable = true;
 
@@ -70,7 +70,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 = false;
+          powerManagement.enable = true;
 
           # Fine-grained power management. Turns off GPU when not in use.
           # Experimental and only works on modern Nvidia GPUs (Turing or newer).
@@ -83,7 +83,7 @@
           # supported GPUs is at:
           # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
           # Only available from driver 515.43.04+
-        open = false;
+          open = true;
 
           # Enable the Nvidia settings menu,
           # accessible via `nvidia-settings`.
@@ -92,9 +92,7 @@
           # Optionally, you may need to select the appropriate driver version for your specific GPU.
           package = config.boot.kernelPackages.nvidiaPackages.stable;
         };
-      boot.binfmt.emulatedSystems = [
-        "aarch64-linux"
-      ];
+
       };
   };
 }

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

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

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

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

config/hosts/aspects/doloro-shared.nix

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

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

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

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

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

config/hosts/aspects/servers/rpi5.nix

@@ -3,14 +3,14 @@
   __findFile,
   modules,
   ...
-}: {
+}:
+{
   den.aspects.rpi5 = {
     includes = [
       <modules/raspberry-pi/5>
       # <modules/services/traefik>
       <modules/services/caddy>
       <modules/services/home-assistant>
-      <modules/services/docker-registry>
       <modules/services/ddns>
     ];
     nixos = {
@@ -23,7 +23,7 @@
           443
           8080
         ];
-        allowedUDPPortRanges = [];
+        allowedUDPPortRanges = [ ];
       };
 
       virtualisation.docker.enable = true;
@@ -31,10 +31,6 @@
 
       services.openssh.enable = true;
       nixpkgs.hostPlatform = "aarch64-linux";
-
-      nix.gc = {
-        automatic = true;
-      };
     };
   };
 }

config/hosts/computers.nix

@@ -3,7 +3,8 @@
   __findFile,
   lib,
   ...
-}: {
+}:
+{
   # Homes
   den.homes.x86_64-linux.doloro-desktop = {
     aspect = "doloro-desktop";
@@ -13,9 +14,6 @@
   den.homes.aarch64-linux.doloro-laptop = {
     userName = "doloro";
   };
-  den.homes.aarch64-linux.doloro-wsl = {
-    userName = "doloro";
-  };
   # Machines
   den.hosts.x86_64-linux.desktop = {
     users.doloro = {
@@ -30,18 +28,13 @@
       home-manager.enable = true;
     };
   };
-  den.hosts.aarch64-linux.wsl = {
-    users.doloro = {
-      aspect = "doloro-wsl";
-      home-manager.enable = true;
-    };
-  };
 
-  den.schema.user.classes = lib.mkDefault ["homeManager"];
+  den.schema.user.classes = lib.mkDefault [ "homeManager" ];
 
   # Fixes 'The option `flake.homeConfigurations' is defined multiple times while it's expected to be unique.'
   flake.options.homeConfigurations = lib.mkOption {
     type = lib.types.attrs;
     description = "Home Manager configurations for users.";
   };
+
 }

config/modules/ai/ai.nix

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

config/modules/ai/omp.nix

@@ -1,14 +0,0 @@
-{
-  modules,
-  den,
-  inputs,
-  ...
-}: {
-  flake-file.inputs = {
-    omp-nix.url = "git+https://git.molez.org/mandlm/omp-nix?ref=main";
-  };
-  modules.omp = {
-    homeManager = {
-    };
-  };
-}

config/modules/dunst.nix

@@ -1,4 +1,5 @@
-{modules, ...}: {
+{ modules, ... }:
+{
   modules.dunst = {
     homeManager = {
       services.dunst = {

config/modules/fish.nix

@@ -1,12 +1,5 @@
+{ modules, ... }:
 {
-  modules,
-  inputs,
-  ...
-}:
-{
-  flake-file.inputs = {
-    direnv-instant.url = "github:Mic92/direnv-instant";
-  };
   modules.fish = {
     nixos = {
       programs.fish.enable = true;
@@ -14,13 +7,8 @@
     homeManager =
       { pkgs, ... }:
       {
-        imports = [ inputs.direnv-instant.homeModules.direnv-instant ];
-        programs.direnv-instant.enable = true;
         home.shell.enableFishIntegration = true;
-        home.packages = [
-          pkgs.nix-output-monitor
-          # pkgs.devenv
-        ];
+        home.packages = [ pkgs.nix-output-monitor ];
         programs = {
           fish = {
             enable = true;
@@ -30,24 +18,9 @@
               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
-            '';
-            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
             '';
+            # 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";
@@ -69,7 +42,7 @@
           };
           direnv = {
             enable = true;
-            enableFishIntegration = false;
+            nix-direnv.enable = true;
           };
         };
       };

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.libxcb ];
+            extraLibraries = pkgs: [ pkgs.xorg.libxcb ];
             extraPkgs =
               pkgs: with pkgs; [
                 attr
-                libxcursor
-                libxi
-                libxinerama
-                libxscrnsaver
+                xorg.libXcursor
+                xorg.libXi
+                xorg.libXinerama
+                xorg.libXScrnSaver
                 libpng
                 libpulseaudio
                 libvorbis

config/modules/hyprland/doloro-settings.nix

@@ -1,15 +1,14 @@
-{modules, ...}: {
+{ modules, ... }:
+{
   modules.hyprland = {
     provides = {
       doloro-settings = {
         includes = [
           modules.dunst
         ];
-        homeManager = {
-          pkgs,
-          home,
-          ...
-        }: {
+        homeManager =
+          { pkgs, home, ... }:
+          {
             home.packages = [
               pkgs.hyprcursor
               pkgs.wlogout
@@ -63,7 +62,7 @@
                 };
               };
               cursor = {
-              no_hardware_cursors = false;
+                no_hardware_cursors = true;
               };
               animations = {
                 enabled = true;
@@ -96,7 +95,7 @@
                 ];
               };
               dwindle = {
-              # pseudotile = true;
+                pseudotile = true;
                 preserve_split = true;
               };
               # master = {
@@ -106,11 +105,10 @@
                 force_default_wallpaper = -1;
                 disable_hyprland_logo = false;
                 enable_anr_dialog = false;
-              # vfr = true;
+                vfr = true;
               };
               "$mainMod" = "SUPER";
-            bind =
-              [
+              bind = [
                 (
                   let
                     config = pkgs.writeTextFile {
@@ -131,14 +129,15 @@
                     script = pkgs.writeShellScript "mreow" ''
                       	exec $(tofi-drun -c ${config})
                           	'';
-                  in "$mainMod, R, exec, ${script}"
+                  in
+                  "$mainMod, R, exec, ${script}"
                 )
                 "$mainMod, C, killactive"
                 "$mainMod, M, exec, uwsm stop"
                 "$mainMod, Q, exec, kitty"
                 "$mainMod, V, togglefloating,"
-                # "$mainMod, P, pseudo, # dwindle"
-                # "$mainMod, J, togglesplit, # dwindle"
+                "$mainMod, P, pseudo, # dwindle"
+                "$mainMod, J, togglesplit, # dwindle"
                 "$mainMod, left, movefocus, l"
                 "$mainMod, right, movefocus, r"
                 "$mainMod, up, movefocus, u"
@@ -163,14 +162,15 @@
               ]
               ++ (builtins.concatLists (
                 builtins.genList (
-                  i: let
+                  i:
+                  let
                     ws = i + 1;
-                  in [
+                  in
+                  [
                     "$mainMod, ${toString ws}, workspace, ${toString ws}"
                     "$mainMod SHIFT, ${toString ws}, movetoworkspace, ${toString ws}"
                   ]
-                )
-                9
+                ) 9
               ));
               bindm = [
                 "$mainMod, mouse:272, movewindow"
@@ -180,7 +180,6 @@
                 "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,13 +3,16 @@
   inputs,
   lib,
   ...
-}: {
+}:
+{
   flake-file.inputs = {
     hyprland.url = "github:hyprwm/Hyprland";
   };
   modules.hyprland = {
-    nixos = {pkgs, ...}: {
-      imports = [inputs.hyprland.nixosModules.default];
+    nixos =
+      { pkgs, ... }:
+      {
+        imports = [ inputs.hyprland.nixosModules.default ];
         environment.systemPackages = with pkgs; [
           wayfreeze
           grim
@@ -43,15 +46,15 @@
           # package32 = pkgs-unstable.pkgsi686Linux.mesa;
         };
       };
-    homeManager = {pkgs, ...}: {
+    homeManager =
+      { pkgs, ... }:
+      {
         gtk = {
           enable = true;
         };
-      # backupFileExtension = "backupHM";
         wayland.windowManager.hyprland = {
           enable = true;
-        systemd.variables = ["--all"];
-        configType = "hyprlang";
+          systemd.variables = [ "--all" ];
         };
       };
   };

config/modules/kitty.nix

@@ -1,8 +1,5 @@
+{ den, modules, ... }:
 {
-  den,
-  modules,
-  ...
-}: {
   modules.kitty = {
     homeManager = {
       programs.kitty = {
@@ -15,7 +12,6 @@
           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
-            libxcomposite
-            libxtst
-            libxrandr
-            libxext
-            libx11
-            libxfixes
+            xorg.libXcomposite
+            xorg.libXtst
+            xorg.libXrandr
+            xorg.libXext
+            xorg.libX11
+            xorg.libXfixes
             libGL
             libva
             pipewire
-            libxcb
-            libxdamage
-            libxshmfence
-            libxxf86vm
+            xorg.libxcb
+            xorg.libXdamage
+            xorg.libxshmfence
+            xorg.libXxf86vm
             libelf
 
             # Required
@@ -56,13 +56,13 @@
             # glibc_multi.bin # Seems to cause issue in ARM
 
             # # Without these it silently fails
-            libxinerama
-            libxcursor
-            libxrender
-            libxscrnsaver
-            libxi
-            libsm
-            libice
+            xorg.libXinerama
+            xorg.libXcursor
+            xorg.libXrender
+            xorg.libXScrnSaver
+            xorg.libXi
+            xorg.libSM
+            xorg.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
-            libxt
-            libxmu
+            xorg.libXt
+            xorg.libXmu
             libogg
             libvorbis
             SDL
             SDL2_image
-            glew_1_10
+            glew110
             libidn
             tbb
 
@@ -123,7 +123,7 @@
             libgcrypt
             libvpx
             librsvg
-            libxft
+            xorg.libXft
             libvdpau
             # ...
             # Some more libraries that I needed to run programs

config/modules/nix.nix

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

config/modules/nixvim/default.nix

@@ -4,7 +4,8 @@
   lib,
   inputs,
   ...
-}: {
+}:
+{
   # Its in its own folder for future modulizaion efforts
   flake-file.inputs = {
     nixvim = {
@@ -14,20 +15,13 @@
   };
   modules = {
     nixvim = {
-      nixos = {home-manager, ...}: {
+      nixos =
+        { home-manager, ... }:
+        {
         };
-      homeManager = {pkgs, ...}: let
-        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 =
+        { pkgs, ... }:
+        {
           imports = [
             inputs.nixvim.homeModules.nixvim
           ];
@@ -42,13 +36,13 @@
             colorschemes.gruvbox-material.enable = true;
             extraPackages = with pkgs; [
               # formatters
-            nixfmt-rs
+              nixfmt
               rustfmt
               # misc
               ripgrep
+              # misc
               nixd
               tree-sitter
-            rust-analyzer
             ];
             performance.byteCompileLua = {
               enable = true;
@@ -62,13 +56,12 @@
               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"];
+                    nix = [ "nixfmt" ];
+                    rust = [ "rustfmt" ];
                     "_" = [
                       "squeeze_blanks"
                       "trim_whitespace"
@@ -106,15 +99,6 @@
                   };
                   nixd = {
                     enable = true;
-                  settings = {
-                    nixd = {
-                      nixpkgs.expr = "import (builtins.getFlake \"${toString /home/doloro/dotfiles}\").inputs.nixpkgs { }";
-                      options = {
-                        nixos.expr = "(builtins.getFlake \"${toString /home/doloro/dotfiles}\").nixosConfigurations.desktop.options";
-                        home_manager.expr = "(builtins.getFlake \"${toString /home/doloro/dotfiles}\").homeConfigurations.doloro-desktop.options";
-                      };
-                    };
-                  };
                   };
                   astro = {
                     enable = true;
@@ -142,28 +126,28 @@
                 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_z = ["location"];
+                    lualine_y = [ "lsp_status" ];
+                    lualine_z = [ "location" ];
                   };
                   inactive_sections = {
-                  lualine_a = [];
-                  lualine_b = [];
-                  lualine_c = ["filename"];
-                  lualine_x = ["location"];
-                  lualine_y = [];
-                  lualine_z = [];
+                    lualine_a = [ ];
+                    lualine_b = [ ];
+                    lualine_c = [ "filename" ];
+                    lualine_x = [ "location" ];
+                    lualine_y = [ ];
+                    lualine_z = [ ];
                   };
                 };
               };
@@ -187,30 +171,15 @@
                   };
                 };
               };
-            lsp-lines.enable = true;
-            diaglist = {
-              enable = true;
-              settings = {
-                debug = false;
-              };
-            };
+              trouble.enable = true;
               cmp = {
                 enable = true;
                 autoEnableSources = true;
                 settings = {
                   sources = [
-                  {
-                    name = "nvim_lsp";
-                    priority = 100;
-                  }
-                  {
-                    name = "buffer";
-                    priority = 50;
-                  }
-                  {
-                    name = "path";
-                    priority = 40;
-                  }
+                    { name = "nvim_lsp"; }
+                    { name = "path"; }
+                    { name = "buffer"; }
                   ];
                   mapping = {
                     "<C-Space>" = "cmp.mapping.complete()";
@@ -218,24 +187,13 @@
                     "<C-e>" = "cmp.mapping.close()";
                     "<C-f>" = "cmp.mapping.scroll_docs(4)";
                     "<CR>" = "cmp.mapping.confirm({ select = true })";
-                  "<S-Tab>" = "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() else fallback() end end, {'i', 's'})";
-                  "<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 = {
-                    border = "rounded";
-                    winhighlight = "Normal:Pmenu,FloatBorder:Pmenu";
-                  };
+                    "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
+                    "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
                   };
                 };
               };
               lspkind.enable = true;
               tiny-inline-diagnostic.enable = true;
-            # tiny-code-action.enable = true;
               # persisted.enable = true;
               auto-session = {
                 enable = false;
@@ -250,9 +208,6 @@
                 enable = true;
                 grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
                   bash
-                css
-                html
-                javascript
                   json
                   lua
                   make
@@ -261,8 +216,6 @@
                   nix
                   regex
                   toml
-                tsx
-                typescript
                   vim
                   vimdoc
                   xml
@@ -271,7 +224,6 @@
                 ];
                 settings = {
                   highlight.enable = true;
-                indent.enable = false;
                 };
               };
             };
@@ -281,10 +233,6 @@
               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;
@@ -296,45 +244,6 @@
             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,
-                on_empty = true,
-              },
-            })
-          '';
             keymaps = [
               {
                 action = "<cmd>Telescope persisted<cr>";
@@ -379,20 +288,12 @@
                 };
               }
               {
-              action = "<cmd>DiaglistToggle<cr>";
+                action = "<cmd>Trouble diagnostics toggle<cr>";
                 key = "<leader>fd";
                 options = {
                   silent = true;
                 };
               }
-            {
-              action = "<cmd>lua require('tiny-code-action').code_action()<cr>";
-              key = "<leader>ca";
-              mode = ["n" "x"];
-              options = {
-                silent = true;
-              };
-            }
             ];
           };
         };

config/modules/obs.nix

@@ -1,15 +1,14 @@
+{ den, modules, ... }:
 {
-  den,
-  modules,
-  ...
-}: {
   modules.obs = settings: {
-    homeManager = {
+    homeManager =
+      {
         pkgs,
         lib,
         config,
         ...
-    }: {
+      }:
+      {
         programs = {
           obs-studio = {
             enable = true;
@@ -21,20 +20,19 @@
             plugins = with pkgs.obs-studio-plugins; [
               obs-pipewire-audio-capture
               obs-vkcapture
-            obs-vaapi #optional AMD hardware acceleration
-            obs-gstreamer
             ];
           };
         };
-      systemd.user.services = let
+        systemd.user.services =
+          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" ''
@@ -47,10 +45,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" ''
@@ -62,10 +60,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/.qmlls.ini

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

config/modules/quickshell/quickshell/Audio.qml

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

config/modules/raspberry-pi.nix

@@ -4,61 +4,36 @@
   modules,
   inputs,
   ...
-}: {
+}:
+{
   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";
+    raspberry-pi-nix.url = "github:nix-community/raspberry-pi-nix";
   };
   modules.raspberry-pi = {
     provides = {
       "5" = {
-        nixos = {pkgs, ...}: {
+        nixos =
+          { pkgs, ... }:
+          let
+            rpi-pi = inputs.raspberry-pi-nix;
+          in
+          {
             imports = [
-            # inputs.nixos-hardware.nixosModules.raspberry-pi-5
-            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
+              rpi-pi.nixosModules.raspberry-pi
+              rpi-pi.nixosModules.sd-image
             ];
 
             environment.systemPackages = with pkgs; [
               libraspberrypi
             ];
 
-          _module.args = {inherit (inputs) nixos-raspberrypi;};
-
             sdImage.compressImage = false;
+            raspberry-pi-nix.board = "bcm2712"; # Rpi 5 - 64bit
+            # We need to rebuild kernel for 6.12
+            # raspberry-pi-nix.kernel-version = "v6_12_17";
+            raspberry-pi-nix.uboot.enable = false;
 
-          boot.loader.raspberry-pi.bootloader = "kernel";
-          # boot.initrd.systemd.tpm2.enable = 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"];
-          #   };
-          # };
+            hardware.enableRedistributableFirmware = true;
           };
       };
     };

config/modules/services/caddy.nix

@@ -3,17 +3,17 @@
   __findFile,
   modules,
   ...
-}: {
+}:
+{
   # Basic caddy
   modules.services.provides.caddy = {
-    nixos = {config, ...}: {
+    nixos =
+      { 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,14 +3,13 @@
   __findFile,
   modules,
   ...
-}: {
+}:
+{
   # Basic traefik
   modules.services.provides.ddns = {
-    nixos = {
-      config,
-      pkgs,
-      ...
-    }: let
+    nixos =
+      { config, pkgs, ... }:
+      let
         ddnsImg = pkgs.dockerTools.pullImage {
           imageName = "qmcgaw/ddns-updater";
           imageDigest = "sha256:ee16ab4f6203bf9e5b0925d38a0b4ebf2d9f23771f933cfb2f5a2dbd5f9a2f88";
@@ -19,7 +18,8 @@
           sha256 = "sha256-dMCHkvoFaORmGwbIM9io4Vc9fq+wBks25k2dmnW7naI=";
           arch = "arm64";
         };
-    in {
+      in
+      {
         virtualisation.oci-containers.containers = {
           ddns = {
             image = "qmcgaw/ddns-updater";
@@ -28,18 +28,10 @@
               "/data/ddns:/updater/data"
               "/etc/localtime:/etc/localtime:ro"
             ];
-          ports = ["0.0.0.0:8125:8000"];
+            # ports = [ "0.0.0.0:8123:8123" ];
             # 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

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

config/modules/ssh.nix

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

config/modules/stylix.nix

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

config/modules/surface_patches.nix

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

config/modules/tmux.nix

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

config/modules/tuigreetd.nix

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

config/modules/unity.nix

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

config/modules/user/doloro.nix

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

config/modules/wsl.nix

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

flake.nix

@@ -4,7 +4,6 @@
 
   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 = {
@@ -22,19 +21,18 @@
     };
     hyprland.url = "github:hyprwm/Hyprland";
     import-tree.url = "github:vic/import-tree";
-    nik-pkgs.url = "git+https://git.scug.io/nikkuss/pkgs.git";
+    nik-pkgs = {
+      url = "git+https://git.scug.io/nikkuss/pkgs.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     niri-flake = {
       url = "github:sodiboo/niri-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
-    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";
+    nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
     nixvim.url = "github:nix-community/nixvim";
-    omp-nix.url = "git+https://git.molez.org/mandlm/omp-nix?ref=main";
-    raspberry-pi-nix.url = "github:cmyk/raspberry-pi-nix";
+    raspberry-pi-nix.url = "github:nix-community/raspberry-pi-nix";
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -44,7 +42,7 @@
       url = "github:nix-community/stylix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    x1e-kernel.url = "git+https://git.scug.io/nikkuss/x1e-nixos.git";
+    x1e-kernel.url = "git+https://git.scug.io/doloro/x1e-nixos.git?ref=bump-7.1-rc1";
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";