meow

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

@@ -11,14 +11,11 @@
       <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;
@@ -34,42 +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, ... }:
-        config,
-        pkgs,
-        ...
-      }:
       {
         users.users.doloro = {
           shell = pkgs.fish;
           hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path;
-          extraGroups = [ "libvirtd" ];
         };
-        virtualisation.libvirtd.enable = true;
-        # virtualisation.waydroid.enable = true;
-        # # Newer kernel versions may need
-        # virtualisation.waydroid.package = pkgs.waydroid-nftables;
-        programs.virt-manager.enable = true;
       };
     homeManager =
-      {
+      { home, pkgs, ... }:
-        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
@@ -89,36 +70,9 @@
           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 = [
-          # 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

@@ -13,11 +13,7 @@
       modules.nix
     ];
     nixos =
-      {
+      { pkgs, config, ... }:
-        pkgs,
-        config,
-        ...
-      }:
       {
         boot.loader.grub.enable = true;
         boot.loader.grub.device = "nodev";
@@ -30,7 +26,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 = [
@@ -66,6 +62,7 @@
         services.gnome.gnome-keyring.enable = true;
 
         hardware.nvidia = {
+
           # Modesetting is required.
           modesetting.enable = true;
 
@@ -73,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).
@@ -86,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`.
@@ -95,9 +92,7 @@
           # Optionally, you may need to select the appropriate driver version for your specific GPU.
           package = config.boot.kernelPackages.nvidiaPackages.stable;
         };
-        boot.binfmt.emulatedSystems = [
+
-          "aarch64-linux"
-        ];
       };
   };
 }

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

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

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

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

config/hosts/aspects/doloro-shared.nix

@@ -3,7 +3,8 @@
   modules,
   __findFile,
   ...
-}: {
+}:
+{
   den.aspects.doloro-shared = {
     includes = [
       modules.nixvim
@@ -13,11 +14,9 @@
       modules.hyfetch
       modules.ssh
     ];
-    homeManager = {
+    homeManager =
-      pkgs,
+      { pkgs, lib, ... }:
-      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,26 +13,7 @@
     homeManager =
       { pkgs, ... }:
       {
-        home.packages = [
+        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

@@ -1,17 +0,0 @@
-{
-  modules,
-  den,
-  inputs,
-  ...
-}:
-{
-  flake-file.inputs = {
-    omp-nix.url = "git+https://git.molez.org/mandlm/omp-nix?ref=main";
-  };
-  modules.omp = {
-    homeManager = {
-      imports = [ inputs.omp-nix.homeManagerModules.omp ];
-      oh-my-pi.enable = true;
-    };
-  };
-}

config/modules/dunst.nix

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

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;
@@ -15,10 +8,7 @@
       { pkgs, ... }:
       {
         home.shell.enableFishIntegration = true;
-        home.packages = [
+        home.packages = [ pkgs.nix-output-monitor ];
-          pkgs.nix-output-monitor
-          # pkgs.devenv
-        ];
         programs = {
           fish = {
             enable = true;
@@ -28,11 +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
             '';
+            # 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";
@@ -54,7 +42,7 @@
           };
           direnv = {
             enable = true;
-            enableFishIntegration = true;
+            nix-direnv.enable = true;
           };
         };
       };

config/modules/flatpaks.nix

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

config/modules/hyprland/doloro-settings.nix

@@ -7,11 +7,7 @@
           modules.dunst
         ];
         homeManager =
-          {
+          { pkgs, home, ... }:
-            pkgs,
-            home,
-            ...
-          }:
           {
             home.packages = [
               pkgs.hyprcursor
@@ -28,22 +24,6 @@
               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"
@@ -82,7 +62,7 @@
                 };
               };
               cursor = {
-                no_hardware_cursors = false;
+                no_hardware_cursors = true;
               };
               animations = {
                 enabled = true;
@@ -115,7 +95,7 @@
                 ];
               };
               dwindle = {
-                # pseudotile = true;
+                pseudotile = true;
                 preserve_split = true;
               };
               # master = {
@@ -125,7 +105,7 @@
                 force_default_wallpaper = -1;
                 disable_hyprland_logo = false;
                 enable_anr_dialog = false;
-                # vfr = true;
+                vfr = true;
               };
               "$mainMod" = "SUPER";
               bind = [
@@ -156,8 +136,8 @@
                 "$mainMod, M, exec, uwsm stop"
                 "$mainMod, Q, exec, kitty"
                 "$mainMod, V, togglefloating,"
-                # "$mainMod, P, pseudo, # dwindle"
+                "$mainMod, P, pseudo, # dwindle"
-                # "$mainMod, J, togglesplit, # dwindle"
+                "$mainMod, J, togglesplit, # dwindle"
                 "$mainMod, left, movefocus, l"
                 "$mainMod, right, movefocus, r"
                 "$mainMod, up, movefocus, u"
@@ -200,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, ...}: {
+    nixos =
-      imports = [inputs.hyprland.nixosModules.default];
+      { 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"];
+          systemd.variables = [ "--all" ];
-        configType = "hyprlang";
         };
       };
   };

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
+            xorg.libXcomposite
-            libxtst
+            xorg.libXtst
-            libxrandr
+            xorg.libXrandr
-            libxext
+            xorg.libXext
-            libx11
+            xorg.libX11
-            libxfixes
+            xorg.libXfixes
             libGL
             libva
             pipewire
-            libxcb
+            xorg.libxcb
-            libxdamage
+            xorg.libXdamage
-            libxshmfence
+            xorg.libxshmfence
-            libxxf86vm
+            xorg.libXxf86vm
             libelf
 
             # Required
@@ -56,13 +56,13 @@
             # glibc_multi.bin # Seems to cause issue in ARM
 
             # # Without these it silently fails
-            libxinerama
+            xorg.libXinerama
-            libxcursor
+            xorg.libXcursor
-            libxrender
+            xorg.libXrender
-            libxscrnsaver
+            xorg.libXScrnSaver
-            libxi
+            xorg.libXi
-            libsm
+            xorg.libSM
-            libice
+            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
+            xorg.libXt
-            libxmu
+            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

@@ -10,7 +10,7 @@
   flake-file.inputs = {
     nixvim = {
       url = "github:nix-community/nixvim";
-      inputs.nixpkgs.follows = "nixpkgs";
+      # inputs.nixpkgs.follows = "nixpkgs";
     };
   };
   modules = {
@@ -21,18 +21,6 @@
         };
       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
         {
           imports = [
             inputs.nixvim.homeModules.nixvim
@@ -46,21 +34,15 @@
               };
             };
             colorschemes.gruvbox-material.enable = true;
-            # colorschemes.melange = {
-            #   enable = true;
-            #   autoLoad = false;
-            # };
             extraPackages = with pkgs; [
               # formatters
-              nixfmt-rs
+              nixfmt
               rustfmt
               # misc
               ripgrep
+              # misc
               nixd
               tree-sitter
-              rust-analyzer
-              rustc
-              cargo
             ];
             performance.byteCompileLua = {
               enable = true;
@@ -70,15 +52,10 @@
               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;
               conform-nvim = {
                 enable = true;
                 settings = {
@@ -109,12 +86,12 @@
               lsp = {
                 enable = true;
                 servers = {
-                  # qmlls = {
+                  qmlls = {
-                  #   enable = true;
+                    enable = true;
-                  #   config = {
+                    config = {
-                  #     cmd = "-E";
+                      cmd = "-E";
-                  #   };
+                    };
-                  # };
+                  };
                   rust_analyzer = {
                     enable = true;
                     installCargo = false;
@@ -122,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;
@@ -170,7 +138,7 @@
                       "fileformat"
                       "filetype"
                     ];
-                    lualine_y = [ "progress" ];
+                    lualine_y = [ "lsp_status" ];
                     lualine_z = [ "location" ];
                   };
                   inactive_sections = {
@@ -185,10 +153,7 @@
               };
               web-devicons.enable = true;
               vim-dadbod-completion.enable = true;
-              telescope = {
+              telescope.enable = true;
-                enable = true;
-                extensions.file-browser.enable = true;
-              };
               lazygit.enable = true;
               mini-indentscope = {
                 enable = true;
@@ -206,55 +171,15 @@
                   };
                 };
               };
-              lsp-lines.enable = true;
+              trouble.enable = true;
-              trouble = {
-                enable = true;
-                settings = {
-                  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"; }
-                      name = "nvim_lsp";
+                    { name = "path"; }
-                      priority = 100;
+                    { name = "buffer"; }
-                    }
-                    {
-                      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()";
@@ -262,26 +187,13 @@
                     "<C-e>" = "cmp.mapping.close()";
                     "<C-f>" = "cmp.mapping.scroll_docs(4)";
                     "<CR>" = "cmp.mapping.confirm({ select = true })";
-                    "<S-Tab>" =
+                    "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'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(cmp.mapping.select_next_item(), {'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;
-              # tiny-code-action.enable = true;
               # persisted.enable = true;
               auto-session = {
                 enable = false;
@@ -296,9 +208,6 @@
                 enable = true;
                 grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
                   bash
-                  css
-                  html
-                  javascript
                   json
                   lua
                   make
@@ -307,8 +216,6 @@
                   nix
                   regex
                   toml
-                  tsx
-                  typescript
                   vim
                   vimdoc
                   xml
@@ -317,13 +224,15 @@
                 ];
                 settings = {
                   highlight.enable = true;
-                  indent.enable = false;
                 };
               };
             };
             extraPlugins = with pkgs; [
-              vimPlugins.cmp-nvim-lsp-signature-help
+              # vimPlugins.mini-completion
-              tiny-code-action
+              vimPlugins.mini-comment
+              vimPlugins.melange-nvim
+              vimPlugins.telescope-file-browser-nvim
+              vimPlugins.lsp-progress-nvim
             ];
             opts = {
               number = true;
@@ -331,25 +240,10 @@
               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>";
@@ -398,111 +292,6 @@
                 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/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
+            id: speaker
-                text: root.defaultSpeaker.audio.muted ? "󰖁" : "󰕾"
+            text: root.defaultSpeaker.audio.muted ? "muted" : "unmuted"
-                font.family: "CaskaydiaCove NF"
-                font.pixelSize: 20
             color: Colors.textPrimary
         }
-        }
-        Rectangle {
-            implicitWidth: 24
-            implicitHeight: 20
-            color: "transparent"
-            radius: 3
         Text {
-                anchors.centerIn: parent
+            id: mic
-                text: root.defaultMic.audio.muted ? "" : ""
+            text: root.defaultMic.audio.muted ? "muted" : "unmuted"
-                font.family: "CaskaydiaCove NFM"
-                font.pixelSize: 30
             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";
+    raspberry-pi-nix.url = "github:nix-community/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 = {pkgs, ...}: {
+        nixos =
+          { pkgs, ... }:
+          let
+            rpi-pi = inputs.raspberry-pi-nix;
+          in
+          {
             imports = [
-            # inputs.nixos-hardware.nixosModules.raspberry-pi-5
+              rpi-pi.nixosModules.raspberry-pi
-            inputs.nixos-raspberrypi.lib.inject-overlays-global
+              rpi-pi.nixosModules.sd-image
-            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;
+            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";
+            hardware.enableRedistributableFirmware = true;
-          # 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"];
-          #   };
-          # };
           };
       };
     };

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 = {
+    nixos =
-      config,
+      { config, pkgs, ... }:
-      pkgs,
+      let
-      ...
-    }: 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";
+                addKeysToAgent = "yes";
-                IdentityFile = [
+                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, ...}: {
+    homeManager =
-      imports = [inputs.stylix.homeModules.stylix];
+      { pkgs, ... }:
-      # gtk.gtk4.theme = null;
+      {
+        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, ...}: {
+    nixos =
-      imports = [inputs.stylix.nixosModules.stylix];
+      { 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

@@ -2,11 +2,7 @@
 {
   modules.tmux = {
     homeManager =
-      {
+      { home, pkgs, ... }:
-        home,
-        pkgs,
-        ...
-      }:
       {
         programs.tmux = {
           enable = true;
@@ -15,12 +11,10 @@
             minimal-tmux-status
           ];
           extraConfig = ''
-                      set-option -g default-terminal "tmux-256color"
+                  set-option -g default-terminal "xterm-256color"
-                      set -as terminal-features ",xterm-256color:RGB"
+            			set -a terminal-features "xterm-256color:RGB"
                   set -g status-bg black
                   set -g status-fg white
-                      set -g mouse on
-            					set -g extended-keys 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,23 +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";
-    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
+    nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    nixvim.url = "github:nix-community/nixvim";
-    nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main";
+    raspberry-pi-nix.url = "github:nix-community/raspberry-pi-nix";
-    nixos-wsl.url = "github:nix-community/NixOS-WSL";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    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 = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -48,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";