meow

swapped out flake
2026-04-30 11:43:18 +01:00 · 2026-04-30 11:35:18 +01:00
38 changed files with 1123 additions and 1765 deletions
@@ -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,73 +31,51 @@
      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,
-      ...
-    }: {
-      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,
-      ...
-    }: {
-      wayland.windowManager.hyprland.settings = {
-        monitor = [
-          "HDMI-A-1, 1920x1080@60, 0x0, 1"
-          "DP-2, 1920x1080@120, 1920x0, 1"
-        ];
-        exec-once = [
-          "hyprctl dispatch workspace 2" # shit solution to get quickshell on the right monitor
-        ];
-        workspace = [
-          "name:2, monitor:DP-3"
-        ];
-        input = {
-          kb_layout = "gb";
-          follow_mouse = 2;
-          sensitivity = -0.5;
+    nixos =
+      { config, pkgs, ... }:
+      {
+        users.users.doloro = {
+          shell = pkgs.fish;
+          hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path;
        };
      };
-      home.packages = with pkgs; [
-        equibop
-        telegram-desktop
-        obsidian
-        # pear-desktop
-        prismlauncher
-        # deadlock-mod-manager
-        inputs.nik-pkgs.packages.x86_64-linux.grimorie
-        gamescope
-        android-studio
-        blender
-        bottles
-      ];
-      programs.lutris.enable = true;
-      nixpkgs.overlays = [
-        # Skipping tests while upstream sorts it out, revert once
-        # Hydra consistently builds openldap green.
-        (final: prev: {
-          openldap = prev.openldap.overrideAttrs (_: {
-            doCheck = false;
-          });
-        })
-      ];
-      nixpkgs.config.allowUnfree = true;
-      programs.home-manager.enable = true;
-    };
+    homeManager =
+      { home, pkgs, ... }:
+      {
+        wayland.windowManager.hyprland.settings = {
+          monitor = [
+            "HDMI-A-1, 1920x1080@60, 0x0, 1"
+            "DP-3, 1920x1080@144, 1920x0, 1"
+          ];
+          exec-once = [
+            "hyprctl dispatch workspace 2" # shit solution to get quickshell on the right monitor
+          ];
+          workspace = [
+            "name:2, monitor:DP-3"
+          ];
+          input = {
+            kb_layout = "gb";
+            follow_mouse = 2;
+            sensitivity = -0.5;
+          };
+        };
+        home.packages = with pkgs; [
+          equibop
+          telegram-desktop
+          obsidian
+          # pear-desktop
+          prismlauncher
+          deadlock-mod-manager
+          gamescope
+          android-studio
+        ];
+        nixpkgs.config.allowUnfree = true;
+        programs.home-manager.enable = true;
+      };
  };
 }
@@ -6,95 +6,93 @@
  __findFile,
  lib,
  ...
-}: {
+}:
+{
  den.aspects.desktop = {
    includes = [
      modules.nix
    ];
-    nixos = {
-      pkgs,
-      config,
-      ...
-    }: {
-      boot.loader.grub.enable = true;
-      boot.loader.grub.device = "nodev";
-      boot.loader.grub.devices = [
-        "/dev/disk/by-id/nvme-CT1000P2SSD8_2221E632CD1F"
-        "nodev"
-      ];
-      #boot.loader.efi.canTouchEfiVariables = true;
-      boot.loader.grub.efiSupport = true;
-      boot.loader.grub.efiInstallAsRemovable = true;
-      networking.hostName = "doloroo-main"; # Define your hostname.
-
-      boot.kernelPackages = pkgs.linuxPackages_latest;
-
-      boot.initrd.verbose = false;
-      boot.kernelParams = [
-        "boot.shell_on_fail"
-        "rd.systemd.show_status=auto"
-      ];
-
-      services.openssh.enable = true;
-
-      networking.networkmanager.enable = true;
-      networking.firewall.enable = false;
-
-      security.rtkit.enable = true;
-
-      hardware.graphics = {
-        enable = true;
-      };
-
-      services.xserver.videoDrivers = ["nvidia"];
-
-      fileSystems."/mnt/2tb" = {
-        device = "/dev/disk/by-uuid/0f49aec7-4af2-4f4f-b475-3f4fad2b59c2";
-        fsType = "ext4";
-        options = [
-          # If you don't have this options attribute, it'll default to "defaults"
-          # boot options for fstab. Search up fstab mount options you can use
-          "defaults"
-          "users" # Allows any user to mount and unmount
-          "nofail" # Prevent system from failing if this drive doesn't mount
-          "exec"
+    nixos =
+      { pkgs, config, ... }:
+      {
+        boot.loader.grub.enable = true;
+        boot.loader.grub.device = "nodev";
+        boot.loader.grub.devices = [
+          "/dev/disk/by-id/nvme-CT1000P2SSD8_2221E632CD1F"
+          "nodev"
        ];
+        #boot.loader.efi.canTouchEfiVariables = true;
+        boot.loader.grub.efiSupport = true;
+        boot.loader.grub.efiInstallAsRemovable = true;
+        networking.hostName = "doloroo-main"; # Define your hostname.
+
+        boot.kernelPackages = pkgs.linuxPackages_latest;
+
+        boot.initrd.verbose = false;
+        boot.kernelParams = [
+          "boot.shell_on_fail"
+          "rd.systemd.show_status=auto"
+        ];
+
+        services.openssh.enable = true;
+
+        networking.networkmanager.enable = true;
+        networking.firewall.enable = false;
+
+        security.rtkit.enable = true;
+
+        hardware.graphics = {
+          enable = true;
+        };
+
+        services.xserver.videoDrivers = [ "nvidia" ];
+
+        fileSystems."/mnt/2tb" = {
+          device = "/dev/disk/by-uuid/0f49aec7-4af2-4f4f-b475-3f4fad2b59c2";
+          fsType = "ext4";
+          options = [
+            # If you don't have this options attribute, it'll default to "defaults"
+            # boot options for fstab. Search up fstab mount options you can use
+            "defaults"
+            "users" # Allows any user to mount and unmount
+            "nofail" # Prevent system from failing if this drive doesn't mount
+            "exec"
+          ];
+        };
+        services.gnome.gnome-keyring.enable = true;
+
+        hardware.nvidia = {
+
+          # Modesetting is required.
+          modesetting.enable = true;
+
+          # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
+          # Enable this if you have graphical corruption issues or application crashes after waking
+          # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
+          # of just the bare essentials.
+          powerManagement.enable = true;
+
+          # Fine-grained power management. Turns off GPU when not in use.
+          # Experimental and only works on modern Nvidia GPUs (Turing or newer).
+          powerManagement.finegrained = false;
+          # prime.offload.enable = true;
+
+          # Use the NVidia open source kernel module (not to be confused with the
+          # independent third-party "nouveau" open source driver).
+          # Support is limited to the Turing and later architectures. Full list of
+          # supported GPUs is at:
+          # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
+          # Only available from driver 515.43.04+
+          open = true;
+
+          # Enable the Nvidia settings menu,
+          # accessible via `nvidia-settings`.
+          nvidiaSettings = true;
+
+          # Optionally, you may need to select the appropriate driver version for your specific GPU.
+          package = config.boot.kernelPackages.nvidiaPackages.stable;
+        };
+
      };
-      services.gnome.gnome-keyring.enable = true;
-
-      hardware.nvidia = {
-        # Modesetting is required.
-        modesetting.enable = true;
-
-        # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
-        # Enable this if you have graphical corruption issues or application crashes after waking
-        # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
-        # of just the bare essentials.
-        powerManagement.enable = false;
-
-        # Fine-grained power management. Turns off GPU when not in use.
-        # Experimental and only works on modern Nvidia GPUs (Turing or newer).
-        powerManagement.finegrained = false;
-        # prime.offload.enable = true;
-
-        # Use the NVidia open source kernel module (not to be confused with the
-        # independent third-party "nouveau" open source driver).
-        # Support is limited to the Turing and later architectures. Full list of
-        # supported GPUs is at:
-        # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
-        # Only available from driver 515.43.04+
-        open = false;
-
-        # Enable the Nvidia settings menu,
-        # accessible via `nvidia-settings`.
-        nvidiaSettings = true;
-
-        # Optionally, you may need to select the appropriate driver version for your specific GPU.
-        package = config.boot.kernelPackages.nvidiaPackages.stable;
-      };
-      boot.binfmt.emulatedSystems = [
-        "aarch64-linux"
-      ];
-    };
  };
 }
@@ -21,7 +21,6 @@
      modules.stylix
      modules.quickshell
      modules.lavd
-      modules.omp
      # modules.podman
      # modules.openvivo
    ];
@@ -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 = [
@@ -3,7 +3,8 @@
  modules,
  __findFile,
  ...
-}: {
+}:
+{
  den.aspects.doloro-shared = {
    includes = [
      modules.nixvim
@@ -13,24 +14,23 @@
      modules.hyfetch
      modules.ssh
    ];
-    homeManager = {
-      pkgs,
-      lib,
-      ...
-    }: {
-      home = {
-        username = "doloro";
-        homeDirectory = "/home/doloro";
-        packages = with pkgs; [
-          wl-clipboard
-          # home-manager
-          btop
-          pavucontrol
-        ];
+    homeManager =
+      { pkgs, lib, ... }:
+      {
+        home = {
+          username = "doloro";
+          homeDirectory = "/home/doloro";
+          packages = with pkgs; [
+            wl-clipboard
+            # home-manager
+            btop
+          ];
+        };
+        programs.home-manager.enable = true;
+      };
+    nixos =
+      { lib, ... }:
+      {
      };
-      programs.home-manager.enable = true;
-    };
-    nixos = {lib, ...}: {
-    };
  };
 }
@@ -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 = {...}: {
-    };
-  };
-}
@@ -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";
-    };
-  };
-}
@@ -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;
-      };
    };
  };
 }
