hfjsakhf

Flake lock file updates:

• Updated input 'caelestia':
    'github:caelestia-dots/shell/e183599ce9e2c8d30a14631d53eb9947220c0812?narHash=sha256-ctRw4pVgx0IYKfA2hy90Ku37pnVX2T4q57UWp%2Bl69fs%3D' (2026-03-08)
  → 'github:caelestia-dots/shell/d97ba8a9c08bc931261766b1070bce610e7cb22e?narHash=sha256-ajjfsBnYR54VHhh/haYuPqBOyvgerlvYK6kZvmt2GRw%3D' (2026-03-12)
• Updated input 'caelestia-cli':
    'github:caelestia-dots/cli/8d2b737f15d85ecb306df183c4ca0f0026db4cec?narHash=sha256-B8MgxDWw6%2BBuCxUCbQPp1Mmy4ygsFzubXp14JD290AE%3D' (2026-03-08)
  → 'github:caelestia-dots/cli/c930bd26045f1f86faa4e19dd082aec5e1754a83?narHash=sha256-jYm0ejWPH2RkfehuPB/sLUGp8Nu0Sx9JhEYThctWbwo%3D' (2026-03-09)
• Updated input 'caelestia-cli/caelestia-shell':
    'github:caelestia-dots/shell/658e09f89664978497a81f744a8f9186ee32c518?narHash=sha256-CCZKZAa7uaRBY5TgKG59fOpmDkBiGkY78mbcJ68A9Vw%3D' (2026-03-08)
  → 'github:caelestia-dots/shell/e183599ce9e2c8d30a14631d53eb9947220c0812?narHash=sha256-ctRw4pVgx0IYKfA2hy90Ku37pnVX2T4q57UWp%2Bl69fs%3D' (2026-03-08)
• Updated input 'dms':
    'github:AvengeMedia/DankMaterialShell/baa956c3a1e1ba63a26d3b7380bb66376c066575?narHash=sha256-C6aYjsAVpmrdAtmCN150%2B6xeOgV47T87CWq1MfQpong%3D' (2026-03-08)
  → 'github:AvengeMedia/DankMaterialShell/e86227f05fd3bf133c2cd73eecfa8c1cd6a00dc0?narHash=sha256-SL0b/9q8n0/VqhIeMkDPqLZ%2BUgQ5yAps3WpPu1%2BaZS8%3D' (2026-03-13)
• Updated input 'home-manager':
    'github:nix-community/home-manager/5be5d8245cbc7bc0c09fbb5f38f23f223c543f85?narHash=sha256-wEEmvfqJcl9J0wyMgMrj1TixOgInBW/6tLPhWGoZE3s%3D' (2026-03-08)
  → 'github:nix-community/home-manager/be0c641a6a5564caa33982faa1fe2c60d92131c7?narHash=sha256-FFMc1uAwy2GYasd0rdNDVxKyAgzuoJH2M%2BGglBQbqf0%3D' (2026-03-13)
• Updated input 'hyprland':
    'github:hyprwm/Hyprland/a4ecae91600d7e8ceb31610176d6b40cb816711b?narHash=sha256-lI361%2BKhTUerHMYJOaDzVhIikAX1PNcZMNY1WEx/%2Bdc%3D' (2026-03-07)
  → 'github:hyprwm/Hyprland/e8684034525829d58054c32da914d1713398fbb8?narHash=sha256-BrDGYt2w2tSkCvjMtgcVGIAp3FWsV5Ycl4ongLZ/fLk%3D' (2026-03-12)
• Updated input 'hyprland-hyprsplit':
    'github:Duckonaut/split-monitor-workspaces/7f15447980ba2e6e3c57ca268ab556eb70ef562e?narHash=sha256-7F8iKe7gwAGgpdaFrSZGRHz1I0hs47%2BWk0ghKEUL%2BQ4%3D' (2026-03-04)
  → 'github:Duckonaut/split-monitor-workspaces/34c266b732d8a063213098dc88369ac88b95dfa1?narHash=sha256-9YZntjxs/M51VEIvg/vO76GMi9FF/gNYu5h9bXPGnXw%3D' (2026-03-12)
• Updated input 'jovian':
    'github:Jovian-Experiments/Jovian-NixOS/d4eb38b82303760a5cbc0a8d7faf47d735ece5ef?narHash=sha256-wKzFqaZEMY9u7aWYTLDXbfiIQgW8qs//CjsP90rWK3I%3D' (2026-03-06)
  → 'github:Jovian-Experiments/Jovian-NixOS/8347eae3a900c26b8223ee98697f30f4e88dc226?narHash=sha256-6GDKki2AIkWgnnTGA1enQB3I1mI6rdPe4rrXafmmIiY%3D' (2026-03-13)
• Updated input 'niri':
    'github:sodiboo/niri-flake/3fc5b3670ef77356173ca5f1fa5015e01204bc33?narHash=sha256-nl1U1E9Kk9ZmxWdqcwBuFaljxknbrwq8/bY%2ButQSajk%3D' (2026-03-07)
  → 'github:sodiboo/niri-flake/adc63b19724247f947385381481effd225a6e2fc?narHash=sha256-0RVjh9h0sgPHngxEs/Wd2/xdGsgKgZWjxFu5JsX3ASw%3D' (2026-03-13)
• Updated input 'niri/niri-unstable':
    'github:YaLTeR/niri/8f75d171b6017ed34043b1255ec4ffc374bf6ab0?narHash=sha256-T1igKylw0ZX8%2Byws4dWbkrSc%2BhZ1bmsM%2BTjs4lxMYgo%3D' (2026-03-07)
  → 'github:YaLTeR/niri/b07bde3ee82dd73115e6b949e4f3f63695da35ea?narHash=sha256-3bwx4WqCB06yfQIGB%2BOgIckOkEDyKxiTD5pOo4Xz2rI%3D' (2026-03-10)
• Updated input 'niri/nixpkgs':
    'github:NixOS/nixpkgs/aca4d95fce4914b3892661bcb80b8087293536c6?narHash=sha256-E1bxHxNKfDoQUuvriG71%2Bf%2Bs/NT0qWkImXsYZNFFfCs%3D' (2026-03-06)
  → 'github:NixOS/nixpkgs/fe416aaedd397cacb33a610b33d60ff2b431b127?narHash=sha256-b/GV2ysM8mKHhinse2wz%2BuP37epUrSE%2BsAKXy/xvBY4%3D' (2026-03-12)
• Updated input 'niri/nixpkgs-stable':
    'github:NixOS/nixpkgs/71caefce12ba78d84fe618cf61644dce01cf3a96?narHash=sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw%3D' (2026-03-06)
  → 'github:NixOS/nixpkgs/0590cd39f728e129122770c029970378a79d076a?narHash=sha256-BHoB/XpbqoZkVYZCfXJXfkR%2BGXFqwb/4zbWnOr2cRcU%3D' (2026-03-11)
• Updated input 'nixcord':
    'github:kaylorben/nixcord/fc63af2dbc92cdcfeb6c650d986280057b0f135c?narHash=sha256-%2BMUN%2B5lOvWS6T4pvIZBGL4AKJkflLXGgVRYTlNeZEiE%3D' (2026-03-07)
  → 'github:kaylorben/nixcord/385319687272381cfa306a4bbf8c0b958ad065f7?narHash=sha256-UU3Xgx/Obut7UXxaUTvSpMLRaiILke58YxVi3uwIabo%3D' (2026-03-13)
• Added input 'nixcord/nixpkgs-nixcord':
    'github:NixOS/nixpkgs/0590cd39f728e129122770c029970378a79d076a?narHash=sha256-BHoB/XpbqoZkVYZCfXJXfkR%2BGXFqwb/4zbWnOr2cRcU%3D' (2026-03-11)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/aca4d95fce4914b3892661bcb80b8087293536c6?narHash=sha256-E1bxHxNKfDoQUuvriG71%2Bf%2Bs/NT0qWkImXsYZNFFfCs%3D' (2026-03-06)
  → 'github:nixos/nixpkgs/fe416aaedd397cacb33a610b33d60ff2b431b127?narHash=sha256-b/GV2ysM8mKHhinse2wz%2BuP37epUrSE%2BsAKXy/xvBY4%3D' (2026-03-12)
• Updated input 'quickshell':
    'git+https://git.outfoxxed.me/outfoxxed/quickshell?ref=refs/heads/master&rev=15a84097653593dd15fad59a56befc2b7bdc270d' (2026-03-07)
  → 'git+https://git.outfoxxed.me/outfoxxed/quickshell?ref=refs/heads/master&rev=4b77936c8019e0f51e0e62414c6de3556d5f8870' (2026-03-13)
• Updated input 'zen-browser':
    'github:0xc000022070/zen-browser-flake/3a6a5ca7fb48cc8fd8183386506a06579d1d79dc?narHash=sha256-Fv14NttjL/7xfi6eVwrSEBAyBvDjI00RLiRNqA5apcw%3D' (2026-03-08)
  → 'github:0xc000022070/zen-browser-flake/9346698c4562819f61b4e5097151ec0b17729fab?narHash=sha256-L1yMYmFffHfZNP%2BhKJGRBmrFKkn/VDhu7jEbVftBQuM%3D' (2026-03-12)

CLAUDE.md

@@ -60,7 +60,7 @@ assets/Wallpapers/     # Wallpaper images
 
 ### Window Manager Selection
 
-Set in `flake.nix` via `window_manager` variable (options: `"hyprland"`, `"river"`, `"niri"`, `"all"`). Currently set to `"hyprland"`. This variable is passed to modules for conditional WM configuration.
+Set in `flake.nix` via `window_manager` variable (options: `"hyprland"`, `"niri"`, `"all"`). Currently set to `"hyprland"`. This variable is passed to modules for conditional WM configuration.
 
 ### Theming
 

configuration.nix

@@ -56,9 +56,18 @@ in
     ];
     build-dir = "/nix/var/nix/builds";
     auto-optimise-store = true;
-    substituters = ["https://hyprland.cachix.org"];
+    substituters = [
-    trusted-substituters = ["https://hyprland.cachix.org"];
+      "https://hyprland.cachix.org"
-    trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
+      "https://vicinae.cachix.org"
+    ];
+    trusted-substituters = [
+      "https://hyprland.cachix.org"
+      "https://vicinae.cachix.org"
+    ];
+    trusted-public-keys = [
+      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc="
+    ];
   };
 
   # ─── Users ──────────────────────────────────────────────────────────────────
@@ -132,7 +141,7 @@ in
       # AMD_VULKAN_ICD = "RADV";
       # VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";
       # XDG_CURRENT_DESKTOP = "hyprland";
-      #QT_QPA_PLATFORMTHEME = "gtk3";
+      QT_QPA_PLATFORMTHEME = "qt6ct";
       #QT_QPA_PLATFORMTHEME_QT6 = "gtk3";
     };
 
@@ -152,6 +161,18 @@ in
   # ─── Decky ──────────────────────────────────────────────────────────────────
   nixpkgs.overlays = [
     inputs.jovian.overlays.default
+    #(final: prev: {
+    #  ollama-vulkan = prev.ollama-vulkan.overrideAttrs (old: {
+    #    version = "0.17.5";
+    #    src = prev.fetchFromGitHub {
+    #      owner = "ollama";
+    #      repo = "ollama";
+    #      tag = "v0.17.5";
+    #      hash = "sha256-MPcLs9O7GZoPLnpGq3LQU13j6Nhhb4InoeXLts6yncU=";
+    #    };
+    #    vendorHash = "sha256-Lc1Ktdqtv2VhJQssk8K1UOimeEjVNvDWePE9WkamCos=";
+    #  });
+    #})
   ];
   jovian.decky-loader = {
     enable = true;

dots/dankMeterialShell.nix

@@ -14,7 +14,7 @@
   programs.dank-material-shell = {
     enable = true;
     systemd = {
-      enable = true; # if you prefer starting from your compositor
+      enable = true; 
     };
 
     #settings = {

dots/doom/config.el

@@ -32,8 +32,10 @@
 ;; There are two ways to load a theme. Both assume the theme is installed and
 ;; available. You can either set `doom-theme' or manually load a theme with the
 ;; `load-theme' function. This is the default:
-(setq doom-theme 'doom-one)
+(add-to-list 'custom-theme-load-path
+             (expand-file-name "~/.config/emacs/themes"))
 
+(setq doom-theme 'dank-emacs)
 ;; This determines the style of line numbers in effect. If set to `nil', line
 ;; numbers are disabled. For relative line numbers, set this to `relative'.
 (setq display-line-numbers-type t)
@@ -42,7 +44,6 @@
 ;; change `org-directory'. It must be set before org loads!
 (setq org-directory "~/org/")
 
-(require 'direnv)
 
 
 ;; Whenever you reconfigure a package, make sure to wrap your config in an
@@ -76,3 +77,6 @@
 ;;
 ;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
 ;; they are implemented.
+
+(after! lsp-mode
+  (setq lsp-nix-nil-auto-archive t))

dots/hyprland.nix

@@ -11,7 +11,6 @@ let
   isLaptop = systemName == "laptop";
   isPc = systemName == "pc";
 
-  hypr-package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
   hypr-portal =
     inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
   hypr-split =
@@ -21,7 +20,7 @@ let
   terminal = "footclient";
   fileManager = "thunar";
   #runner = "${lib.getExe caelestia-cli} shell drawers toggle launcher";
-  runner = "vicinae toggle";
+  runner = "dms ipc call spotlight toggle";
   # runner     = "anyrun";
   browser = "firefox";
   editor = "emacsclient -c";
@@ -29,7 +28,7 @@ in
 {
   wayland.windowManager.hyprland = {
     enable = window_manager == "hyprland" || window_manager == "all";
-    package = hypr-package;
+    package = null; # Use the system package from programs.hyprland to avoid duplicate sessions
     portalPackage = hypr-portal;
     plugins = [
       #pkgs.hyprlandPlugins.hyprsplit
@@ -41,52 +40,9 @@ in
       # ─── Monitors ────────────────────────────────────────────────────────────────
       source = [
         "./dms/outputs.conf"
-        #"./dms/cursor.conf"
+        "./dms/cursor.conf"
         "./dms/colors.conf"
       ];
-
-      # See https://wiki.hyprland.org/Configuring/Monitors/
-      #monitor = lib.mkMerge [
-      #  #(lib.mkIf (systemName == "laptop") [ "eDP-1,1920x1080@59.99700,0x0,1" ])
-      #  (lib.mkIf (systemName == "pc") [
-      #    "HDMI-A-2, disable"
-      #  ])
-      #];
-
-      #monitorv2 =
-      #  [ ]
-      #  ++ lib.optional (systemName == "laptop") {
-      #    output = "eDP-1";
-      #    mode = "1920x1080@59.99700";
-      #    scale = 1;
-      #    position = "0x0";
-      #  }
-      #  ++ lib.optional (systemName == "pc") {
-      #    output = "DP-1";
-      #    mode = "2560x1440@239.97";
-      #    position = "2560x0"; # "1440x750";  # Corrected from 2569x0 for seamless alignment
-      #    scale = 1;
-      #    #supports_wide_color = 1;
-      #    bitdepth = 10;
-      #    cm = "wide";
-      #    supports_hdr = true;
-      #    supports_wide_color = true;
-      #    sdr_min_luminance = 0; # For true black on OLED
-      #    sdr_max_luminance = 275; # Matches typical SDR brightness
-      #    min_luminance = 0;
-      #    max_luminance = 1000; # HDR peak
-      #    max_avg_luminance = 400; # Average frame luminance
-      #    sdrbrightness = 1.2; # Slight boost to avoid washed out look
-      #    sdrsaturation = 1.0;
-      #  }
-      #  ++ lib.optional (systemName == "pc") {
-      #    output = "DP-2";
-      #    mode = "2560x1440@144";
-      #    scale = 1;
-      #    position = "0x0";
-      #    transform = 0;
-      #  };
-
       # ─── Autostart ───────────────────────────────────────────────────────────────
 
       # Autostart necessary processes (like notifications daemons, status bars, etc.)
@@ -94,23 +50,12 @@ in
       exec-once = [
         # "waybar"
         # "quickshell"
-        #"${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
+        "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
-        "${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1"
-        "${pkgs.kdePackages.kwallet-pam}/libexec/pam_kwallet_init"
         "fcitx5 -d"
         "foot -s"
         "systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS WAYLAND_DISPLAY XDG_SESSION_TYPE XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP QT_QPA_PLATFORMTHEME GTK_THEME"
         "dbus-update-activation-environment --systemd --all"
-      ]
-      ++ lib.optionals (config.home.username == "work") [
-        "thunderbird"
-        "sleep 10 && emacsclient -c --frame-parameters='((name . \"work\"))' $HOME/Documents/work/README.org"
       ];
-      # ++ lib.optional (systemName == "laptop")
-      #   "swaybg -o eDP-1 -i ${../assets/Wallpapers/138.png}"
-      #
-      # ++ lib.optional (systemName == "pc")
-      #   "swaybg -o HDMI-A-1 -i ${../assets/Wallpapers/138.png} -o DP-1 -i ${../assets/Wallpapers/138.png}";
 
       # ─── Plugins ─────────────────────────────────────────────────────────────────
 
@@ -288,6 +233,7 @@ in
         # ",Print, exec, grim -g \"$(slurp)\" - | swappy -f -"
         ",Print, exec, dms screenshot"
         "${mod}, f1, exec, dms ipc call keybinds toggle hyprland"
+        "${mod}, BACKSLASH, exec, dms ipc call notepad toggle"
 
         # Dwindle
         "${mod}, P, pseudo, "
@@ -368,8 +314,8 @@ in
         # ",XF86MonBrightnessDown, exec, light -U 5"
 
         # Brightness
-        ",XF86MonBrightnessUp, global, dms ipc call brightness increment 5"
+        ",XF86MonBrightnessUp, exec, dms ipc call brightness increment 5  backlight:intel_backlight"
-        ",XF86MonBrightnessDown, global, dms ipc call brightness decrement 5"
+        ",XF86MonBrightnessDown, exec, dms ipc call brightness decrement 5  backlight:intel_backlight"
       ];
 
       bindl = [
@@ -403,9 +349,6 @@ in
 
         # Fix some dragging issues with XWayland
         "match:class ^$, match:title ^$, match:xwayland 1, match:float 1, match:fullscreen 0, match:pin 0, no_focus on"
-
-        "match:class thunderbird, workspace special:magic silent"
-        "match:class emacs, match:title work, workspace special:magic silent"
       ];
     };
   };

dots/niri.nix

@@ -1,461 +1,349 @@
 {
-  config,
   lib,
   pkgs,
+  window_manager,
+  systemName,
   ...
 }:
 
+let
+  isLaptop = systemName == "laptop";
+  isPc = systemName == "pc";
+
+  # Match hyprland definitions
+  mod = "Alt";
+  terminal = "footclient";
+  fileManager = "thunar";
+  runner = "dms ipc call spotlight toggle";
+  browser = "firefox";
+  editor = "emacsclient -c";
+in
 {
-  programs = {
+  programs.niri = {
-    niri = {
+    enable = window_manager == "niri" || window_manager == "all";
-      settings = {
-        input = {
-          keyboard = {
-            xkb = {
-              # You can set rules, model, layout, variant and options.
-              # For more information, see xkeyboard-config(7).
 
-              # For example:
+    settings = {
-              # layout "us,ru"
+      # Input configuration (aligned with hyprland)
-              # options "grp:win_space_toggle,compose:ralt,ctrl:nocaps"
+      input = {
-            };
+        keyboard = {
-
+          xkb.layout = lib.mkMerge [
-            # Enable numlock on startup, omitting this setting disables it.
+            (lib.mkIf isLaptop "ie")
-            numlock = true;
+            (lib.mkIf isPc "us")
-          };
-
-          # Next sections include libinput settings.
-          # Omitting settings disables them, or leaves them at their default values.
-          # All commented-out settings here are examples, not defaults.
-          touchpad = {
-            # off
-            tap = true;
-            # dwt
-            # dwtp
-            # drag false
-            # drag-lock
-            natural-scroll = true;
-            # accel-speed 0.2
-            # accel-profile "flat"
-            # scroll-method "two-finger"
-            # disabled-on-external-mouse
-          };
-
-          mouse = {
-            # off
-            # natural-scroll
-            # accel-speed 0.2
-            # accel-profile "flat"
-            # scroll-method "no-scroll"
-          };
-
-          trackpoint = {
-            # off
-            # natural-scroll
-            # accel-speed 0.2
-            # accel-profile "flat"
-            # scroll-method "on-button-down"
-            # scroll-button 273
-            # scroll-button-lock
-            # middle-emulation
-          };
-
-          # Uncomment this to make the mouse warp to the center of newly focused windows.
-          # warp-mouse-to-focus
-
-          # Focus windows and outputs automatically when moving the mouse into them.
-          # Setting max-scroll-amount="0%" makes it work only on windows already fully on screen.
-          # focus-follows-mouse max-scroll-amount="0%"
-        };
-        # You can configure outputs by their name, which you can find
-        # by running `niri msg outputs` while inside a niri instance.
-        # The built-in laptop monitor is usually called "eDP-1".
-        # Find more information on the wiki:
-        # https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs
-        # Remember to uncomment the node by removing "/-"!
-        outputs."eDP-1" = {
-          # Uncomment this line to disable this output.
-          # off
-
-          # Resolution and, optionally, refresh rate of the output.
-          # The format is "<width>x<height>" or "<width>x<height>@<refresh rate>".
-          # If the refresh rate is omitted, niri will pick the highest refresh rate
-          # for the resolution.
-          # If the mode is omitted altogether or is invalid, niri will pick one automatically.
-          # Run `niri msg outputs` while inside a niri instance to list all outputs and their modes.
-          mode = {
-            width = 1920;
-            height = 1080;
-            refresh = 60.00;
-          };
-
-          # You can use integer or fractional scale, for example use 1.5 for 150% scale.
-          scale = 1.0;
-
-          # Transform allows to rotate the output counter-clockwise, valid values are:
-          # normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
-          # transform = "normal";
-
-          # Position of the output in the global coordinate space.
-          # This affects directional monitor actions like "focus-monitor-left", and cursor movement.
-          # The cursor can only move between directly adjacent outputs.
-          # Output scale and rotation has to be taken into account for positioning:
-          # outputs are sized in logical, or scaled, pixels.
-          # For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080,
-          # so to put another output directly adjacent to it on the right, set its x to 1920.
-          # If the position is unset or results in an overlap, the output is instead placed
-          # automatically.
-          position = {
-            x = 1280;
-            y = 0;
-          };
-        };
-
-        # Settings that influence how windows are positioned and sized.
-        # Find more information on the wiki:
-        # https://github.com/YaLTeR/niri/wiki/Configuration:-Layout
-        layout = {
-          # Set gaps around windows in logical pixels.
-          gaps = 16;
-
-          # When to center a column when changing focus, options are:
-          # - "never", default behavior, focusing an off-screen column will keep at the left
-          #   or right edge of the screen.
-          # - "always", the focused column will always be centered.
-          # - "on-overflow", focusing a column will center it if it doesn't fit
-          #   together with the previously focused column.
-          center-focused-column = "never";
-
-          # You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between.
-          preset-column-widths = [
-            # Proportion sets the width as a fraction of the output width, taking gaps into account.
-            # For example, you can perfectly fit four windows sized "proportion 0.25" on an output.
-            # The default preset widths are 1/3, 1/2 and 2/3 of the output.
-            { proportion = 0.33333; }
-            { proportion = 0.5; }
-            { proportion = 0.66667; }
-
-            # Fixed sets the width in logical pixels exactly.
-            # fixed 1920
           ];
-
+          repeat-rate = 40;
-          # You can also customize the heights that "switch-preset-window-height" (Mod+Shift+R) toggles between.
+          repeat-delay = 500;
-          # preset-window-heights { }
-
-          # You can change the default width of the new windows.
-          default-column-width = {
-            proportion = 0.5;
-          };
-          # If you leave the brackets empty, the windows themselves will decide their initial width.
-          # default-column-width {}
-
-          # By default focus ring and border are rendered as a solid background rectangle
-          # behind windows. That is, they will show up through semitransparent windows.
-          # This is because windows using client-side decorations can have an arbitrary shape.
-          #
-          # If you don't like that, you should uncomment `prefer-no-csd` below.
-          # Niri will draw focus ring and border *around* windows that agree to omit their
-          # client-side decorations.
-          #
-          # Alternatively, you can override it with a window rule called
-          # `draw-border-with-background`.
-
-          # You can change how the focus ring looks.
-          focus-ring = {
-            # Uncomment this line to disable the focus ring.
-            # off
-
-            # How many logical pixels the ring extends out from the windows.
-            width = 4;
-
-            # Colors can be set in a variety of ways:
-            # - CSS named colors: "red"
-            # - RGB hex: "#rgb", "#rgba", "#rrggbb", "#rrggbbaa"
-            # - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others.
-
-            # Color of the ring on the active monitor.
-            active = {
-              color = "#7fc8ff";
-            };
-
-            # Color of the ring on inactive monitors.
-            #
-            # The focus ring only draws around the active window, so the only place
-            # where you can see its inactive-color is on other monitors.
-            inactive = {
-              color = "#505050";
-            };
-
-            # You can also use gradients. They take precedence over solid colors.
-            # Gradients are rendered the same as CSS linear-gradient(angle, from, to).
-            # The angle is the same as in linear-gradient, and is optional,
-            # defaulting to 180 (top-to-bottom gradient).
-            # You can use any CSS linear-gradient tool on the web to set these up.
-            # Changing the color space is also supported, check the wiki for more info.
-            #
-            # active-gradient from="#80c8ff" to="#c7ff7f" angle=45
-
-            # You can also color the gradient relative to the entire view
-            # of the workspace, rather than relative to just the window itself.
-            # To do that, set relative-to="workspace-view".
-            #
-            # inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
-          };
-
-          # You can also add a border. It's similar to the focus ring, but always visible.
-          border = {
-            # The settings are the same as for the focus ring.
-            # If you enable the border, you probably want to disable the focus ring.
-            enable = true;
-
-            width = 4;
-            active = {
-              color = "#ffc87f";
-            };
-            inactive = {
-              color = "#505050";
-            };
-
-            # Color of the border around windows that request your attention.
-            urgent = {
-              color = "#9b0000";
-            };
-
-            # Gradients can use a few different interpolation color spaces.
-            # For example, this is a pastel rainbow gradient via in="oklch longer hue".
-            #
-            # active-gradient from="#e5989b" to="#ffb4a2" angle=45 relative-to="workspace-view" in="oklch longer hue"
-
-            # inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
-          };
-
-          # You can enable drop shadows for windows.
-          shadow = {
-            # Uncomment the next line to enable shadows.
-            # on
-
-            # By default, the shadow draws only around its window, and not behind it.
-            # Uncomment this setting to make the shadow draw behind its window.
-            #
-            # Note that niri has no way of knowing about the CSD window corner
-            # radius. It has to assume that windows have square corners, leading to
-            # shadow artifacts inside the CSD rounded corners. This setting fixes
-            # those artifacts.
-            #
-            # However, instead you may want to set prefer-no-csd and/or
-            # geometry-corner-radius. Then, niri will know the corner radius and
-            # draw the shadow correctly, without having to draw it behind the
-            # window. These will also remove client-side shadows if the window
-            # draws any.
-            #
-            # draw-behind-window true
-
-            # You can change how shadows look. The values below are in logical
-            # pixels and match the CSS box-shadow properties.
-
-            # Softness controls the shadow blur radius.
-            softness = 30;
-
-            # Spread expands the shadow.
-            spread = 5;
-
-            # Offset moves the shadow relative to the window.
-            offset = {
-              x = 0;
-              y = 5;
-            };
-
-            # You can also change the shadow color and opacity.
-            color = "#0007";
-          };
-
-          # Struts shrink the area occupied by windows, similarly to layer-shell panels.
-          # You can think of them as a kind of outer gaps. They are set in logical pixels.
-          # Left and right struts will cause the next window to the side to always be visible.
-          # Top and bottom struts will simply add outer gaps in addition to the area occupied by
-          # layer-shell panels and regular gaps.
-          struts = {
-            # left 64
-            # right 64
-            # top 64
-            # bottom 64
-          };
         };
-        # Add lines like this to spawn processes at startup.
-        # Note that running niri as a session supports xdg-desktop-autostart,
-        # which may be more convenient to use.
-        # See the binds section below for more spawn examples.
-        spawn-at-startup = [
-          {
-            command = [ "xwayland-satellite" ];
-          }
-          {
-            command = [ "foot -s" ];
-          }
-        ];
-        # Uncomment this line to ask the clients to omit their client-side decorations if possible.
-        # If the client will specifically ask for CSD, the request will be honored.
-        # Additionally, clients will be informed that they are tiled, removing some client-side rounded corners.
-        # This option will also fix border/focus ring drawing behind some semitransparent windows.
-        # After enabling or disabling this, you need to restart the apps for this to take effect.
-        # prefer-no-csd
-        # You can change the path where screenshots are saved.
-        # A ~ at the front will be expanded to the home directory.
-        # The path is formatted with strftime(3) to give you the screenshot date and time.
-        #sreenshot-path = "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png";
-        # You can also set this to null to disable saving screenshots to disk.
-        # screenshot-path null
-        #/ Animation settings.
-        # The wiki explains how to configure individual animations:
-        # https://github.com/YaLTeR/niri/wiki/Configuration:-Animations
-        animations = {
-          # Uncomment to turn off all animations.
-          # off
 
-          # Slow down all animations by this factor. Values below 1 speed them up instead.
+        touchpad = {
-          # slowdown 3.0
+          tap = true;
+          natural-scroll = false; # Match hyprland
+          dwt = true;
         };
-        # Window rules let you adjust behavior for individual windows.
+
-        # Find more information on the wiki:
+        mouse = {
-        # https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules
+          accel-profile = "flat";
-        #/ Work around WezTerm's initial configure bug
-        # by setting an empty default-column-width.
-        window-rules = [
-          # This regular expression is intentionally made as specific as possible,
-          # since this is the default config, and we want no false positives.
-          # You can get away with just app-id="wezterm" if you want.
-          #match = { app-id=#"^org\.wezfurlong\.wezterm$"\#};
-          #default-column-width = {}
-        ];
-        environment = {
-          DISPLAY = ":0";
         };
-        binds = with config.lib.niri.actions; {
-          # App launchers
-          "Alt+Return".action = spawn "footclient";
-          "Alt+D".action = spawn "anyrun";
-          "Super+Alt+L".action = spawn "${lib.getExe pkgs.hyprlock}";
 
-          # Audio control
+        focus-follows-mouse = {
-          "XF86AudioRaiseVolume".action = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+";
+          enable = true;
-          "XF86AudioLowerVolume".action = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-";
+          max-scroll-amount = "0%"; # Don't scroll/center on hover, only on click
-          "XF86AudioMute".action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle";
-          "XF86AudioMicMute".action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle";
-
-          # Brightness control
-          "XF86MonBrightnessUp".action = spawn "brightnessctl" "--class=backlight" "set" "+10%";
-          "XF86MonBrightnessDown".action = spawn "brightnessctl" "--class=backlight" "set" "10%-";
-
-          # Overview and quitting
-          "Alt+O".action = toggle-overview;
-          "Alt+Q".action = close-window;
-          "Alt+Shift+E".action = quit;
-          "Alt+Ctrl+Shift+E".action = quit { skip-confirmation = true; };
-
-          # Navigation
-          "Alt+H".action = focus-column-left;
-          "Alt+J".action = focus-window-down;
-          "Alt+K".action = focus-window-up;
-          "Alt+L".action = focus-column-right;
-
-          "Alt+Ctrl+H".action = move-column-left;
-          "Alt+Ctrl+J".action = move-window-down;
-          "Alt+Ctrl+K".action = move-window-up;
-          "Alt+Ctrl+L".action = move-column-right;
-
-          "Alt+Shift+H".action = focus-monitor-left;
-          "Alt+Shift+J".action = focus-monitor-down;
-          "Alt+Shift+K".action = focus-monitor-up;
-          "Alt+Shift+L".action = focus-monitor-right;
-
-          "Alt+Shift+Ctrl+H".action = move-column-to-monitor-left;
-          "Alt+Shift+Ctrl+J".action = move-column-to-monitor-down;
-          "Alt+Shift+Ctrl+K".action = move-column-to-monitor-up;
-          "Alt+Shift+Ctrl+L".action = move-column-to-monitor-right;
-
-          "Alt+U".action = focus-workspace-down;
-          "Alt+I".action = focus-workspace-up;
-          "Alt+Ctrl+U".action = move-column-to-workspace-down;
-          "Alt+Ctrl+I".action = move-column-to-workspace-up;
-          "Alt+Shift+U".action = move-workspace-down;
-          "Alt+Shift+I".action = move-workspace-up;
-
-          # Scroll bindings
-          "Alt+WheelScrollDown".action = focus-workspace-down;
-          "Alt+WheelScrollUp".action = focus-workspace-up;
-          "Alt+Ctrl+WheelScrollDown".action = move-column-to-workspace-down;
-          "Alt+Ctrl+WheelScrollUp".action = move-column-to-workspace-up;
-
-          "Alt+WheelScrollLeft".action = focus-column-left;
-          "Alt+WheelScrollRight".action = focus-column-right;
-          "Alt+Ctrl+WheelScrollLeft".action = move-column-left;
-          "Alt+Ctrl+WheelScrollRight".action = move-column-right;
-
-          "Alt+Shift+WheelScrollUp".action = focus-column-left;
-          "Alt+Shift+WheelScrollDown".action = focus-column-right;
-          "Alt+Ctrl+Shift+WheelScrollUp".action = move-column-left;
-          "Alt+Ctrl+Shift+WheelScrollDown".action = move-column-right;
-
-          # Workspace numbers (1–9)
-          "Alt+1".action = focus-workspace 1;
-          "Alt+2".action = focus-workspace 2;
-          "Alt+3".action = focus-workspace 3;
-          "Alt+4".action = focus-workspace 4;
-          "Alt+5".action = focus-workspace 5;
-          "Alt+6".action = focus-workspace 6;
-          "Alt+7".action = focus-workspace 7;
-          "Alt+8".action = focus-workspace 8;
-          "Alt+9".action = focus-workspace 9;
-
-          "Alt+Ctrl+1".action = move-column-to-index 1;
-          "Alt+Ctrl+2".action = move-column-to-index 2;
-          "Alt+Ctrl+3".action = move-column-to-index 3;
-          "Alt+Ctrl+4".action = move-column-to-index 4;
-          "Alt+Ctrl+5".action = move-column-to-index 5;
-          "Alt+Ctrl+6".action = move-column-to-index 6;
-          "Alt+Ctrl+7".action = move-column-to-index 7;
-          "Alt+Ctrl+8".action = move-column-to-index 8;
-          "Alt+Ctrl+9".action = move-column-to-index 9;
-
-          # Window & column management
-          "Alt+Comma".action = consume-window-into-column;
-          "Alt+Period".action = expel-window-from-column;
-          "Alt+BracketLeft".action = consume-or-expel-window-left;
-          "Alt+BracketRight".action = consume-or-expel-window-right;
-
-          "Alt+F".action = maximize-column;
-          "Alt+Shift+F".action = fullscreen-window;
-          "Alt+Ctrl+F".action = expand-column-to-available-width;
-
-          "Alt+C".action = center-column;
-          "Alt+Ctrl+C".action = center-visible-columns;
-
-          "Alt+Minus".action = set-column-width "-10%";
-          "Alt+Plus".action = set-column-width "+10%";
-          "Alt+Shift+Minus".action = set-window-height "-10%";
-          "Alt+Shift+Plus".action = set-window-height "+10%";
-
-          "Alt+R".action = switch-preset-column-width;
-          "Alt+Shift+R".action = switch-preset-window-height;
-          "Alt+Ctrl+R".action = reset-window-height;
-
-          "Alt+V".action = toggle-window-floating;
-          "Alt+Shift+V".action = switch-focus-between-floating-and-tiling;
-
-          "Alt+W".action = toggle-column-tabbed-display;
-
-          # Screenshots
-          #"Print".action = screenshot { show-pointer = false; };
-          "Ctrl+Print".action.screenshot-screen = {
-            write-to-disk = false;
-          };
-          #"Alt+Print".action = screenshot-window;
-
-          # Other
-          "Alt+Escape".action = toggle-keyboard-shortcuts-inhibit;
-          "Alt+Shift+P".action = power-off-monitors;
         };
       };
+
+      # Layout settings (aligned with hyprland gaps)
+      layout = {
+        gaps = 10; # hyprland: gaps_out = 10
+        center-focused-column = "always";
+
+        preset-column-widths = [
+          { proportion = 1.0 / 3.0; }
+          { proportion = 1.0 / 2.0; }
+          { proportion = 2.0 / 3.0; }
+          { proportion = 0.9; }
+        ];
+
+        default-column-width = {
+          proportion = 0.95;
+        };
+
+        focus-ring = {
+          enable = true; # Hyprland doesn't have separate focus ring
+        };
+
+        border = {
+          enable = true;
+        };
+
+        shadow = {
+          enable = true;
+          softness = 30;
+          spread = 5;
+          offset = {
+            x = 0;
+            y = 5;
+          };
+          color = "#00000070";
+        };
+      };
+
+      # Startup programs (aligned with hyprland exec-once)
+      spawn-at-startup = [
+        { command = [ "xwayland-satellite" ]; }
+        {
+          command = [
+            "fcitx5"
+            "-d"
+          ];
+        }
+        {
+          command = [
+            "foot"
+            "-s"
+          ];
+        }
+        {
+          command = [
+            "sh"
+            "-c"
+            "systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS WAYLAND_DISPLAY XDG_SESSION_TYPE XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP QT_QPA_PLATFORMTHEME GTK_THEME"
+          ];
+        }
+        {
+          command = [
+            "dbus-update-activation-environment"
+            "--systemd"
+            "--all"
+          ];
+        }
+      ];
+
+      # Prefer server-side decorations
+      prefer-no-csd = true;
+
+      # Screenshot path
+      screenshot-path = "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png";
+
+      # Environment variables
+      environment = {
+        DISPLAY = ":0";
+      };
+
+      # Hotkey overlay settings
+      hotkey-overlay.skip-at-startup = true;
+
+      # Keybinds (aligned with hyprland)
+      binds = {
+        # App launchers (matching hyprland)
+        "${mod}+Return".action.spawn = [ terminal ];
+        "${mod}+B".action.spawn = [ browser ];
+        "${mod}+F".action.spawn = [ fileManager ];
+        "${mod}+D".action.spawn = [
+          "sh"
+          "-c"
+          runner
+        ];
+        "${mod}+E".action.spawn = [
+          "sh"
+          "-c"
+          editor
+        ];
+
+        # Audio control (using pamixer like hyprland)
+        "XF86AudioRaiseVolume".action.spawn = [
+          "pamixer"
+          "-i"
+          "5"
+        ];
+        "XF86AudioLowerVolume".action.spawn = [
+          "pamixer"
+          "-d"
+          "5"
+        ];
+        "XF86AudioMute".action.spawn = [
+          "pamixer"
+          "--toggle-mute"
+        ];
+        "XF86AudioMicMute".action.spawn = [
+          "wpctl"
+          "set-mute"
+          "@DEFAULT_AUDIO_SOURCE@"
+          "toggle"
+        ];
+
+        # Media controls (matching hyprland)
+        "XF86AudioNext".action.spawn = [
+          "playerctl"
+          "next"
+        ];
+        "XF86AudioPrev".action.spawn = [
+          "playerctl"
+          "previous"
+        ];
+        "XF86AudioPlay".action.spawn = [
+          "playerctl"
+          "play-pause"
+        ];
+        "XF86AudioPause".action.spawn = [
+          "playerctl"
+          "play-pause"
+        ];
+
+        # Brightness control
+        "XF86MonBrightnessUp".action.spawn = [
+          "sh"
+          "-c"
+          "dms ipc call brightness increment 5 backlight:intel_backlight"
+        ];
+        "XF86MonBrightnessDown".action.spawn = [
+          "sh"
+          "-c"
+          "dms ipc call brightness decrement 5 backlight:intel_backlight"
+        ];
+
+        # Window management (matching hyprland)
+        "${mod}+Q".action.close-window = { };
+        "${mod}+M".action.quit = { }; # Match hyprland exit
+        "${mod}+V".action.toggle-window-floating = { };
+        "${mod}+T".action.fullscreen-window = { }; # Match hyprland fullscreen
+
+        # Screenshots (using dms like hyprland)
+        "Print".action.spawn = [
+          "dms"
+          "screenshot"
+        ];
+        "${mod}+F1".action.spawn = [
+          "sh"
+          "-c"
+          "dms ipc call keybinds toggle niri"
+        ];
+        "${mod}+Backslash".action.spawn = [
+          "sh"
+          "-c"
+          "dms ipc call notepad toggle"
+        ];
+
+        # Focus navigation (vim-style, with workspace wraparound for j/k)
+        "${mod}+H".action.focus-column-or-monitor-left = { };
+        "${mod}+J".action.focus-window-or-workspace-down = { };
+        "${mod}+K".action.focus-window-or-workspace-up = { };
+        "${mod}+L".action.focus-column-or-monitor-right = { };
+
+        # Move windows (matching hyprland)
+        "${mod}+Shift+H".action.move-column-left = { };
+        "${mod}+Shift+J".action.move-window-down = { };
+        "${mod}+Shift+K".action.move-window-up = { };
+        "${mod}+Shift+L".action.move-column-right = { };
+
+        # Monitor focus
+        "${mod}+Ctrl+H".action.focus-monitor-left = { };
+        "${mod}+Ctrl+J".action.focus-monitor-down = { };
+        "${mod}+Ctrl+K".action.focus-monitor-up = { };
+        "${mod}+Ctrl+L".action.focus-monitor-right = { };
+
+        # Move to monitor
+        "${mod}+Ctrl+Shift+H".action.move-column-to-monitor-left = { };
+        "${mod}+Ctrl+Shift+J".action.move-column-to-monitor-down = { };
+        "${mod}+Ctrl+Shift+K".action.move-column-to-monitor-up = { };
+        "${mod}+Ctrl+Shift+L".action.move-column-to-monitor-right = { };
+
+        # Workspace numbers (matching hyprland)
+        "${mod}+1".action.focus-workspace = 1;
+        "${mod}+2".action.focus-workspace = 2;
+        "${mod}+3".action.focus-workspace = 3;
+        "${mod}+4".action.focus-workspace = 4;
+        "${mod}+5".action.focus-workspace = 5;
+        "${mod}+6".action.focus-workspace = 6;
+        "${mod}+7".action.focus-workspace = 7;
+        "${mod}+8".action.focus-workspace = 8;
+        "${mod}+9".action.focus-workspace = 9;
+        "${mod}+0".action.focus-workspace = 10;
+
+        "${mod}+Shift+1".action.move-column-to-workspace = 1;
+        "${mod}+Shift+2".action.move-column-to-workspace = 2;
+        "${mod}+Shift+3".action.move-column-to-workspace = 3;
+        "${mod}+Shift+4".action.move-column-to-workspace = 4;
+        "${mod}+Shift+5".action.move-column-to-workspace = 5;
+        "${mod}+Shift+6".action.move-column-to-workspace = 6;
+        "${mod}+Shift+7".action.move-column-to-workspace = 7;
+        "${mod}+Shift+8".action.move-column-to-workspace = 8;
+        "${mod}+Shift+9".action.move-column-to-workspace = 9;
+        "${mod}+Shift+0".action.move-column-to-workspace = 10;
+
+        # Scroll through workspaces (matching hyprland mouse scroll)
+        "${mod}+WheelScrollDown".action.focus-workspace-down = { };
+        "${mod}+WheelScrollUp".action.focus-workspace-up = { };
+
+        # Column management (niri-specific, kept similar)
+        "${mod}+Comma".action.consume-window-into-column = { };
+        "${mod}+Period".action.expel-window-from-column = { };
+        "${mod}+BracketLeft".action.consume-or-expel-window-left = { };
+        "${mod}+BracketRight".action.consume-or-expel-window-right = { };
+        "${mod}+Semicolon".action.focus-column-first = { }; # Similar to promote in master layout
+
+        # Window sizing
+        "${mod}+Minus".action.set-column-width = "-10%";
+        "${mod}+Equal".action.set-column-width = "+10%";
+        "${mod}+Shift+Minus".action.set-window-height = "-10%";
+        "${mod}+Shift+Equal".action.set-window-height = "+10%";
+
+        "${mod}+R".action.switch-preset-column-width = { };
+        "${mod}+Shift+R".action.switch-preset-window-height = { };
+        "${mod}+C".action.center-column = { };
+
+        # Floating
+        "${mod}+Shift+V".action.switch-focus-between-floating-and-tiling = { };
+
+        # Tabs
+        "${mod}+W".action.toggle-column-tabbed-display = { };
+
+        # Window overview (alt-tab replacement)
+        "${mod}+Tab".action.toggle-overview = { };
+
+        # Misc
+        "${mod}+Escape".action.toggle-keyboard-shortcuts-inhibit = { };
+        "${mod}+Shift+P".action.power-off-monitors = { };
+      };
+
+      # Window rules
+      window-rules = [
+        #{
+        #  matches = [
+        #    { app-id = "firefox"; }
+        #    { app-id = "thunar"; }
+        #    { app-id = "vesktop"; }
+        #  ];
+        #  default-column-width = {
+        #    proportion = 0.95;
+        #  };
+        #}
+        # Float file dialogs
+        {
+          matches = [
+            { title = "^Open File$"; }
+            { title = "^Save File$"; }
+          ];
+          open-floating = true;
+        }
+
+        {
+          matches = [ { app-id = "vesktop"; } ];
+          block-out-from = "screencast";
+        }
+      ];
     };
   };
+
+  # Redirect the generated config to a different file
+  xdg.configFile.niri-config.target = lib.mkForce "niri/generated.kdl";
+
+  # Create the main config that includes everything
+  xdg.configFile."niri/config.kdl".text = ''
+    include "generated.kdl"
+    include "dms/outputs.kdl"
+    include "dms/colors.kdl"
+    include "dms/layout.kdl"
+    include "dms/alttab.kdl"
+    include "dms/binds.kdl"
+    include "dms/cursor.kdl"
+  '';
 }

dots/nixcord.nix

@@ -18,6 +18,9 @@
       #useSystemVencord = false;
     };
     config = {
+      enabledThemes = [
+        "dank-discord.css"
+      ];
       plugins = {
         alwaysTrust = {
           enable = true;

dots/river.nix

@@ -1,250 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  window_manager,
-  systemName,
-  ...
-}:
-
-let
-  isLaptop = systemName == "laptop";
-  isPc = systemName == "pc";
-in
-{
-  wayland.windowManager.river = {
-    enable = window_manager == "river" || window_manager == "all";
-    xwayland.enable = true;
-    extraConfig = ''
-      #!/bin/sh
-      #
-      #
-      #systemctl --user import-environment
-      #
-      #
-      #eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
-      #export SSH_AUTH_SOCK
-      browser="zen"
-      file_manager="dolphin"
-      terminal="footclient"
-      drunner="anyrun"
-      editor="emacs"
-
-      riverctl input "pointer-2362-8197-ASUP1204:00_093A:2005_Touchpad" tap enabled
-      riverctl keyboard-layout -options "grp:ctrl_space_toggle" ${
-        if isLaptop
-        then "ie,us"
-        else "us"
-      }
-
-      #riverctl spawn 'export XDG_CURRENT_DESKTOP=river'
-      #riverctl spawn 'systemctl --user restart xdg-desktop-portal'
-      riverctl spawn 'dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP'
-      riverctl spawn 'swaybg ${
-        lib.optionalString isLaptop "-o eDP-1 -i ${../assets/Wallpapers/138.png}"
-      }${
-        lib.optionalString isPc "-o HDMI-A-1 -i ${../assets/Wallpapers/138.png} -o DP-1 -i ${../assets/Wallpapers/138.png}"
-      }'
-      #riverctl spawn '/home/mrfluffy/.config/script/mic-gain-fix.sh'
-      riverctl spawn 'waybar &'
-      #riverctl spawn '(hypridle &) && loginctl unlock-session'
-      #riverctl spawn '(sleep 10 && systemctl --user restart hypridle.service) &'
-      #riverctl spawn '/nix/store/$(ls -la /nix/store | grep "polkit-gnome" | grep "^d" | awk ""$0=$NF" | head -n 1)/libexec/polkit-gnome-authentication-agent-1'
-      riverctl spawn ' ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1'
-      riverctl spawn '/home/mrfluffy/.config/script/waylock.sh'
-      riverctl spawn 'fcitx5 -d'
-      riverctl spawn 'foot -s'
-      riverctl spawn '[ -n "$(whereis swaync | awk '{print $2}')" ] && swaync'
-      riverctl spawn 'nm-applet'
-      riverctl focus-follows-cursor normal
-      riverctl set-cursor-warp on-focus-change
-      #riverctl xcursor-theme oreo_spark_pink_cursors
-      riverctl spawn '${
-        lib.optionalString isLaptop "wlr-randr --output eDP-1 --mode 1920x1080@60"
-      }${
-        lib.optionalString isPc "wlr-randr --output DP-1 --mode 2560x1440@144 --pos 1920,0 --output HDMI-A-1 --mode 1920x1080@60 --pos 0,0"
-      }'
-
-      # This is the example configuration file for river.
-      #
-      # If you wish to edit this, you will probably want to copy it to
-      # $XDG_CONFIG_HOME/river/init or $HOME/.config/river/init first.
-      #
-      # See the river(1), riverctl(1), and rivertile(1) man pages for complete
-      # documentation.
-
-      # Note: the "Mod4" modifier is also known as Logo, GUI, Windows, Mod4, etc.
-      #
-      riverctl map normal Mod1+Shift+Control L spawn way-inhibitor
-
-      # Mod4+Shift+Return to start an instance of foot (https://codeberg.org/dnkl/foot)
-      riverctl map normal Mod1 Return spawn $terminal
-
-      # Mod4+D open wofi
-      riverctl map normal Mod1 D spawn $drunner
-
-      #Mod4+b open browser
-      riverctl map normal Mod1 B spawn $browser
-
-      #Mod1+F open file manager
-      riverctl map normal Mod1 F spawn $file_manager
-
-      #mod1+e open emacs
-      riverctl map normal Mod1 E spawn $editor
-
-      # Mod4+Q to close the focused view
-      riverctl map normal Mod1 Q close
-
-      # Mod4+Shift+E to exit river
-      riverctl map normal Mod1+Shift Q exit
-
-      # Mod4+J and Super+K to focus the next/previous view in the layout stack
-      riverctl map normal Mod1 J focus-view next
-      riverctl map normal Mod1 K focus-view previous
-
-      # Mod4+Shift+J and Super+Shift+K to swap the focused view with the next/previous
-      # view in the layout stack
-      riverctl map normal Mod1+Shift J swap next
-      riverctl map normal Mod1+Shift K swap previous
-
-      # Mod4+Period and Super+Comma to focus the next/previous output
-      riverctl map normal Mod1 L focus-output next
-      riverctl map normal Mod1 H focus-output previous
-
-      # Mod4+Shift+{Period,Comma} to send the focused view to the next/previous output
-      riverctl map normal Mod1+Shift L send-to-output next
-      riverctl map normal Mod1+Shift H send-to-output previous
-
-      # Mod4+Return to bump the focused view to the top of the layout stack
-      riverctl map normal Mod4 Return zoom
-
-      # Mod4+H and Super+L to decrease/increase the main ratio of rivertile(1)
-      riverctl map normal Mod1+Control H send-layout-cmd rivertile "main-ratio -0.05"
-      riverctl map normal Mod1+Control L send-layout-cmd rivertile "main-ratio +0.05"
-
-      # Mod4+Mod1+{H,J,K,L} to move views
-      riverctl map normal Mod4+Mod1 H move left 100
-      riverctl map normal Mod4+Mod1 J move down 100
-      riverctl map normal Mod4+Mod1 K move up 100
-      riverctl map normal Mod4+Mod1 L move right 100
-
-      # Mod4+Mod1+Control+{H,J,K,L} to snap views to screen edges
-      riverctl map normal Mod4+Mod1+Control H snap left
-      riverctl map normal Mod4+Mod1+Control J snap down
-      riverctl map normal Mod4+Mod1+Control K snap up
-      riverctl map normal Mod4+Mod1+Control L snap right
-
-      # Mod4+Mod1+Shif+{H,J,K,L} to resize views
-      riverctl map normal Mod4+Mod1+Shift H resize horizontal -100
-      riverctl map normal Mod4+Mod1+Shift J resize vertical 100
-      riverctl map normal Mod4+Mod1+Shift K resize vertical -100
-      riverctl map normal Mod4+Mod1+Shift L resize horizontal 100
-
-      # Mod4 + Left Mouse Button to move views
-      riverctl map-pointer normal Alt BTN_LEFT move-view
-
-      # Mod4 + Right Mouse Button to resize views
-      riverctl map-pointer normal Alt BTN_RIGHT resize-view
-
-      for i in $(seq 1 9); do
-          tags=$((1 << ($i - 1)))
-
-          # Mod4+[1-9] to focus tag [0-8]
-          riverctl map normal Mod1 $i set-focused-tags $tags
-
-          # Mod4+Shift+[1-9] to tag focused view with tag [0-8]
-          riverctl map normal Mod1+Shift $i set-view-tags $tags
-
-          # Mod4+Ctrl+[1-9] to toggle focus of tag [0-8]
-          riverctl map normal Mod1+Control $i toggle-focused-tags $tags
-
-          # Mod4+Shift+Ctrl+[1-9] to toggle tag [0-8] of focused view
-          riverctl map normal Mod1+Shift+Control $i toggle-view-tags $tags
-      done
-
-      # Mod4+0 to focus all tags
-      # Mod4+Shift+0 to tag focused view with all tags
-      all_tags=$(((1 << 32) - 1))
-      riverctl map normal Mod4 0 set-focused-tags $all_tags
-      riverctl map normal Mod4+Shift 0 set-view-tags $all_tags
-
-      # Mod4+Space to toggle float
-      riverctl map normal Mod1 Space toggle-float
-
-      # Mod4+F to toggle fullscreen
-      riverctl map normal Mod1 t toggle-fullscreen
-
-      # Mod4+{Up,Right,Down,Left} to change layout orientation
-      riverctl map normal Mod4 Up send-layout-cmd rivertile "main-location top"
-      riverctl map normal Mod4 Right send-layout-cmd rivertile "main-location right"
-      riverctl map normal Mod4 Down send-layout-cmd rivertile "main-location bottom"
-      riverctl map normal Mod4 Left send-layout-cmd rivertile "main-location left"
-
-      # Declare a passthrough mode. This mode has only a single mapping to return to
-      # normal mode. This makes it useful for testing a nested wayland compositor
-      riverctl declare-mode passthrough
-
-      # Mod4+F11 to enter passthrough mode
-      riverctl map normal Mod4 F11 enter-mode passthrough
-
-      # Mod4+F11 to return to normal mode
-      riverctl map passthrough Mod4 F11 enter-mode normal
-
-      # Various media key mapping examples for both normal and locked mode which do
-      # not have a modifier
-      for mode in normal locked; do
-          # Eject the optical drive (well if you still have one that is)
-          riverctl map $mode None XF86Eject spawn 'eject -T'
-
-          # Control pulse audio volume with pamixer (https://github.com/cdemoulins/pamixer)
-          riverctl map $mode None XF86AudioRaiseVolume spawn 'pamixer -i 5'
-          riverctl map $mode None XF86AudioLowerVolume spawn 'pamixer -d 5'
-          riverctl map $mode None XF86AudioMute spawn 'pamixer --toggle-mute'
-
-          # Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl)
-          riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause'
-          riverctl map $mode None XF86AudioPlay spawn 'playerctl play-pause'
-          riverctl map $mode None XF86AudioPrev spawn 'playerctl previous'
-          riverctl map $mode None XF86AudioNext spawn 'playerctl next'
-          #print screen
-          riverctl map $mode None Print spawn 'grim -g "$(slurp)" - | swappy -f -'
-          # Control screen backlight brighness with light (https://github.com/haikarainen/light)
-          riverctl map $mode None XF86MonBrightnessUp spawn 'light -A 5'
-          riverctl map $mode None XF86MonBrightnessDown spawn 'light -U 5'
-      done
-
-      #make a raw mode
-      riverctl declare-mode raw
-      riverctl map normal Mod1 r spawn 'riverctl enter-mode raw'
-      riverctl map raw Mod1 r spawn 'riverctl enter-mode normal'
-
-
-
-      # Set background and border color
-      #riverctl background-color 0x002b36
-      #riverctl border-color-focused 0x8218c4
-      #riverctl border-color-unfocused 0xff282a36
-      #riverctl border-width 3
-
-      #set ssd for apps
-      riverctl rule-add ssd
-
-      # Set keyboard repeat rate
-      riverctl set-repeat 50 300
-
-      # Make certain views start floating
-      riverctl float-filter-add app-id float
-      riverctl float-filter-add title "popup title with spaces"
-      riverctl rule-add -title "Idle Inhibitor" float
-      # Set app-ids and titles of views which should use client side decorations
-      riverctl csd-filter-add app-id "gedit"
-
-      # Set and exec into the default layout generator, rivertile.
-      # River will send the process group of the init executable SIGTERM on exit.
-      riverctl default-layout rivertile
-      exec rivertile -view-padding 3 -outer-padding 3 -main-ratio 0.5
-
-    '';
-
-  };
-}

dots/waybar.nix

@@ -10,25 +10,6 @@
   programs.waybar = {
     enable = true;
     style = ''
-      #tags button {
-          padding: 0 5px;
-          color: #f8f8f2;
-      }
-
-      #tags button.occupied {
-        color: inherit;
-        background-color: #6a548d;
-      }
-
-      #tags button.focused {
-          color: #f8f8f2;
-          background-color: #aa86e1;
-      }
-
-      #tags button.urgent {
-        color: #ea6962;
-      }
-
       #mode {
           background: #64727D;
           border-bottom: 3px solid #f8f8f2;
@@ -118,15 +99,14 @@
         spacing = 4; # Gaps between modules (4px)
         # Choose the order of the modules
         modules-left =
-          if window_manager == "river"
+          if window_manager == "hyprland"
-          then [
-            "river/tags"
-            "custom/media"
-          ]
-          else if window_manager == "hyprland"
           then [
             "hyprland/workspaces"
           ]
+          else if window_manager == "niri"
+          then [
+            "niri/workspaces"
+          ]
           else [ ];
         modules-center = [
         ];
@@ -180,20 +160,6 @@
           sort-by-name = true;
           all-outputs = true;
         };
-        "river/tags" = {
-          num-tags = 9;
-          tag-labels = [
-            "一"
-            "二"
-            "三"
-            "四"
-            "五"
-            "六"
-            "七"
-            "八"
-            "九"
-          ];
-        };
         keyboard-state = {
           numlock = true;
           capslock = true;

dots/xdg.nix

@@ -14,21 +14,24 @@
     portal = {
       enable = true;
 
-      config.common.default = [
+      config = {
-        "hyprland;kde"
+        common.default = [ "gtk" ];
-        "river"
+      } // lib.optionalAttrs (window_manager == "hyprland" || window_manager == "all") {
-        "kde"
+        hyprland.default = [ "hyprland" "gtk" ];
-        "gtk"
+      } // lib.optionalAttrs (window_manager == "niri" || window_manager == "all") {
-      ];
+        niri.default = [ "gnome" "gtk" ];
+      };
 
       xdgOpenUsePortal = true;
 
-      extraPortals = with pkgs; [
+      extraPortals = with pkgs;
-        xdg-desktop-portal-wlr
+        [ xdg-desktop-portal-gtk ]
-        xdg-desktop-portal-gtk
+        ++ lib.optionals (window_manager == "hyprland" || window_manager == "all") [
-        inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland
+          inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland
-        kdePackages.xdg-desktop-portal-kde
+        ]
-      ];
+        ++ lib.optionals (window_manager == "niri" || window_manager == "all") [
+          xdg-desktop-portal-gnome
+        ];
     };
 
     mime.enable = true;

dots/zsh.nix

@@ -66,7 +66,6 @@
       calc = "cpc";
       pdf = "mupdf";
       emacs = "emacs";
-      river = "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river && river";
       cp = "xcp";
       wget = "wget --hsts-file=$XDG_DATA_HOME/wget-hsts";
     };
@@ -78,7 +77,6 @@
     '';
 
     envExtra = ''
-      ${lib.getExe pkgs.macchina}
       nixdev() {
         if [[ -z "$1" ]]; then
           echo "Usage: nixdev <language>"

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767024902,
+        "lastModified": 1772292445,
-        "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=",
+        "narHash": "sha256-4F1Q7U313TKUDDovCC96m/Za4wZcJ3yqtu4eSrj8lk8=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556",
+        "rev": "1dbbba659c1cef0b0202ce92cadfe13bae550e8f",
         "type": "github"
       },
       "original": {
@@ -124,11 +124,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1769073714,
+        "lastModified": 1773328492,
-        "narHash": "sha256-vppHLOKWw3ygroSlQ2oZ/evNIeXrBDl7cOPOyXZAh90=",
+        "narHash": "sha256-ajjfsBnYR54VHhh/haYuPqBOyvgerlvYK6kZvmt2GRw=",
         "owner": "caelestia-dots",
         "repo": "shell",
-        "rev": "617f7a19f335be9e975dd001e262794636a6716f",
+        "rev": "d97ba8a9c08bc931261766b1070bce610e7cb22e",
         "type": "github"
       },
       "original": {
@@ -148,11 +148,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768655473,
+        "lastModified": 1772764582,
-        "narHash": "sha256-iWnILPS2mP9ubbjRAhNv6Fqg1J/upxmD9OQTZQR4O2w=",
+        "narHash": "sha256-hSwjmpXHFqzSXrndVekA0IheKrbC7wi0IbfZTYwlmXw=",
         "owner": "caelestia-dots",
         "repo": "cli",
-        "rev": "7de6c6063119a7cef27c6bd4c88f2c5ac4cbc064",
+        "rev": "4bcd42f482d038b98145b0b03388244b68b7d35d",
         "type": "github"
       },
       "original": {
@@ -167,11 +167,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1769048466,
+        "lastModified": 1773052604,
-        "narHash": "sha256-OVi/kMjh78azltCTXr9TonCN5sP6wF3tYii9AJ7nUoU=",
+        "narHash": "sha256-jYm0ejWPH2RkfehuPB/sLUGp8Nu0Sx9JhEYThctWbwo=",
         "owner": "caelestia-dots",
         "repo": "cli",
-        "rev": "74ddac98eb8a10b57ecbfe7e64bd7d4726cb192c",
+        "rev": "c930bd26045f1f86faa4e19dd082aec5e1754a83",
         "type": "github"
       },
       "original": {
@@ -192,11 +192,11 @@
         "quickshell": "quickshell_2"
       },
       "locked": {
-        "lastModified": 1768914728,
+        "lastModified": 1772962569,
-        "narHash": "sha256-HITJhpTIF9SiWvsb9XjeFMrkYZNdahe/HgY3puxYvcA=",
+        "narHash": "sha256-ctRw4pVgx0IYKfA2hy90Ku37pnVX2T4q57UWp+l69fs=",
         "owner": "caelestia-dots",
         "repo": "shell",
-        "rev": "2ddc367e4e12c13fc9499550fab62772408a6b47",
+        "rev": "e183599ce9e2c8d30a14631d53eb9947220c0812",
         "type": "github"
       },
       "original": {
@@ -212,11 +212,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768856812,
+        "lastModified": 1771868032,
-        "narHash": "sha256-s6iEuz/6JGZoa9Txsxyjlq1tR2lHarmLGBX8ptrTliU=",
+        "narHash": "sha256-l8+LOd+QJuapv/21+juetZeedrlYY1QNXwcI27ACgiI=",
         "owner": "AvengeMedia",
         "repo": "dgop",
-        "rev": "0afebac7527826b8f565ed17343a7f11e00fa0dc",
+        "rev": "361b4f7041cd27381ee3eeb36774faf10747e0c3",
         "type": "github"
       },
       "original": {
@@ -233,11 +233,11 @@
         "quickshell": "quickshell_3"
       },
       "locked": {
-        "lastModified": 1769053673,
+        "lastModified": 1773369326,
-        "narHash": "sha256-l1FoLfkmAwDdzAFGrL2GUazTAXlh9lEAAdnhUAVe9PQ=",
+        "narHash": "sha256-SL0b/9q8n0/VqhIeMkDPqLZ+UgQ5yAps3WpPu1+aZS8=",
         "owner": "AvengeMedia",
         "repo": "DankMaterialShell",
-        "rev": "6bf1438ef1580a18933e57ae645b9c2fd11b660e",
+        "rev": "e86227f05fd3bf133c2cd73eecfa8c1cd6a00dc0",
         "type": "github"
       },
       "original": {
@@ -312,11 +312,11 @@
         "nixpkgs-lib": "nixpkgs-lib_2"
       },
       "locked": {
-        "lastModified": 1765835352,
+        "lastModified": 1772408722,
-        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
         "type": "github"
       },
       "original": {
@@ -410,11 +410,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769015285,
+        "lastModified": 1773367248,
-        "narHash": "sha256-MlqzCJbckJsgwfkRs64H2xaX2Uxl4o6Z9XYfkYS1N/E=",
+        "narHash": "sha256-FFMc1uAwy2GYasd0rdNDVxKyAgzuoJH2M+GglBQbqf0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ec0247a7a19f641595c24ac1ea4df6461d1cdb36",
+        "rev": "be0c641a6a5564caa33982faa1fe2c60d92131c7",
         "type": "github"
       },
       "original": {
@@ -468,11 +468,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766946335,
+        "lastModified": 1770511807,
-        "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=",
+        "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "4af02a3925b454deb1c36603843da528b67ded6c",
+        "rev": "7c75487edd43a71b61adb01cae8326d277aab683",
         "type": "github"
       },
       "original": {
@@ -498,11 +498,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1769011011,
+        "lastModified": 1773316626,
-        "narHash": "sha256-lIF9wyXxf5QTv2D0HbI5n+l780S+WK6xxFgFZmoC7/M=",
+        "narHash": "sha256-BrDGYt2w2tSkCvjMtgcVGIAp3FWsV5Ycl4ongLZ/fLk=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "22fc8136a21676472b232f9462318e16b1d16745",
+        "rev": "e8684034525829d58054c32da914d1713398fbb8",
         "type": "github"
       },
       "original": {
@@ -565,11 +565,11 @@
         "nix-filter": "nix-filter"
       },
       "locked": {
-        "lastModified": 1767711026,
+        "lastModified": 1773341024,
-        "narHash": "sha256-yTuyde8TpBR3NhNnOcK4uOGukvMCwrH3otP8E04e9X0=",
+        "narHash": "sha256-9YZntjxs/M51VEIvg/vO76GMi9FF/gNYu5h9bXPGnXw=",
         "owner": "Duckonaut",
         "repo": "split-monitor-workspaces",
-        "rev": "764548c3aa22c9f4cb436ec7243d21795eb6ebec",
+        "rev": "34c266b732d8a063213098dc88369ac88b95dfa1",
         "type": "github"
       },
       "original": {
@@ -595,11 +595,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767723101,
+        "lastModified": 1771865848,
-        "narHash": "sha256-jObY8O7OI+91hoE137APsDxm0235/Yx+HhFIip187zM=",
+        "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "fef398ed5e4faf59bc43b915e46a75cfe8b16697",
+        "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960",
         "type": "github"
       },
       "original": {
@@ -649,11 +649,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764612430,
+        "lastModified": 1771866172,
-        "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=",
+        "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "0d00dc118981531aa731150b6ea551ef037acddd",
+        "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41",
         "type": "github"
       },
       "original": {
@@ -726,11 +726,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766253372,
+        "lastModified": 1771271487,
-        "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=",
+        "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9",
+        "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d",
         "type": "github"
       },
       "original": {
@@ -751,11 +751,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763640274,
+        "lastModified": 1770501770,
-        "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=",
+        "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671",
+        "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
         "type": "github"
       },
       "original": {
@@ -780,11 +780,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767473322,
+        "lastModified": 1771606233,
-        "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=",
+        "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=",
         "owner": "hyprwm",
         "repo": "hyprwire",
-        "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11",
+        "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a",
         "type": "github"
       },
       "original": {
@@ -801,11 +801,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768986040,
+        "lastModified": 1773380813,
-        "narHash": "sha256-83npNk7w9yNJfSnpdZPNUjbhQwGVef3BWyBuIe6TJfk=",
+        "narHash": "sha256-6GDKki2AIkWgnnTGA1enQB3I1mI6rdPe4rrXafmmIiY=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "d75e3c96c9f935a6ccdd4a91209950289b2dc2fc",
+        "rev": "8347eae3a900c26b8223ee98697f30f4e88dc226",
         "type": "github"
       },
       "original": {
@@ -814,6 +814,62 @@
         "type": "github"
       }
     },
+    "niri": {
+      "inputs": {
+        "niri-stable": "niri-stable",
+        "niri-unstable": "niri-unstable",
+        "nixpkgs": "nixpkgs_4",
+        "nixpkgs-stable": "nixpkgs-stable",
+        "xwayland-satellite-stable": "xwayland-satellite-stable",
+        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
+      },
+      "locked": {
+        "lastModified": 1773390002,
+        "narHash": "sha256-0RVjh9h0sgPHngxEs/Wd2/xdGsgKgZWjxFu5JsX3ASw=",
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "rev": "adc63b19724247f947385381481effd225a6e2fc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "type": "github"
+      }
+    },
+    "niri-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1756556321,
+        "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "ref": "v25.08",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "niri-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1773130184,
+        "narHash": "sha256-3bwx4WqCB06yfQIGB+OgIckOkEDyKxiTD5pOo4Xz2rI=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "b07bde3ee82dd73115e6b949e4f3f63695da35ea",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
     "nix-alien": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -823,11 +879,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768904356,
+        "lastModified": 1771150922,
-        "narHash": "sha256-TIG8J+Or8nOydy8TztvtIshnprlf1q6XDIJnopLtMlA=",
+        "narHash": "sha256-+oQJun4CFDlOQRocbZpqQDj7agoy56/4ZjT1oUR7NOs=",
         "owner": "thiagokokada",
         "repo": "nix-alien",
-        "rev": "d95b25a4dd6da2a1dfeaaf66163d0a281a8270e9",
+        "rev": "96045e886ba0dd45b27590e7c0c6e77bbb54033d",
         "type": "github"
       },
       "original": {
@@ -900,11 +956,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765267181,
+        "lastModified": 1771130777,
-        "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
+        "narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
+        "rev": "efec7aaad8d43f8e5194df46a007456093c40f88",
         "type": "github"
       },
       "original": {
@@ -920,11 +976,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765267181,
+        "lastModified": 1772945408,
-        "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
+        "narHash": "sha256-PMt48sEQ8cgCeljQ9I/32uoBq/8t8y+7W/nAZhf72TQ=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
+        "rev": "1c1d8ea87b047788fd7567adf531418c5da321ec",
         "type": "github"
       },
       "original": {
@@ -939,14 +995,15 @@
         "flake-parts": "flake-parts",
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "nixpkgs-nixcord": "nixpkgs-nixcord"
       },
       "locked": {
-        "lastModified": 1769012266,
+        "lastModified": 1773405207,
-        "narHash": "sha256-Z5iGaFMtIlM9eC7LqQdkeqRtBBuYK4WlrPQ3Nc1KUus=",
+        "narHash": "sha256-UU3Xgx/Obut7UXxaUTvSpMLRaiILke58YxVi3uwIabo=",
         "owner": "kaylorben",
         "repo": "nixcord",
-        "rev": "d07bf2fa3fa73d40429a57c3415ddc98b81750b0",
+        "rev": "385319687272381cfa306a4bbf8c0b958ad065f7",
         "type": "github"
       },
       "original": {
@@ -957,11 +1014,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1768564909,
+        "lastModified": 1772773019,
-        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
+        "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
+        "rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
         "type": "github"
       },
       "original": {
@@ -988,11 +1045,11 @@
     },
     "nixpkgs-lib_2": {
       "locked": {
-        "lastModified": 1765674936,
+        "lastModified": 1772328832,
-        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
+        "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
+        "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
         "type": "github"
       },
       "original": {
@@ -1001,13 +1058,45 @@
         "type": "github"
       }
     },
+    "nixpkgs-nixcord": {
+      "locked": {
+        "lastModified": 1773222311,
+        "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0590cd39f728e129122770c029970378a79d076a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1773222311,
+        "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0590cd39f728e129122770c029970378a79d076a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1768886240,
+        "lastModified": 1772773019,
-        "narHash": "sha256-C2TjvwYZ2VDxYWeqvvJ5XPPp6U7H66zeJlRaErJKoEM=",
+        "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "80e4adbcf8992d3fd27ad4964fbb84907f9478b0",
+        "rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
         "type": "github"
       },
       "original": {
@@ -1019,11 +1108,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1767379071,
+        "lastModified": 1772198003,
-        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
+        "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
+        "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
         "type": "github"
       },
       "original": {
@@ -1035,11 +1124,27 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1768886240,
+        "lastModified": 1773282481,
-        "narHash": "sha256-C2TjvwYZ2VDxYWeqvvJ5XPPp6U7H66zeJlRaErJKoEM=",
+        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1773282481,
+        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "80e4adbcf8992d3fd27ad4964fbb84907f9478b0",
+        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
         "type": "github"
       },
       "original": {
@@ -1049,7 +1154,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1767767207,
         "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
@@ -1100,11 +1205,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767281941,
+        "lastModified": 1772024342,
-        "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
+        "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
+        "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476",
         "type": "github"
       },
       "original": {
@@ -1141,11 +1246,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768689040,
+        "lastModified": 1772925576,
-        "narHash": "sha256-Tlnr5BulJcMers/cb+YvmBQW4nKHjdKo9loInJkyO2k=",
+        "narHash": "sha256-mMoiXABDtkSJxCYDrkhJ/TrrJf5M46oUfIlJvv2gkZ0=",
         "ref": "refs/heads/master",
-        "rev": "7a427ce1979ce7447e885c4f30129b40f3d466f5",
+        "rev": "15a84097653593dd15fad59a56befc2b7bdc270d",
-        "revCount": 729,
+        "revCount": 750,
         "type": "git",
         "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },
@@ -1163,11 +1268,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768689040,
+        "lastModified": 1772925576,
-        "narHash": "sha256-Tlnr5BulJcMers/cb+YvmBQW4nKHjdKo9loInJkyO2k=",
+        "narHash": "sha256-mMoiXABDtkSJxCYDrkhJ/TrrJf5M46oUfIlJvv2gkZ0=",
         "ref": "refs/heads/master",
-        "rev": "7a427ce1979ce7447e885c4f30129b40f3d466f5",
+        "rev": "15a84097653593dd15fad59a56befc2b7bdc270d",
-        "revCount": 729,
+        "revCount": 750,
         "type": "git",
         "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },
@@ -1205,11 +1310,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768985439,
+        "lastModified": 1773392641,
-        "narHash": "sha256-qkU4r+l+UPz4dutMMRZSin64HuVZkEv9iFpu9yMWVY0=",
+        "narHash": "sha256-Qu768qE1C6nMpWYi+83AZt3jEwXE+NQKsgZ3fz3+vLE=",
         "ref": "refs/heads/master",
-        "rev": "191085a8821b35680bba16ce5411fc9dbe912237",
+        "rev": "4b77936c8019e0f51e0e62414c6de3556d5f8870",
-        "revCount": 731,
+        "revCount": 757,
         "type": "git",
         "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },
@@ -1229,15 +1334,15 @@
         "hyprland-hyprsplit": "hyprland-hyprsplit",
         "hyprland-plugins": "hyprland-plugins",
         "jovian": "jovian",
+        "niri": "niri",
         "nix-alien": "nix-alien",
         "nix-colors": "nix-colors",
         "nix-index-database": "nix-index-database_2",
         "nixcord": "nixcord",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "qs-qml": "qs-qml",
         "quickshell": "quickshell_4",
         "stylix": "stylix",
-        "vicinae": "vicinae",
         "zen-browser": "zen-browser"
       }
     },
@@ -1250,7 +1355,7 @@
         "firefox-gnome-theme": "firefox-gnome-theme",
         "flake-parts": "flake-parts_2",
         "gnome-shell": "gnome-shell",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_6",
         "nur": "nur",
         "systems": "systems_2",
         "tinted-foot": "tinted-foot",
@@ -1260,11 +1365,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1768744881,
+        "lastModified": 1772296853,
-        "narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=",
+        "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=",
         "owner": "nix-community",
         "repo": "stylix",
-        "rev": "06684f00cfbee14da96fd4307b966884de272d3a",
+        "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf",
         "type": "github"
       },
       "original": {
@@ -1303,21 +1408,6 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "tinted-foot": {
       "flake": false,
       "locked": {
@@ -1399,27 +1489,6 @@
         "type": "github"
       }
     },
-    "vicinae": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1769083455,
-        "narHash": "sha256-W71d7gmxSqD3HK+hEYAnMr+7P5La2XBf6KFp5B0fN7c=",
-        "owner": "vicinaehq",
-        "repo": "vicinae",
-        "rev": "15a5630d38ebdc0c29b5ebc66d5825fa1e0935a2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "vicinaehq",
-        "repo": "vicinae",
-        "type": "github"
-      }
-    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
@@ -1461,6 +1530,39 @@
         "type": "github"
       }
     },
+    "xwayland-satellite-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1755491097,
+        "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "388d291e82ffbc73be18169d39470f340707edaa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "ref": "v0.7",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1772429643,
+        "narHash": "sha256-M+bAeCCcjBnVk6w/4dIVvXvpJwOKnXjwi/lDbaN6Yws=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "10f985b84cdbcc3bbf35b3e7e43d1b2a84fa9ce2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    },
     "zen-browser": {
       "inputs": {
         "home-manager": [
@@ -1471,11 +1573,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769059766,
+        "lastModified": 1773290887,
-        "narHash": "sha256-u95Qe60mF3eoEqrd0tIej4A8TDWoc/N4ZjZ60npplgw=",
+        "narHash": "sha256-L1yMYmFffHfZNP+hKJGRBmrFKkn/VDhu7jEbVftBQuM=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "dc0483a6e3ff1ffb04ad77d26c1a4458f4cf82d6",
+        "rev": "9346698c4562819f61b4e5097151ec0b17729fab",
         "type": "github"
       },
       "original": {

flake.nix

@@ -21,7 +21,7 @@
       url = "github:kaylorben/nixcord";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    #niri.url = "github:sodiboo/niri-flake";
+    niri.url = "github:sodiboo/niri-flake";
     dgop = {
       url = "github:AvengeMedia/dgop";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -58,10 +58,6 @@
       url = "github:Duckonaut/split-monitor-workspaces";
       inputs.hyprland.follows = "hyprland";
     };
-    vicinae = {
-      url = "github:vicinaehq/vicinae";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     jovian = {
       url = "github:Jovian-Experiments/Jovian-NixOS";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -82,8 +78,8 @@
           allowUnfree = true;
         };
       };
-      #Avalable options are ["niri" "river" "hyprland" "all"]
+      #Avalable options are ["niri" "hyprland" "all"]
-      window_manager = "hyprland";
+      window_manager = "all";
     in
     {
       nixosConfigurations = {

hardware-configuration.nix

@@ -19,12 +19,18 @@ in
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  assertions = [{
+  assertions = [
-    assertion = builtins.elem systemName [ "laptop" "pc" ];
+    {
-    message = "systemName must be either 'laptop' or 'pc', got: ${systemName}";
+      assertion = builtins.elem systemName [
-  }];
+        "laptop"
+        "pc"
+      ];
+      message = "systemName must be either 'laptop' or 'pc', got: ${systemName}";
+    }
+  ];
 
-  boot.initrd.availableKernelModules = [ ]
+  boot.initrd.availableKernelModules =
+    [ ]
     ++ lib.optionals isPc [
       "xhci_pci"
       "ahci"
@@ -41,15 +47,20 @@ in
       "sd_mod"
     ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ]
+  boot.kernelModules =
-    ++ lib.optionals isPc [ "kvm-amd" "btusb" ]
+    [ ]
+    ++ lib.optionals isPc [
+      "kvm-amd"
+      "btusb"
+    ]
     ++ lib.optionals isLaptop [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
   boot.kernelParams = [
-  # Most common working combination in 2024/2025
+    # Most common working combination in 2024/2025
-  "btusb.enable_autosuspend=0"
+    "btusb.enable_autosuspend=0"
-  "btusb.reset=1"
+    "btusb.reset=1"
-];
+  ];
+  boot.tmp.useTmpfs = true;
 
   fileSystems."/" = lib.mkMerge [
     (lib.mkIf isPc {
@@ -57,7 +68,7 @@ in
       fsType = "btrfs";
     })
     (lib.mkIf isLaptop {
-      device = "/dev/disk/by-uuid/6aa7c67d-a0a5-4928-b16b-9c7991fee7ab";
+      device = "/dev/disk/by-uuid/60ef2e23-4b8b-41cd-896d-e6bad07905f8";
       fsType = "ext4";
     })
   ];
@@ -68,7 +79,7 @@ in
       fsType = "vfat";
     })
     (lib.mkIf isLaptop {
-      device = "/dev/disk/by-uuid/FF4B-819D";
+      device = "/dev/disk/by-uuid/FD33-308F";
       fsType = "vfat";
       options = [
         "fmask=0077"
@@ -91,7 +102,6 @@ in
     })
   ];
 
-
   #fileSystems."/server" = lib.mkIf isPc {   # or remove the mkIf if you want it on both
   #  device = "//192.168.1.8/mrfluffy";   # adjust the share name if it’s not the home share
   #  fsType = "cifs";
@@ -115,12 +125,13 @@ in
   #  ];
   #};
 
-  swapDevices = [ ]
+  swapDevices =
+    [ ]
     ++ lib.optionals isPc [
       { device = "/dev/disk/by-uuid/ccf41b96-c45f-47e0-8541-cd865f5d2ec6"; }
     ]
     ++ lib.optionals isLaptop [
-      { device = "/dev/disk/by-uuid/b416c3bd-861b-4b0c-aa84-6962b2e6a47d"; }
+      { device = "/dev/disk/by-uuid/bc708cba-d240-4730-8de2-6ebc5ff5b278"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

home/common.nix

@@ -13,6 +13,7 @@
     inputs.nix-colors.homeManagerModules.default
     inputs.stylix.homeModules.stylix
     inputs.nixcord.homeModules.nixcord
+    inputs.niri.homeModules.niri
 
     # Local modules
     ./sessionVars.nix
@@ -26,8 +27,8 @@
     ../dots/zsh.nix
     ../dots/nixcord.nix
     ../dots/xdg.nix
-    ../dots/river.nix
     ../dots/hyprland.nix
+    ../dots/niri.nix
     ../dots/hyprpaper.nix
     ../dots/caelestia.nix
     ../dots/dankMeterialShell.nix
@@ -37,13 +38,13 @@
   home.stateVersion = "23.11";
 
   # Common GTK settings
-  gtk = {
+  #gtk = {
-    enable = true;
+  #  enable = true;
-    iconTheme = {
+  #  iconTheme = {
-      name = "Reversal-black-dark";
+  #    name = "Reversal-black-dark";
-      package = pkgs.reversal-icon-theme.override { allColorVariants = true; };
+  #    package = pkgs.reversal-icon-theme.override { allColorVariants = true; };
-    };
+  #  };
-  };
+  #};
 
   # Common packages for all users
   home.packages = with pkgs; [

home/homePkgs.nix

@@ -14,12 +14,12 @@ let
     name = "default";
     isDefault = true;
   };
+
 in
 {
   imports = [
     inputs.zen-browser.homeModules.beta
     inputs.caelestia.homeManagerModules.default
-    inputs.vicinae.homeManagerModules.default
   ];
 
   programs = {
@@ -68,44 +68,6 @@ in
 
   };
 
-  services.vicinae = {
-    enable = true; # default: false
-    systemd = {
-      enable = true;
-      environment = {
-        USE_LAYER_SHELL = 1;
-      };
-    };
-    #package = # specify package to use here. Can be omitted.
-    # Installing (vicinae) extensions declaratively
-    #settings = {
-    #  faviconService = "twenty"; # twenty | google | none
-    #  font.size = 11;
-    #  popToRootOnClose = false;
-    #  rootSearch.searchFiles = false;
-    #  theme.name = "vicinae-dark";
-    #  window = {
-    #    csd = true;
-    #    opacity = 0.95;
-    #    rounding = 10;
-    #  };
-    #};
-    #extensions = [
-    #  (inputs.vicinae.mkVicinaeExtension.${pkgs.stdenv.hostPlatform.system} {
-    #    inherit pkgs;
-    #    name = "extension-name";
-    #    src = pkgs.fetchFromGitHub {
-    #      # You can also specify different sources other than github
-    #      owner = "repo-owner";
-    #      repo = "repo-name";
-    #      rev = "v1.0"; # If the extension has no releases use the latest commit hash
-    #      # You can get the sha256 by rebuilding once and then copying the output hash from the error message
-    #      sha256 = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
-    #    }; # If the extension is in a subdirectory you can add ` + "/subdir"` between the brace and the semicolon here
-    #  })
-    #];
-  };
-
   qt.enable = true;
   # qt.style = "gtk2";
   # qt.platformTheme = "qt5ct";
@@ -157,6 +119,7 @@ in
     slurp
     swappy
     wf-recorder
+    dsearch
 
     # ─── Audio / Media Tools ─────────────────────────────────────────────────────
     openai-whisper
@@ -171,7 +134,7 @@ in
     wgnord
 
     # ─── Communication & Sharing ─────────────────────────────────────────────────
-    #element-desktop
+    element-desktop
     localsend
     thunderbird
 
@@ -185,6 +148,8 @@ in
     #upscaler
     pear-desktop
     libsixel
+    jellyfin-desktop
+    (pkgs.callPackage ../personalPKGS/world-monitor.nix { })
 
     # ─── Development Toolchains ──────────────────────────────────────────────────
     gdb
@@ -195,7 +160,8 @@ in
     zed-editor
     android-studio-full
     claude-code
-    # Language tooling from inputs
+    opencode
+    # Langugage tooling from inputs
     #inputs.qs-qml.packages.${pkgs.stdenv.hostPlatform.system}.qml-ts-mode
     #inputs.qs-qml.packages.${pkgs.stdenv.hostPlatform.system}.tree-sitter-qmljs
 
@@ -222,7 +188,6 @@ in
     })
     prismlauncher
     protonup-qt
-    wineWowPackages.stable
     mangayomi
     rink
     protontricks
@@ -231,25 +196,18 @@ in
 
     # ─── KDE / File Management ───────────────────────────────────────────────────
     kdePackages.qt6ct
-    kdePackages.baloo # new
-    kdePackages.baloo-widgets # new
-    kdePackages.dolphin
-    kdePackages.ffmpegthumbs # new
-    kdePackages.kdegraphics-mobipocket # new
-    kdePackages.kdegraphics-thumbnailers # new
-    kdePackages.kdesdk-thumbnailers # new
-    kdePackages.kimageformats # new
-    kdePackages.kio
-    kdePackages.kio-extras
-    # kdePackages.breeze-icons
-    # kdePackages.dolphin-plugins
-    # kdePackages.kde-cli-tools
     # resvg # new
     adwaita-icon-theme
     hicolor-icon-theme
     qt6.qtsvg
 
     adw-gtk3
+    (pkgs.callPackage ../personalPKGS/oreo.nix { colors = [ "all" ]; })
+    (pkgs.callPackage ../personalPKGS/reversal-icon-theme.nix { colorVariants = [ "all" ]; })
+    #(pkgs.reversal-icon-theme.override {
+    #  allColorVariants = true;
+    #})
+
     pywalfox-native
 
     # ─── Experimental (inputs) ───────────────────────────────────────────────────

home/mrfluffy.nix

@@ -18,10 +18,10 @@
   home.homeDirectory = "/home/mrfluffy";
 
   # User-specific GTK theme
-  gtk.gtk3 = {
+  #gtk.gtk3 = {
-    theme = {
+  #  theme = {
-      name = "adw-gtk3";
+  #    name = "adw-gtk3";
-      package = pkgs.adw-gtk3;
+  #    package = pkgs.adw-gtk3;
-    };
+  #  };
-  };
+  #};
 }

home/services.nix

@@ -8,5 +8,8 @@
 }:
 
 {
-  # User services can be added here
+  services.gnome-keyring = {
+    enable = true;
+    components = [ "pkcs11" "secrets" "ssh" ];
+  };
 }

home/stylix.nix

@@ -31,10 +31,9 @@ in
       #vscode.enable = true;
       lazygit.enable = true;
       #foot.enable = true;
-      river.enable = true;
       #hyprland.enable = true;
-      waybar.enable = true;
+      #waybar.enable = true;
-      nixcord.enable = true;
+      #nixcord.enable = true;
 
       #zen-browser = {
       #  enable = true;
@@ -86,10 +85,10 @@ in
       };
     };
 
-    cursor = {
+    #cursor = {
-      package = oreo.override { colors = [ "oreo_spark_pink_cursors" ]; };
+    #  package = oreo.override { colors = [ "oreo_spark_pink_cursors" ]; };
-      name = "oreo_spark_pink_cursors";
+    #  name = "oreo_spark_pink_cursors";
-      size = 32;
+    #  size = 32;
-    };
+    #};
   };
 }

personalPKGS/reversal-icon-theme.nix

@@ -0,0 +1,87 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  gtk3,
+  jdupes,
+  adwaita-icon-theme,
+  hicolor-icon-theme,
+  numix-icon-theme-circle,
+  colorVariants ? [ "black" ],
+}:
+
+let
+  pname = "reversal-icon-theme";
+in
+lib.checkListOfEnum "${pname}: color variants" [
+  "black"
+  "blue"
+  "brown"
+  "cyan"
+  "green"
+  "grey"
+  "lightblue"
+  "orange"
+  "pink"
+  "purple"
+  "red"
+  "all"
+] colorVariants
+
+stdenvNoCC.mkDerivation {
+  inherit pname;
+  version = "0-unstable-2026-01-26";
+
+  src = fetchFromGitHub {
+    owner = "yeyushengfan258";
+    repo = "Reversal-icon-theme";
+    rev = "26b97f00640cd9eaeb8f196eda3a8d298158a08f";
+    hash = "sha256-ahnp25wTCTrOtJUbAIv7vvVC2am+idEokoRomRe5aKU=";
+  };
+
+  nativeBuildInputs = [
+    gtk3
+    jdupes
+  ];
+
+  propagatedBuildInputs = [
+    adwaita-icon-theme
+    hicolor-icon-theme
+    numix-icon-theme-circle
+  ];
+
+  dontDropIconThemeCache = true;
+
+  postPatch = ''
+    patchShebangs install.sh
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/icons
+    ./install.sh -d $out/share/icons -t ${toString colorVariants}
+
+    # remove file that conflicts with other packages (e.g. gruvbox-dark-icons-gtk)
+    find $out/share/icons -name 'LICENSE' -delete
+
+    jdupes --quiet --link-soft --recurse $out/share
+
+    runHook postInstall
+  '';
+
+  dontFixup = true;
+
+  passthru.updateScript = lib.maintainers.update-source-version {
+    src = "https://github.com/yeyushengfan258/${pname}";
+    versionType = "commit";
+  };
+
+  meta = with lib; {
+    description = "Colorful Design rectangular icon theme for Linux desktops";
+    homepage = "https://github.com/yeyushengfan258/Reversal-icon-theme";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}

personalPKGS/world-monitor.nix

@@ -0,0 +1,19 @@
+{ lib, appimageTools, fetchurl }:
+
+appimageTools.wrapType2 {
+  pname = "world-monitor";
+  version = "2.5.23";
+
+  src = fetchurl {
+    url = "https://github.com/koala73/worldmonitor/releases/download/v2.5.23/World.Monitor_2.5.23_amd64.AppImage";
+    sha256 = "139mra0j8lrx8l17gb77fa6zjarc1n7ffkzayas4j3zmwn08yjs0";
+  };
+
+  meta = with lib; {
+    description = "A simple app to monitor world events";
+    homepage = "https://github.com/koala73/worldmonitor";
+    platforms = platforms.linux;
+    license = licenses.agpl3Only;
+    maintainers = with maintainers; [ ];
+  };
+}

system/boot.nix

@@ -55,5 +55,10 @@ in
       options v4l2loopback devices=2 video_nr=1,0 card_label="OBS Cam","phone cam" exclusive_caps=1,1
     '';
 
+    tmp = {
+      cleanOnBoot = lib.mkIf isLaptop true;
+      useTmpfs = lib.mkIf isPc true;
+    };
+
   };
 }

system/nixOSPkgs.nix

@@ -114,11 +114,6 @@ in
     virt-manager.enable = true;
     corectrl.enable = true;
 
-    opengamepadui = {
-      enable = true;
-      gamescopeSession.enable = true;
-    };
-
     steam = {
       enable = true;
       remotePlay.openFirewall = true;
@@ -132,6 +127,9 @@ in
       enable = true;
       libraries = with pkgs; [
         gcc15.cc.lib
+        icu
+        sdl3-image
+        libpng
         # add libraries here if needed
         # alsa-lib
         # libGL
@@ -140,9 +138,6 @@ in
       ];
     };
 
-    # Backlight tool
-    light.enable = true;
-
     # NetworkManager applet
     nm-applet = {
       enable = false;
@@ -210,16 +205,14 @@ in
     jdk11
     ladspaPlugins
     libtool
-    python311
+    python3
 
     # --- Spellcheck / Fonts ---
     hunspell
     hunspellDicts.en_US
 
-    # --- KDE Wallet bits ---
+    # --- GNOME Keyring ---
-    kdePackages.kwallet
+    gnome-keyring
-    kdePackages.kwalletmanager
-    kdePackages.kwallet-pam
 
     # --- Apps ---
     git

system/services.nix

@@ -12,8 +12,6 @@ let
 in
 {
   # ─── Desktop & Input ───────────────────────────────────────────────────────
-  services.xserver.windowManager.fvwm2.gestures = true;
-
   # Enable touchpad support (enabled by default in most desktop managers).
   services.libinput = {
     enable = true;
@@ -52,20 +50,8 @@ in
       };
   };
 
-  # ─── Nice Shit ──────────────────────────────────────────────────────────────
-  services.ananicy = {
-    enable = true;
-    package = pkgs.ananicy-cpp;
-    rulesProvider = pkgs.ananicy-cpp;
-    extraRules = [
-      {
-        "name" = "gamescope";
-        "nice" = -20;
-      }
-    ];
-  };
-
   services.blueman.enable = true;
+  services.accounts-daemon.enable = true;
 
   # ─── Printing & Files ───────────────────────────────────────────────────────
   # Enable CUPS to print documents.
@@ -108,84 +94,51 @@ in
   services.flatpak.enable = true;
 
   # Sunshine (only on PC)
-  services.sunshine = lib.mkIf isPc {
+  #services.sunshine = lib.mkIf isPc {
-    enable = false;
+  #  enable = false;
-    settings = {
+  #  settings = {
-      sunshine_name = "nixos";
+  #    sunshine_name = "nixos";
-      port = 47989;
+  #    port = 47989;
-      output_name = 0;
+  #    output_name = 0;
-    };
+  #  };
-    applications = {
+  #  applications = {
-      apps = [
+  #    apps = [
-        {
+  #      {
-          name = "Steam";
+  #        name = "Steam";
-          env = {
+  #        env = {
-            PATH = "$(PATH):/run/current-system/sw/bin";
+  #          PATH = "$(PATH):/run/current-system/sw/bin";
-          };
+  #        };
-          output = "steam.txt";
+  #        output = "steam.txt";
-          detached = [
+  #        detached = [
-            "setsid /run/current-system/sw/bin/steam steam://open/bigpicture"
+  #          "setsid /run/current-system/sw/bin/steam steam://open/bigpicture"
-          ];
+  #        ];
-          prep-cmd = [
+  #        prep-cmd = [
-            {
+  #          {
-              "do" = "";
+  #            "do" = "";
-              "undo" = "setsid /run/current-system/sw/bin/steam steam://close/bigpicture";
+  #            "undo" = "setsid /run/current-system/sw/bin/steam steam://close/bigpicture";
-            }
+  #          }
-          ];
+  #        ];
-          image-path = "steam.png";
+  #        image-path = "steam.png";
-        }
+  #      }
-      ];
+  #    ];
-    };
+  #  };
-    capSysAdmin = false;
+  #  capSysAdmin = false;
-    openFirewall = true;
+  #  openFirewall = true;
-  };
+  #};
 
   # Ollama (only on PC)
   services.ollama = lib.mkIf isPc {
     enable = true;
-    package = pkgs.ollama-rocm;
+    package = pkgs.ollama-vulkan;
     port = 11434;
-    host = "127.0.0.1"; # Bind to localhost only for security
+    host = "0.0.0.0"; # Bind to localhost only for security
     rocmOverrideGfx = "11.0.0";
     environmentVariables = {
-      OLLAMA_DEBUG = "1";
+      OLLAMA_NUM_CTX = "4000000000";
-      OLLAMA_MMAP = "0";
-      OLLAMA_NUM_CTX = "40000";
-      OLLAMA_NUM_GPU = "20";
-      OLLAMA_FLASH_ATTENTION = "true";
-      OLLAMA_KV_CACHE_TYPE = "f16";
     };
   };
 
-  # ─── Systemd User Services ──────────────────────────────────────────────────
+
-  systemd.user.services.steam-run-url-service = {
-    description = "Service to launch Steam URLs via FIFO";
-    wantedBy = [ "default.target" ];
-    serviceConfig = {
-      ExecStart =
-        let
-          script = pkgs.writeShellScript "steam-run-url-service.sh" ''
-            #!/usr/bin/env bash
-            FIFO="/run/user/$(id --user)/steam-run-url.fifo"
-            if [ ! -p "$FIFO" ]; then
-              mkfifo "$FIFO"
-            fi
-            while true; do
-              if read line <"$FIFO"; then
-                steam_env=();
-                if [ "$XDG_SESSION_DESKTOP" = "sway" ] || [ "$XDG_SESSION_DESKTOP" = "Hyprland" ] || [ "$DESKTOP_SESSION" = "sway" ] || [ "$DESKTOP_SESSION" = "Hyprland" ]; then
-                  steam_env+=("QT_QPA_PLATFORM=wayland");
-                fi
-                steam "$line"
-              fi
-            done
-          '';
-        in
-        "${script}";
-      Restart = "always";
-    };
-    path = [ pkgs.steam ];
-  };
 
   # ─── Networking & Remote ────────────────────────────────────────────────────
   # services.resolved = {

system/specialisation/main-system.nix

@@ -16,35 +16,31 @@ let
 
   # Window manager toggles
   wmAll = window_manager == "all";
-  useRiver = window_manager == "river" || wmAll;
   useNiri = window_manager == "niri" || wmAll;
   useHypr = window_manager == "hyprland" || wmAll;
 in
 
 {
   # greetd + tuigreet
-  services.greetd = {
+  #services.greetd = {
-    enable = true;
-    restart = true;
-    useTextGreeter = true;
-    settings.default_session = {
-      command = "${lib.getExe pkgs.tuigreet} --window-padding 1 --time --time-format '%R - %F' --remember --remember-session --asterisks";
-      user = "greeter";
-    };
-  };
-  #services.displayManager.dms-greeter = {
   #  enable = true;
-  #  compositor.name = "hyprland"; # Or "hyprland" or "sway"
+  #  restart = true;
-  #  configHome = "${config.users.users.mrfluffy.home}";
+  #  useTextGreeter = true;
+  #  settings.default_session = {
+  #    command = "${lib.getExe pkgs.tuigreet} --window-padding 1 --time --time-format '%R - %F' --remember --remember-session --asterisks";
+  #    user = "greeter";
+  #  };
   #};
+  services.displayManager.dms-greeter = {
+    enable = true;
+    compositor.name = "niri"; # Or "hyprland" or "sway"
+    configHome = "${config.users.users.mrfluffy.home}";
+  };
   #services.displayManager.cosmic-greeter.enable = true;
 
   # ─── Desktop / WM ───────────────────────────────────────────────────────────
-  programs.river-classic.enable = useRiver;
-
   qt = {
     enable = true;
-    platformTheme = "qt5ct";
   };
 
   xdg.menus.enable = true;
@@ -53,12 +49,10 @@ in
   environment.etc."/xdg/menus/applications.menu".text =
     builtins.readFile "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu";
 
-  # Niri (via overlay)
+  # Niri
-  #nixpkgs.overlays = [ inputs.niri.overlays.niri ];
+  programs.niri = {
-  #programs.niri = {
+    enable = useNiri;
-  #  enable = useNiri;
+  };
-  #  package = pkgs.niri-stable; # Only needed if not provided by the overlay
-  #};
 
   # Hyprland
   programs.hyprland = {
@@ -97,7 +91,7 @@ in
     pam.services = {
       swaylock = { };
       greetd.enableGnomeKeyring = true;
-      greetd.kwallet.enable = true;
+      login.enableGnomeKeyring = true;
     };
   };