@@ -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.";
  };
+
 }
@@ -13,10 +13,7 @@
    homeManager =
      { pkgs, ... }:
      {
-        home.packages = [
-          pkgs.opencode
-          pkgs.claude-code
-        ];
+        home.packages = [ pkgs.opencode ];
      };
  };
 }
@@ -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 = {
-    };
-  };
-}
@@ -1,4 +1,5 @@
-{modules, ...}: {
+{ modules, ... }:
+{
  modules.dunst = {
    homeManager = {
      services.dunst = {
@@ -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;
          };
        };
      };
@@ -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
@@ -1,144 +1,143 @@
-{modules, ...}: {
+{ modules, ... }:
+{
  modules.hyprland = {
    provides = {
      doloro-settings = {
        includes = [
          modules.dunst
        ];
-        homeManager = {
-          pkgs,
-          home,
-          ...
-        }: {
-          home.packages = [
-            pkgs.hyprcursor
-            pkgs.wlogout
-            pkgs.tofi
-            pkgs.killall
-            pkgs.grim
-            pkgs.slurp
-            pkgs.wayclip
-          ];
-          home.pointerCursor = {
-            enable = true;
-            name = "rose-pine-hyprcursor";
-            package = pkgs.rose-pine-hyprcursor;
-            hyprcursor.enable = true;
-          };
-          wayland.windowManager.hyprland.settings = {
-            env = [
-              "XCURSOR_THEME,BreezeX-RosePine-Linux"
-              "XCURSOR_SIZE,24"
-              "HYPRCURSOR_SIZE,24"
-              "__GLX_VENDOR_LIBRARY_NAME,nvidia"
-              "WEBKIT_DISABLE_DMABUF_RENDERER,1" # maybe disable if nixos fixes alcom
+        homeManager =
+          { pkgs, home, ... }:
+          {
+            home.packages = [
+              pkgs.hyprcursor
+              pkgs.wlogout
+              pkgs.tofi
+              pkgs.killall
+              pkgs.grim
+              pkgs.slurp
+              pkgs.wayclip
            ];
-            general = {
-              gaps_in = 1;
-              gaps_out = 1;
-              border_size = 1;
-              # "col.active_border" =
-              #   "rgb(${toString base16.rgb."base06".r},${toString base16.rgb."base06".g},${toString base16.rgb."base06".b})";
-              # "col.inactive_border" =
-              #   "rgb(${toString base16.rgb."base03".r},${toString base16.rgb."base03".g},${toString base16.rgb."base03".b})";
-              resize_on_border = false;
-              allow_tearing = true;
-              layout = "dwindle";
+            home.pointerCursor = {
+              enable = true;
+              name = "rose-pine-hyprcursor";
+              package = pkgs.rose-pine-hyprcursor;
+              hyprcursor.enable = true;
            };
-            decoration = {
-              rounding = 4;
-              rounding_power = 1;
-              active_opacity = 1.0;
-              inactive_opacity = 1.0;
-
-              shadow = {
-                enabled = false;
+            wayland.windowManager.hyprland.settings = {
+              env = [
+                "XCURSOR_THEME,BreezeX-RosePine-Linux"
+                "XCURSOR_SIZE,24"
+                "HYPRCURSOR_SIZE,24"
+                "__GLX_VENDOR_LIBRARY_NAME,nvidia"
+                "WEBKIT_DISABLE_DMABUF_RENDERER,1" # maybe disable if nixos fixes alcom
+              ];
+              general = {
+                gaps_in = 1;
+                gaps_out = 1;
+                border_size = 1;
+                # "col.active_border" =
+                #   "rgb(${toString base16.rgb."base06".r},${toString base16.rgb."base06".g},${toString base16.rgb."base06".b})";
+                # "col.inactive_border" =
+                #   "rgb(${toString base16.rgb."base03".r},${toString base16.rgb."base03".g},${toString base16.rgb."base03".b})";
+                resize_on_border = false;
+                allow_tearing = true;
+                layout = "dwindle";
              };
+              decoration = {
+                rounding = 4;
+                rounding_power = 1;
+                active_opacity = 1.0;
+                inactive_opacity = 1.0;

-              blur = {
+                shadow = {
+                  enabled = false;
+                };
+
+                blur = {
+                  enabled = true;
+                  passes = 1;
+                  new_optimizations = true;
+                  ignore_opacity = false;
+                };
+              };
+              cursor = {
+                no_hardware_cursors = true;
+              };
+              animations = {
                enabled = true;
-                passes = 1;
-                new_optimizations = true;
-                ignore_opacity = false;
+                bezier = [
+                  "easeOutQuint,0.23,1,0.32,1"
+                  "easeInOutCubic,0.65,0.05,0.36,1"
+                  "linear,0,0,1,1"
+                  "almostLinear,0.5,0.5,0.75,1.0"
+                  "quick,0.15,0,0.1,1"
+                ];
+                animation = [
+                  "global, 1, 10, default"
+                  "border, 1, 5.39, easeOutQuint"
+                  "windows, 1, 2.79, easeOutQuint"
+                  "windowsIn, 1, 1, easeOutQuint, popin 87%"
+                  "windowsOut, 1, 1, linear, popin 87%"
+                  "windowsMove, 1, 1, easeInOutCubic"
+                  "fadeIn, 1, 0.5, almostLinear"
+                  "fadeOut, 1, 0.5, almostLinear"
+                  "fade, 1, 1, quick"
+                  "layers, 1, 3.81, easeOutQuint"
+                  "layersIn, 1, 4, easeOutQuint, fade"
+                  "layersOut, 1, 1.5, linear, fade"
+                  "fadeLayersIn, 1, 1.79, almostLinear"
+                  "fadeLayersOut, 1, 1.39, almostLinear"
+                  "workspaces, 1, 1, almostLinear, slide"
+                  "workspacesIn, 1, 1, easeInOutCubic, slide"
+                  "workspacesOut, 1, 1, easeInOutCubic, slide"
+                  "zoomFactor, 1, 7, quick"
+                ];
              };
-            };
-            cursor = {
-              no_hardware_cursors = false;
-            };
-            animations = {
-              enabled = true;
-              bezier = [
-                "easeOutQuint,0.23,1,0.32,1"
-                "easeInOutCubic,0.65,0.05,0.36,1"
-                "linear,0,0,1,1"
-                "almostLinear,0.5,0.5,0.75,1.0"
-                "quick,0.15,0,0.1,1"
-              ];
-              animation = [
-                "global, 1, 10, default"
-                "border, 1, 5.39, easeOutQuint"
-                "windows, 1, 2.79, easeOutQuint"
-                "windowsIn, 1, 1, easeOutQuint, popin 87%"
-                "windowsOut, 1, 1, linear, popin 87%"
-                "windowsMove, 1, 1, easeInOutCubic"
-                "fadeIn, 1, 0.5, almostLinear"
-                "fadeOut, 1, 0.5, almostLinear"
-                "fade, 1, 1, quick"
-                "layers, 1, 3.81, easeOutQuint"
-                "layersIn, 1, 4, easeOutQuint, fade"
-                "layersOut, 1, 1.5, linear, fade"
-                "fadeLayersIn, 1, 1.79, almostLinear"
-                "fadeLayersOut, 1, 1.39, almostLinear"
-                "workspaces, 1, 1, almostLinear, slide"
-                "workspacesIn, 1, 1, easeInOutCubic, slide"
-                "workspacesOut, 1, 1, easeInOutCubic, slide"
-                "zoomFactor, 1, 7, quick"
-              ];
-            };
-            dwindle = {
-              # pseudotile = true;
-              preserve_split = true;
-            };
-            # master = {
-            # 	new_status = master;
-            # };
-            misc = {
-              force_default_wallpaper = -1;
-              disable_hyprland_logo = false;
-              enable_anr_dialog = false;
-              # vfr = true;
-            };
-            "$mainMod" = "SUPER";
-            bind =
-              [
+              dwindle = {
+                pseudotile = true;
+                preserve_split = true;
+              };
+              # master = {
+              # 	new_status = master;
+              # };
+              misc = {
+                force_default_wallpaper = -1;
+                disable_hyprland_logo = false;
+                enable_anr_dialog = false;
+                vfr = true;
+              };
+              "$mainMod" = "SUPER";
+              bind = [
                (
                  let
                    config = pkgs.writeTextFile {
                      name = "config";
                      text = ''
-                        width = 100%
-                           height = 100%
-                           border-width = 0
-                           outline-width = 0
-                           padding-left = 35%
-                           padding-top = 35%
-                           result-spacing = 25
-                           num-results = 5
-                           font = monospace
-                           background-color = #000A
-                      '';
+                        			width = 100%
+                              height = 100%
+                              border-width = 0
+                              outline-width = 0
+                              padding-left = 35%
+                              padding-top = 35%
+                              result-spacing = 25
+                              num-results = 5
+                              font = monospace
+                              background-color = #000A
+                              		'';
                    };
                    script = pkgs.writeShellScript "mreow" ''
-                      exec $(tofi-drun -c ${config})
-                    '';
-                  in "$mainMod, R, exec, ${script}"
+                      	exec $(tofi-drun -c ${config})
+                          	'';
+                  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"
@@ -147,10 +146,10 @@
                (
                  let
                    script = pkgs.writeShellScript "meow" ''
-                      fish -c 'grim -g $(slurp) -t png - &| wl-copy -t image/png; killall wayfreeze'
-                    '';
+                      										fish -c 'grim -g $(slurp) -t png - &| wl-copy -t image/png; killall wayfreeze'
+                      																																'';
                  in
-                    "$mainMod, S, exec, " + "wayfreeze --after-freeze-cmd '${script}'"
+                  "$mainMod, S, exec, " + "wayfreeze --after-freeze-cmd '${script}'"
                )
                "$mainMod, F, fullscreen"
                "$mainMod, mouse_down, workspace, e+1"
@@ -163,40 +162,40 @@
              ]
              ++ (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"
-              "$mainMod, mouse:273, resizewindow"
-            ];
-            windowrule = [
-              "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"
-              "match:class ^(com.obsproject.Studio)$, workspace 10 silent"
-              "match:initial_title ^(OBS Studio Crash Detected)$, pin true"
-              "match:initial_title ^(Discord Popout)$, workspace 1 silent"
-            ];
-            layerrule = [
-              "match:namespace ^(notifications)$, no_screen_share true"
-              # "match:namespace ^(quickshell)$, blur true"
-            ];
-            # exec-once = [
-            # ];
-            # we need to auto launch: quickshell, steam, ar_rpc (maybe), vesktop, telegram, qbit, and obs
+              bindm = [
+                "$mainMod, mouse:272, movewindow"
+                "$mainMod, mouse:273, resizewindow"
+              ];
+              windowrule = [
+                "match:class .*, suppress_event maximize"
+                "match:class ^(gamescope)$, workspace 5"
+                "match:class ^(gamescope)$, immediate true"
+                "match:class ^(steam)$, workspace 6 silent"
+                "match:class ^(vesktop)$, workspace 8 silent"
+                "match:class ^(org.telegram.desktop)$, workspace 8 silent"
+                "match:class ^(com.obsproject.Studio)$, workspace 10 silent"
+                "match:initial_title ^(OBS Studio Crash Detected)$, pin true"
+                "match:initial_title ^(Discord Popout)$, workspace 1 silent"
+              ];
+              layerrule = [
+                "match:namespace ^(notifications)$, no_screen_share true"
+                # "match:namespace ^(quickshell)$, blur true"
+              ];
+              # exec-once = [
+              # ];
+              # we need to auto launch: quickshell, steam, ar_rpc (maybe), vesktop, telegram, qbit, and obs
+            };
          };
-        };
      };
    };
  };
@@ -3,56 +3,59 @@
  inputs,
  lib,
  ...
-}: {
+}:
+{
  flake-file.inputs = {
    hyprland.url = "github:hyprwm/Hyprland";
  };
  modules.hyprland = {
-    nixos = {pkgs, ...}: {
-      imports = [inputs.hyprland.nixosModules.default];
-      environment.systemPackages = with pkgs; [
-        wayfreeze
-        grim
-        slurp
-        wlogout
-        ranger
-      ];
-      programs.xwayland.enable = true;
-      programs.hyprland = {
-        enable = true;
-        # withUWSM = true;
-        # set the flake package
-        package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-        # make sure to also set the portal package, so that they are in sync
-        portalPackage =
-          inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-      };
-      # gtk.enable = lib.mkForce false;
-      xdg.portal = {
-        enable = true;
-        extraPortals = [
-          inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland
+    nixos =
+      { pkgs, ... }:
+      {
+        imports = [ inputs.hyprland.nixosModules.default ];
+        environment.systemPackages = with pkgs; [
+          wayfreeze
+          grim
+          slurp
+          wlogout
+          ranger
        ];
-      };
-      environment.sessionVariables.NIXOS_OZONE_WL = "1";
-      hardware.graphics = {
-        # package = pkgs-unstable.mesa;
+        programs.xwayland.enable = true;
+        programs.hyprland = {
+          enable = true;
+          # withUWSM = true;
+          # set the flake package
+          package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+          # make sure to also set the portal package, so that they are in sync
+          portalPackage =
+            inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+        };
+        # gtk.enable = lib.mkForce false;
+        xdg.portal = {
+          enable = true;
+          extraPortals = [
+            inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland
+          ];
+        };
+        environment.sessionVariables.NIXOS_OZONE_WL = "1";
+        hardware.graphics = {
+          # package = pkgs-unstable.mesa;

-        # if you also want 32-bit support (e.g for Steam)
-        # enable32Bit = true;
-        # package32 = pkgs-unstable.pkgsi686Linux.mesa;
+          # if you also want 32-bit support (e.g for Steam)
+          # enable32Bit = true;
+          # package32 = pkgs-unstable.pkgsi686Linux.mesa;
+        };
      };
-    };
-    homeManager = {pkgs, ...}: {
-      gtk = {
-        enable = true;
+    homeManager =
+      { pkgs, ... }:
+      {
+        gtk = {
+          enable = true;
+        };
+        wayland.windowManager.hyprland = {
+          enable = true;
+          systemd.variables = [ "--all" ];
+        };
      };
-      # backupFileExtension = "backupHM";
-      wayland.windowManager.hyprland = {
-        enable = true;
-        systemd.variables = ["--all"];
-        configType = "hyprlang";
-      };
-    };
  };
 }
@@ -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;
        };
      };
    };
@@ -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;
  };
 }
@@ -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
@@ -1,38 +1,36 @@
-{...}: {
-  flake-file.inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  };
+{ ... }:
+{
  modules.nix = {
-    nixos = {...}: {
-      nixpkgs.config.allowUnfree = true;
-      nix.settings = {
-        extra-substituters = [
-          "https://hyprland.cachix.org"
-          "https://nix-community.cachix.org"
-          "https://cache.nixos.org/"
-          "https://attic.scug.io/pkgs"
-          "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="
-          "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-          "pkgs:+sRbfiZMMX5R3PuAPtIRz/emowDoGZNpozibrnrAvuc="
-          "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"
-          "nix-command"
-        ];
-        trusted-users = [
-          "doloro"
-        ];
+    nixos =
+      { ... }:
+      {
+        nixpkgs.config.allowUnfree = true;
+        nix.settings = {
+          substituters = [
+            "https://hyprland.cachix.org"
+            "https://nix-community.cachix.org"
+            "https://cache.nixos.org/"
+            "https://attic.scug.io/pkgs"
+            "https://cache.nixos-cuda.org"
+            "https://niri.cachix.org"
+            "https://attic.xuyh0120.win/lantian"
+          ];
+          trusted-public-keys = [
+            "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+            "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+            "pkgs:+sRbfiZMMX5R3PuAPtIRz/emowDoGZNpozibrnrAvuc="
+            "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M="
+            "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964="
+            "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc="
+          ];
+          experimental-features = [
+            "flakes"
+            "nix-command"
+          ];
+          trusted-users = [
+            "doloro"
+          ];
+        };
      };
-    };
  };
 }
@@ -4,7 +4,8 @@
  lib,
  inputs,
  ...
-}: {
+}:
+{
  # Its in its own folder for future modulizaion efforts
  flake-file.inputs = {
    nixvim = {
@@ -14,388 +15,288 @@
  };
  modules = {
    nixvim = {
-      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"];
+      nixos =
+        { home-manager, ... }:
+        {
        };
-      in {
-        imports = [
-          inputs.nixvim.homeModules.nixvim
-        ];
-        programs.nixvim = {
-          enable = true;
-          defaultEditor = true;
-          nixpkgs = {
-            config = {
-              allowUnfree = true;
-            };
-          };
-          colorschemes.gruvbox-material.enable = true;
-          extraPackages = with pkgs; [
-            # formatters
-            nixfmt-rs
-            rustfmt
-            # misc
-            ripgrep
-            nixd
-            tree-sitter
-            rust-analyzer
+      homeManager =
+        { pkgs, ... }:
+        {
+          imports = [
+            inputs.nixvim.homeModules.nixvim
          ];
-          performance.byteCompileLua = {
+          programs.nixvim = {
            enable = true;
-            plugins = true;
-            nvimRuntime = true;
-            luaLib = true;
-            configs = true;
-          };
-          plugins = {
-            todo-comments.enable = true;
-            lsp-status.enable = true;
-            transparent.enable = true;
-            which-key.enable = true;
-            snacks.enable = true;
-            conform-nvim = {
-              enable = true;
-              settings = {
-                formatters_by_ft = {
-                  nix = ["nixfmt"];
-                  rust = ["rustfmt"];
-                  "_" = [
-                    "squeeze_blanks"
-                    "trim_whitespace"
-                    "trim_newlines"
-                  ];
-                };
-                format_on_save = {
-                  timeout_ms = 500;
-                  lsp_format = "fallback";
-                };
+            defaultEditor = true;
+            nixpkgs = {
+              config = {
+                allowUnfree = true;
              };
            };
-            # efmls-configs = {
-            #   enable = true;
-            #   languages = {
-            #     scss = {
-            #       formatter = "prettier";
-            #       linter = "stylelint";
-            #     };
-            #   };
-            # };
-            lsp = {
+            colorschemes.gruvbox-material.enable = true;
+            extraPackages = with pkgs; [
+              # formatters
+              nixfmt
+              rustfmt
+              # misc
+              ripgrep
+              # misc
+              nixd
+              tree-sitter
+            ];
+            performance.byteCompileLua = {
              enable = true;
-              servers = {
-                qmlls = {
-                  enable = true;
-                  config = {
-                    cmd = "-E";
+              plugins = true;
+              nvimRuntime = true;
+              luaLib = true;
+              configs = true;
+            };
+            plugins = {
+              todo-comments.enable = true;
+              lsp-status.enable = true;
+              transparent.enable = true;
+              which-key.enable = true;
+              conform-nvim = {
+                enable = true;
+                settings = {
+                  formatters_by_ft = {
+                    nix = [ "nixfmt" ];
+                    rust = [ "rustfmt" ];
+                    "_" = [
+                      "squeeze_blanks"
+                      "trim_whitespace"
+                      "trim_newlines"
+                    ];
+                  };
+                  format_on_save = {
+                    timeout_ms = 500;
+                    lsp_format = "fallback";
                  };
                };
-                rust_analyzer = {
-                  enable = true;
-                  installCargo = false;
-                  installRustc = false;
-                };
-                nixd = {
-                  enable = true;
-                  settings = {
-                    nixd = {
-                      nixpkgs.expr = "import (builtins.getFlake \"${toString /home/doloro/dotfiles}\").inputs.nixpkgs { }";
-                      options = {
-                        nixos.expr = "(builtins.getFlake \"${toString /home/doloro/dotfiles}\").nixosConfigurations.desktop.options";
-                        home_manager.expr = "(builtins.getFlake \"${toString /home/doloro/dotfiles}\").homeConfigurations.doloro-desktop.options";
-                      };
+              };
+              # efmls-configs = {
+              #   enable = true;
+              #   languages = {
+              #     scss = {
+              #       formatter = "prettier";
+              #       linter = "stylelint";
+              #     };
+              #   };
+              # };
+              lsp = {
+                enable = true;
+                servers = {
+                  qmlls = {
+                    enable = true;
+                    config = {
+                      cmd = "-E";
                    };
                  };
-                };
-                astro = {
-                  enable = true;
-                };
-                ts_ls = {
-                  enable = true;
-                };
-                cssls.enable = true;
-                svelte.enable = true;
-              };
-            };
-            lsp-format = {
-              enable = true;
-              # lspServersToEnable = [ "qmlls" ];
-            };
-            notify = {
-              enable = true;
-              settings = {
-                background_color = "#00000000";
-              };
-            };
-            mini-cursorword.enable = true;
-            # mini-statusline.enable = true;
-            lualine = {
-              enable = true;
-              settings = {
-                sections = {
-                  lualine_a = ["mode"];
-                  lualine_b = [
-                    "branch"
-                    "diff"
-                    "diagnostics"
-                  ];
-                  lualine_c = ["filename"];
-                  lualine_x = [
-                    "encoding"
-                    "fileformat"
-                    "filetype"
-                  ];
-                  lualine_y = ["progress"];
-                  lualine_z = ["location"];
-                };
-                inactive_sections = {
-                  lualine_a = [];
-                  lualine_b = [];
-                  lualine_c = ["filename"];
-                  lualine_x = ["location"];
-                  lualine_y = [];
-                  lualine_z = [];
-                };
-              };
-            };
-            web-devicons.enable = true;
-            vim-dadbod-completion.enable = true;
-            telescope.enable = true;
-            lazygit.enable = true;
-            mini-indentscope = {
-              enable = true;
-              settings = {
-                draw = {
-                  delay = 10;
-                };
-              };
-            };
-            mini-files = {
-              enable = true;
-              settings = {
-                windows = {
-                  preview = true;
-                };
-              };
-            };
-            lsp-lines.enable = true;
-            diaglist = {
-              enable = true;
-              settings = {
-                debug = false;
-              };
-            };
-            cmp = {
-              enable = true;
-              autoEnableSources = true;
-              settings = {
-                sources = [
-                  {
-                    name = "nvim_lsp";
-                    priority = 100;
-                  }
-                  {
-                    name = "buffer";
-                    priority = 50;
-                  }
-                  {
-                    name = "path";
-                    priority = 40;
-                  }
-                ];
-                mapping = {
-                  "<C-Space>" = "cmp.mapping.complete()";
-                  "<C-d>" = "cmp.mapping.scroll_docs(-4)";
-                  "<C-e>" = "cmp.mapping.close()";
-                  "<C-f>" = "cmp.mapping.scroll_docs(4)";
-                  "<CR>" = "cmp.mapping.confirm({ select = true })";
-                  "<S-Tab>" = "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() else fallback() end end, {'i', 's'})";
-                  "<Tab>" = "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() else fallback() end end, {'i', 's'})";
-                };
-                window = {
-                  completion = {
-                    border = "rounded";
-                    winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,CursorLine:PmenuSel,Search:None";
+                  rust_analyzer = {
+                    enable = true;
+                    installCargo = false;
+                    installRustc = false;
                  };
-                  documentation = {
-                    border = "rounded";
-                    winhighlight = "Normal:Pmenu,FloatBorder:Pmenu";
+                  nixd = {
+                    enable = true;
                  };
+                  astro = {
+                    enable = true;
+                  };
+                  ts_ls = {
+                    enable = true;
+                  };
+                  cssls.enable = true;
+                  svelte.enable = true;
                };
              };
-            };
-            lspkind.enable = true;
-            tiny-inline-diagnostic.enable = true;
-            # tiny-code-action.enable = true;
-            # persisted.enable = true;
-            auto-session = {
-              enable = false;
-              settings = {
-                enabled = true;
-                auto_save = true;
-                auto_restore = true;
+              lsp-format = {
+                enable = true;
+                # lspServersToEnable = [ "qmlls" ];
              };
-            };
-            wakatime.enable = true;
-            treesitter = {
-              enable = true;
-              grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
-                bash
-                css
-                html
-                javascript
-                json
-                lua
-                make
-                markdown
-                rust
-                nix
-                regex
-                toml
-                tsx
-                typescript
-                vim
-                vimdoc
-                xml
-                yaml
-                svelte
-              ];
-              settings = {
-                highlight.enable = true;
-                indent.enable = false;
-              };
-            };
-          };
-          extraPlugins = with pkgs; [
-            # vimPlugins.mini-completion
-            vimPlugins.mini-comment
-            vimPlugins.melange-nvim
-            vimPlugins.telescope-file-browser-nvim
-            vimPlugins.lsp-progress-nvim
-            vimPlugins.cmp-cmdline
-            vimPlugins.cmp-nvim-lsp-signature-help
-            vimPlugins.cord-nvim
-            tiny-code-action
-          ];
-          opts = {
-            number = true;
-            bg = "dark";
-            tabstop = 2;
-            shiftwidth = 2;
-            termguicolors = true;
-          };
-          globals = {
-            mapleader = " ";
-          };
-          extraConfigLua = ''
-            -- tree-sitter-nix uses (#is-not? local) which the new nvim-treesitter main branch no longer registers
-            vim.treesitter.query.add_predicate("is-not?", function() return true end, { force = true })
-
-            local cmp = require('cmp')
-            cmp.setup.cmdline(':', {
-              mapping = cmp.mapping.preset.cmdline(),
-              sources = cmp.config.sources(
-                { { name = 'path' } },
-                { { name = 'cmdline' } }
-              ),
-              window = {
-                completion = {
-                  border = 'rounded',
-                },
-              },
-            })
-            cmp.setup.cmdline('/', {
-              mapping = cmp.mapping.preset.cmdline(),
-              sources = {
-                { name = 'buffer' }
-              },
-              window = {
-                completion = {
-                  border = 'rounded',
-                },
-              },
-            })
-
-            require('tiny-code-action').setup({
-              backend = 'vim',
-              picker = 'snacks',
-              resolve_timeout = 100,
              notify = {
-                enabled = true,
-                on_empty = true,
-              },
-            })
-          '';
-          keymaps = [
-            {
-              action = "<cmd>Telescope persisted<cr>";
-              key = "<leader>fs";
-              options = {
-                silent = true;
+                enable = true;
+                settings = {
+                  background_color = "#00000000";
+                };
              };
-            }
-            {
-              action = "<cmd>Telescope find_files<cr>";
-              key = "<leader>ff";
-              options = {
-                silent = true;
+              mini-cursorword.enable = true;
+              # mini-statusline.enable = true;
+              lualine = {
+                enable = true;
+                settings = {
+                  sections = {
+                    lualine_a = [ "mode" ];
+                    lualine_b = [
+                      "branch"
+                      "diff"
+                      "diagnostics"
+                    ];
+                    lualine_c = [ "filename" ];
+                    lualine_x = [
+                      "encoding"
+                      "fileformat"
+                      "filetype"
+                    ];
+                    lualine_y = [ "lsp_status" ];
+                    lualine_z = [ "location" ];
+                  };
+                  inactive_sections = {
+                    lualine_a = [ ];
+                    lualine_b = [ ];
+                    lualine_c = [ "filename" ];
+                    lualine_x = [ "location" ];
+                    lualine_y = [ ];
+                    lualine_z = [ ];
+                  };
+                };
              };
-            }
-            {
-              action = "<cmd>:lua MiniFiles.open()<cr>";
-              key = "<leader>fv";
-              options = {
-                silent = true;
+              web-devicons.enable = true;
+              vim-dadbod-completion.enable = true;
+              telescope.enable = true;
+              lazygit.enable = true;
+              mini-indentscope = {
+                enable = true;
+                settings = {
+                  draw = {
+                    delay = 10;
+                  };
+                };
              };
-            }
-            {
-              action = "<cmd>LazyGit<cr>";
-              key = "<leader>lg";
-              options = {
-                silent = true;
+              mini-files = {
+                enable = true;
+                settings = {
+                  windows = {
+                    preview = true;
+                  };
+                };
              };
-            }
-            {
-              action = "<cmd>Telescope buffers<cr>";
-              key = "<leader>fb";
-              options = {
-                silent = true;
+              trouble.enable = true;
+              cmp = {
+                enable = true;
+                autoEnableSources = true;
+                settings = {
+                  sources = [
+                    { name = "nvim_lsp"; }
+                    { name = "path"; }
+                    { name = "buffer"; }
+                  ];
+                  mapping = {
+                    "<C-Space>" = "cmp.mapping.complete()";
+                    "<C-d>" = "cmp.mapping.scroll_docs(-4)";
+                    "<C-e>" = "cmp.mapping.close()";
+                    "<C-f>" = "cmp.mapping.scroll_docs(4)";
+                    "<CR>" = "cmp.mapping.confirm({ select = true })";
+                    "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
+                    "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
+                  };
+                };
              };
-            }
-            {
-              action = "<cmd>Telescope live_grep<cr>";
-              key = "<leader>fg";
-              options = {
-                silent = true;
+              lspkind.enable = true;
+              tiny-inline-diagnostic.enable = true;
+              # persisted.enable = true;
+              auto-session = {
+                enable = false;
+                settings = {
+                  enabled = true;
+                  auto_save = true;
+                  auto_restore = true;
+                };
              };
-            }
-            {
-              action = "<cmd>DiaglistToggle<cr>";
-              key = "<leader>fd";
-              options = {
-                silent = true;
+              wakatime.enable = true;
+              treesitter = {
+                enable = true;
+                grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
+                  bash
+                  json
+                  lua
+                  make
+                  markdown
+                  rust
+                  nix
+                  regex
+                  toml
+                  vim
+                  vimdoc
+                  xml
+                  yaml
+                  svelte
+                ];
+                settings = {
+                  highlight.enable = true;
+                };
              };
-            }
-            {
-              action = "<cmd>lua require('tiny-code-action').code_action()<cr>";
-              key = "<leader>ca";
-              mode = ["n" "x"];
-              options = {
-                silent = true;
-              };
-            }
-          ];
+            };
+            extraPlugins = with pkgs; [
+              # vimPlugins.mini-completion
+              vimPlugins.mini-comment
+              vimPlugins.melange-nvim
+              vimPlugins.telescope-file-browser-nvim
+              vimPlugins.lsp-progress-nvim
+            ];
+            opts = {
+              number = true;
+              bg = "dark";
+              tabstop = 2;
+              shiftwidth = 2;
+              termguicolors = true;
+            };
+            globals = {
+              mapleader = " ";
+            };
+            keymaps = [
+              {
+                action = "<cmd>Telescope persisted<cr>";
+                key = "<leader>fs";
+                options = {
+                  silent = true;
+                };
+              }
+              {
+                action = "<cmd>Telescope find_files<cr>";
+                key = "<leader>ff";
+                options = {
+                  silent = true;
+                };
+              }
+              {
+                action = "<cmd>:lua MiniFiles.open()<cr>";
+                key = "<leader>fv";
+                options = {
+                  silent = true;
+                };
+              }
+              {
+                action = "<cmd>LazyGit<cr>";
+                key = "<leader>lg";
+                options = {
+                  silent = true;
+                };
+              }
+              {
+                action = "<cmd>Telescope buffers<cr>";
+                key = "<leader>fb";
+                options = {
+                  silent = true;
+                };
+              }
+              {
+                action = "<cmd>Telescope live_grep<cr>";
+                key = "<leader>fg";
+                options = {
+                  silent = true;
+                };
+              }
+              {
+                action = "<cmd>Trouble diagnostics toggle<cr>";
+                key = "<leader>fd";
+                options = {
+                  silent = true;
+                };
+              }
+            ];
+          };
        };
-      };
    };
  };
 }
@@ -1,72 +1,70 @@
+{ den, modules, ... }:
 {
-  den,
-  modules,
-  ...
-}: {
  modules.obs = settings: {
-    homeManager = {
-      pkgs,
-      lib,
-      config,
-      ...
-    }: {
-      programs = {
-        obs-studio = {
-          enable = true;
-          package = (
-            pkgs.obs-studio.override {
-              cudaSupport = true;
-            }
-          );
-          plugins = with pkgs.obs-studio-plugins; [
-            obs-pipewire-audio-capture
-            obs-vkcapture
-            obs-vaapi #optional AMD hardware acceleration
-            obs-gstreamer
-          ];
-        };
-      };
-      systemd.user.services = let
-        audio-set = lib.mkIf settings.audio {
-          pw-discordaudio-virtual-device = {
-            Unit = {
-              Description = "OBS daemon";
-              After = ["hyprland-session.target"];
-            };
-            Install = {
-              WantedBy = ["default.target"];
-            };
-            Service = {
-              ExecStart = "${pkgs.writeShellScript "discord_audio_virt_device" ''
-                pw-loopback -m '[ FL FR]' --capture-props='media.class=Audio/Sink node.name=DiscordSink' -n DiscordSink
-              ''}";
-              Restart = "on-failure";
-              RestartSec = "5s";
-            };
-          };
-          pw-gameaudio-virtual-device = {
-            Unit = {
-              Description = "OBS daemon";
-              After = ["hyprland-session.target"];
-            };
-            Install = {
-              WantedBy = ["default.target"];
-            };
-            Service = {
-              ExecStart = "${pkgs.writeShellScript "game_audio_virt_device" ''
-                pw-loopback -m '[ FL FR]' --capture-props='media.class=Audio/Sink node.name=GameAudioSink' -n GameAudioSink
-              ''}";
-              Restart = "on-failure";
-              RestartSec = "5s";
-            };
+    homeManager =
+      {
+        pkgs,
+        lib,
+        config,
+        ...
+      }:
+      {
+        programs = {
+          obs-studio = {
+            enable = true;
+            package = (
+              pkgs.obs-studio.override {
+                cudaSupport = true;
+              }
+            );
+            plugins = with pkgs.obs-studio-plugins; [
+              obs-pipewire-audio-capture
+              obs-vkcapture
+            ];
          };
        };
-      in
-        lib.mergeAttrsList [audio-set];
+        systemd.user.services =
+          let
+            audio-set = lib.mkIf settings.audio {
+              pw-discordaudio-virtual-device = {
+                Unit = {
+                  Description = "OBS daemon";
+                  After = [ "hyprland-session.target" ];
+                };
+                Install = {
+                  WantedBy = [ "default.target" ];
+                };
+                Service = {
+                  ExecStart = "${pkgs.writeShellScript "discord_audio_virt_device" ''
+                    				pw-loopback -m '[ FL FR]' --capture-props='media.class=Audio/Sink node.name=DiscordSink' -n DiscordSink
+                    			''}";
+                  Restart = "on-failure";
+                  RestartSec = "5s";
+                };
+              };
+              pw-gameaudio-virtual-device = {
+                Unit = {
+                  Description = "OBS daemon";
+                  After = [ "hyprland-session.target" ];
+                };
+                Install = {
+                  WantedBy = [ "default.target" ];
+                };
+                Service = {
+                  ExecStart = "${pkgs.writeShellScript "game_audio_virt_device" ''
+                    				pw-loopback -m '[ FL FR]' --capture-props='media.class=Audio/Sink node.name=GameAudioSink' -n GameAudioSink
+                    			''}";
+                  Restart = "on-failure";
+                  RestartSec = "5s";
+                };
+              };
+            };
+          in
+          lib.mergeAttrsList [ audio-set ];

-      wayland.windowManager.hyprland.settings = {
-        # exec-once = ["${config.programs.obs-studio.finalPackage}/bin/obs --startreplaybuffer"];
+        wayland.windowManager.hyprland.settings = {
+          exec-once = [ "${config.programs.obs-studio.finalPackage}/bin/obs --startreplaybuffer" ];
+        };
      };
-    };
  };
 }
@@ -1 +1 @@
-/run/user/1000/quickshell/vfs/ca6d8e2cdd46bffdf799708f31d409fa/.qmlls.ini
+/run/user/1000/quickshell/vfs/6e389f6b800776b0595d9d90e42ebd04/.qmlls.ini
@@ -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
-                color: Colors.textPrimary
-            }
+        Text {
+            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
-                color: Colors.textPrimary
-            }
+        Text {
+            id: mic
+            text: root.defaultMic.audio.muted ? "muted" : "unmuted"
+            color: Colors.textPrimary
        }
    }
 }
@@ -4,62 +4,37 @@
  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, ...}: {
-          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
+        nixos =
+          { pkgs, ... }:
+          let
+            rpi-pi = inputs.raspberry-pi-nix;
+          in
+          {
+            imports = [
+              rpi-pi.nixosModules.raspberry-pi
+              rpi-pi.nixosModules.sd-image
+            ];

-            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
+            environment.systemPackages = with pkgs; [
+              libraspberrypi
+            ];

-            inputs.nixos-raspberrypi.nixosModules.sd-image
-          ];
+            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;

-          environment.systemPackages = with pkgs; [
-            libraspberrypi
-          ];
-
-          _module.args = {inherit (inputs) nixos-raspberrypi;};
-
-          sdImage.compressImage = 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;
+          };
      };
    };
  };
@@ -3,18 +3,18 @@
  __findFile,
  modules,
  ...
-}: {
+}:
+{
  # Basic caddy
  modules.services.provides.caddy = {
-    nixos = {config, ...}: {
-      services.caddy = {
-        enable = true;
-        email = "doloroo@proton.me";
-        enableReload = true;
-        globalConfig = ''
-          acme_ca https://acme-v02.api.letsencrypt.org/directory
-        '';
+    nixos =
+      { config, ... }:
+      {
+        services.caddy = {
+          enable = true;
+          email = "doloroo@proton.me";
+          enableReload = true;
+        };
      };
-    };
  };
 }
@@ -3,43 +3,35 @@
  __findFile,
  modules,
  ...
-}: {
+}:
+{
  # Basic traefik
  modules.services.provides.ddns = {
-    nixos = {
-      config,
-      pkgs,
-      ...
-    }: let
-      ddnsImg = pkgs.dockerTools.pullImage {
-        imageName = "qmcgaw/ddns-updater";
-        imageDigest = "sha256:ee16ab4f6203bf9e5b0925d38a0b4ebf2d9f23771f933cfb2f5a2dbd5f9a2f88";
-        finalImageName = "qmcgaw/ddns-updater";
-        finalImageTag = "latest";
-        sha256 = "sha256-dMCHkvoFaORmGwbIM9io4Vc9fq+wBks25k2dmnW7naI=";
-        arch = "arm64";
-      };
-    in {
-      virtualisation.oci-containers.containers = {
-        ddns = {
-          image = "qmcgaw/ddns-updater";
-          imageFile = ddnsImg;
-          volumes = [
-            "/data/ddns:/updater/data"
-            "/etc/localtime:/etc/localtime:ro"
-          ];
-          ports = ["0.0.0.0:8125:8000"];
-          # networks = [ "meow" ];
+    nixos =
+      { config, pkgs, ... }:
+      let
+        ddnsImg = pkgs.dockerTools.pullImage {
+          imageName = "qmcgaw/ddns-updater";
+          imageDigest = "sha256:ee16ab4f6203bf9e5b0925d38a0b4ebf2d9f23771f933cfb2f5a2dbd5f9a2f88";
+          finalImageName = "qmcgaw/ddns-updater";
+          finalImageTag = "latest";
+          sha256 = "sha256-dMCHkvoFaORmGwbIM9io4Vc9fq+wBks25k2dmnW7naI=";
+          arch = "arm64";
+        };
+      in
+      {
+        virtualisation.oci-containers.containers = {
+          ddns = {
+            image = "qmcgaw/ddns-updater";
+            imageFile = ddnsImg;
+            volumes = [
+              "/data/ddns:/updater/data"
+              "/etc/localtime:/etc/localtime:ro"
+            ];
+            # 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
-          }
-        '';
-      };
-    };
  };
 }
@@ -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
-        '';
-      };
-    };
-  };
-}
@@ -8,10 +8,10 @@
          ssh = {
            enable = true;
            enableDefaultConfig = false;
-            settings = {
+            matchBlocks = {
              "*" = {
-                AddKeysToAgent = "yes";
-                IdentityFile = [
+                addKeysToAgent = "yes";
+                identityFile = [
                  "~/.ssh/id_ed25519"
                  "~/.ssh/id_gitea_scug"
                ];
@@ -3,7 +3,8 @@
  modules,
  inputs,
  ...
-}: {
+}:
+{
  flake-file.inputs = {
    stylix = {
      url = "github:nix-community/stylix";
@@ -11,29 +12,33 @@
    };
  };
  modules.stylix = {
-    homeManager = {pkgs, ...}: {
-      imports = [inputs.stylix.homeModules.stylix];
-      # gtk.gtk4.theme = null;
-      stylix = {
-        enable = true;
-        autoEnable = false;
-        targets.gtk.enable = true;
-        targets.qt.enable = true;
-        targets.tmux.enable = false;
-        fonts = {
-          monospace = {
-            name = "CaskaydiaCove Nerd Font Mono";
-            package = pkgs.nerd-fonts.caskaydia-cove;
+    homeManager =
+      { pkgs, ... }:
+      {
+        imports = [ inputs.stylix.homeModules.stylix ];
+        gtk.gtk4.theme = null;
+        stylix = {
+          enable = true;
+          autoEnable = false;
+          targets.gtk.enable = true;
+          targets.qt.enable = true;
+          targets.tmux.enable = false;
+          fonts = {
+            monospace = {
+              name = "CaskaydiaCove Nerd Font Mono";
+              package = pkgs.nerd-fonts.caskaydia-cove;
+            };
          };
+          base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
        };
-        base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
      };
-    };
-    nixos = {pkgs, ...}: {
-      imports = [inputs.stylix.nixosModules.stylix];
-      stylix.enable = false;
-      stylix.autoEnable = false;
-      stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
-    };
+    nixos =
+      { pkgs, ... }:
+      {
+        imports = [ inputs.stylix.nixosModules.stylix ];
+        stylix.enable = false;
+        stylix.autoEnable = false;
+        stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
+      };
  };
 }
@@ -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 =
@@ -1,24 +1,22 @@
-{modules, ...}: {
+{ modules, ... }:
+{
  modules.tmux = {
-    homeManager = {
-      home,
-      pkgs,
-      ...
-    }: {
-      programs.tmux = {
-        enable = true;
-        plugins = with pkgs.tmuxPlugins; [
-          sensible
-          minimal-tmux-status
-        ];
-        extraConfig = ''
-          set-option -g default-terminal "tmux-256color"
-          set -as terminal-features ",xterm-256color:RGB"
-          set -g status-bg black
-          set -g status-fg white
-          set -g mouse on
-        '';
+    homeManager =
+      { home, pkgs, ... }:
+      {
+        programs.tmux = {
+          enable = true;
+          plugins = with pkgs.tmuxPlugins; [
+            sensible
+            minimal-tmux-status
+          ];
+          extraConfig = ''
+                  set-option -g default-terminal "xterm-256color"
+            			set -a terminal-features "xterm-256color:RGB"
+                  set -g status-bg black
+                  set -g status-fg white
+          '';
+        };
      };
-    };
  };
 }
@@ -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";
            };
          };
@@ -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;
-      };
-    };
-  };
-}
@@ -7,7 +7,6 @@
        users.users.${user.userName} = {
          extraGroups = [
            "wheel"
-            "libvirtd"
            "networkmanager"
          ];
        };
@@ -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];
-    };
-  };
-}
@@ -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";
Author	SHA1	Message	Date
doloro	d10b195c7e	meow	2026-04-30 11:43:18 +01:00
doloro	119148c764	swapped out flake	2026-04-30 11:35:18 +01:00