added bar bar

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

@@ -35,7 +35,8 @@
       })
       # modules.niri # Testing
       modules.stylix
-      modules.quickshell
+      # modules.quickshell
+      modules.barbar
       modules.nix-ld
       modules.spotify
       # modules.easyeffects

config/modules/barbar.nix

@@ -0,0 +1,61 @@
+{ modules, inputs, ... }: {
+  flake-file.inputs = {
+    barbar.url = "git+https://git.scug.io/doloro/barbar?ref=master";
+  };
+  modules.barbar = {
+    homeManager = { pkgs, ... }: {
+      imports = [ inputs.barbar.homeManagerModules.default ];
+      programs.barbar = {
+        enable = true;
+        settings = {
+          display = {
+            monitor = "DP-2";
+            height = 20;
+            antialiasing = true;
+            default_text_size = 14.0;
+            padding = 4.0;
+            spacing = 8.0;
+            # Absolute store path: barbar resolves `[display].theme` against
+            # its cwd, which is not the home dir under systemd.
+            theme = "${pkgs.writeText "barbar-base16.yaml" ''
+              scheme: "Gruvbox dark, medium"
+              author: "https://github.com/morhetz/gruvbox"
+              base00: "282828" # bg
+              base01: "3c3836" # bg1
+              base02: "504945" # bg2
+              base03: "665c54" # bg3
+              base04: "bdae93" # fg4
+              base05: "d5c4a1" # fg
+              base06: "ebdbb2" # fg2
+              base07: "fbf1c7" # fg0
+              base08: "fb4934" # red
+              base09: "fe8019" # orange
+              base0A: "fabd2f" # yellow
+              base0B: "b8bb26" # green
+              base0C: "8ec07c" # aqua
+              base0D: "83a598" # blue
+              base0E: "d3869b" # purple
+              base0F: "d65d0e" # brown
+            ''}";
+          };
+          order = {
+            left = [ "workspaces" "weather" ];
+            middle = [ ];
+            right = [ "audio" "clock" ];
+          };
+          modules.clock.show_seconds = false;
+          modules.workspaces = {
+            count = 10;
+            gap = 3.0;
+            slot_w = 10.0;
+            slot_h = 17.0;
+            radius = 2.5;
+            scale_active = 1.0;
+            scale_exists = 0.85;
+            scale_absent = 0.65;
+          };
+        };
+      };
+    };
+  };
+}

config/modules/hyprland/doloro-settings.nix

@@ -41,7 +41,12 @@
             # `_args` renders a multi-argument call instead of one Lua table,
             # and mkLuaInline passes raw Lua through for dispatchers.
             dsp = lib.generators.mkLuaInline;
-            bind = key: dispatcher: { _args = [ key dispatcher ]; };
+            bind = key: dispatcher: {
+              _args = [
+                key
+                dispatcher
+              ];
+            };
             bezier = name: points: {
               _args = [
                 name
@@ -58,8 +63,8 @@
                   ws = toString (i + 1);
                 in
                 [
-                  (bind "${mainMod} + ${ws}" (dsp ''hl.dsp.focus({ workspace = ${ws} })''))
+                  (bind "${mainMod} + ${ws}" (dsp "hl.dsp.focus({ workspace = ${ws} })"))
-                  (bind "${mainMod} + SHIFT + ${ws}" (dsp ''hl.dsp.window.move({ workspace = ${ws} })''))
+                  (bind "${mainMod} + SHIFT + ${ws}" (dsp "hl.dsp.window.move({ workspace = ${ws} })"))
                 ]
               ) 9
             );
@@ -113,7 +118,7 @@
                 }
                 {
                   label = "reboot";
-                  action = "systemctl reboot";
+                  action = "hyprshutdown --post-cmd 'systemctl reboot'";
                   text = "Reboot";
                   keybind = "r";
                 }
@@ -173,6 +178,7 @@
                       ignore_opacity = false;
                     };
                   };
+                  cursor.default_monitor = "DP-2";
                   cursor.no_hardware_cursors = false;
                   dwindle.preserve_split = true;
                   misc = {
@@ -197,6 +203,23 @@
                   }
                 ];
 
+                # DP-2 is the main monitor: every workspace (1-10, matching the
+                # binds above and the window rules below) is bound to it, so
+                # new workspaces are never created on HDMI-A-1. Workspace 1 is
+                # DP-2's default, i.e. what it shows on startup.
+                workspace_rule =
+                  [
+                    {
+                      workspace = "1";
+                      monitor = "DP-2";
+                      default = true;
+                    }
+                  ]
+                  ++ builtins.genList (i: {
+                    workspace = toString (i + 2);
+                    monitor = "DP-2";
+                  }) 9;
+
                 device = {
                   name = "default";
                   kb_layout = "gb";
@@ -207,51 +230,178 @@
                 # `importantPrefixes` default, so the beziers exist by name.
                 curve = [
                   (bezier "easeOutQuint" [
-                    [ 0.23 1 ]
+                    [
-                    [ 0.32 1 ]
+                      0.23
+                      1
+                    ]
+                    [
+                      0.32
+                      1
+                    ]
                   ])
                   (bezier "easeInOutCubic" [
-                    [ 0.65 0.05 ]
+                    [
-                    [ 0.36 1 ]
+                      0.65
+                      0.05
+                    ]
+                    [
+                      0.36
+                      1
+                    ]
                   ])
                   (bezier "linear" [
-                    [ 0 0 ]
+                    [
-                    [ 1 1 ]
+                      0
+                      0
+                    ]
+                    [
+                      1
+                      1
+                    ]
                   ])
                   (bezier "almostLinear" [
-                    [ 0.5 0.5 ]
+                    [
-                    [ 0.75 1 ]
+                      0.5
+                      0.5
+                    ]
+                    [
+                      0.75
+                      1
+                    ]
                   ])
                   (bezier "quick" [
-                    [ 0.15 0 ]
+                    [
-                    [ 0.1 1 ]
+                      0.15
+                      0
+                    ]
+                    [
+                      0.1
+                      1
+                    ]
                   ])
                 ];
 
                 animation = [
-                  { leaf = "global"; enabled = true; speed = 10; bezier = "default"; }
+                  {
-                  { leaf = "border"; enabled = true; speed = 5.39; bezier = "easeOutQuint"; }
+                    leaf = "global";
-                  { leaf = "windows"; enabled = true; speed = 2.79; bezier = "easeOutQuint"; }
+                    enabled = true;
-                  { leaf = "windowsIn"; enabled = true; speed = 1; bezier = "easeOutQuint"; style = "popin 87%"; }
+                    speed = 10;
-                  { leaf = "windowsOut"; enabled = true; speed = 1; bezier = "linear"; style = "popin 87%"; }
+                    bezier = "default";
-                  { leaf = "windowsMove"; enabled = true; speed = 1; bezier = "easeInOutCubic"; }
+                  }
-                  { leaf = "fadeIn"; enabled = true; speed = 0.5; bezier = "almostLinear"; }
+                  {
-                  { leaf = "fadeOut"; enabled = true; speed = 0.5; bezier = "almostLinear"; }
+                    leaf = "border";
-                  { leaf = "fade"; enabled = true; speed = 1; bezier = "quick"; }
+                    enabled = true;
-                  { leaf = "layers"; enabled = true; speed = 3.81; bezier = "easeOutQuint"; }
+                    speed = 5.39;
-                  { leaf = "layersIn"; enabled = true; speed = 4; bezier = "easeOutQuint"; style = "fade"; }
+                    bezier = "easeOutQuint";
-                  { leaf = "layersOut"; enabled = true; speed = 1.5; bezier = "linear"; style = "fade"; }
+                  }
-                  { leaf = "fadeLayersIn"; enabled = true; speed = 1.79; bezier = "almostLinear"; }
+                  {
-                  { leaf = "fadeLayersOut"; enabled = true; speed = 1.39; bezier = "almostLinear"; }
+                    leaf = "windows";
-                  { leaf = "workspaces"; enabled = true; speed = 1; bezier = "almostLinear"; style = "slide"; }
+                    enabled = true;
-                  { leaf = "workspacesIn"; enabled = true; speed = 1; bezier = "easeInOutCubic"; style = "slide"; }
+                    speed = 2.79;
-                  { leaf = "workspacesOut"; enabled = true; speed = 1; bezier = "easeInOutCubic"; style = "slide"; }
+                    bezier = "easeOutQuint";
-                  { leaf = "zoomFactor"; enabled = true; speed = 7; bezier = "quick"; }
+                  }
+                  {
+                    leaf = "windowsIn";
+                    enabled = true;
+                    speed = 1;
+                    bezier = "easeOutQuint";
+                    style = "popin 87%";
+                  }
+                  {
+                    leaf = "windowsOut";
+                    enabled = true;
+                    speed = 1;
+                    bezier = "linear";
+                    style = "popin 87%";
+                  }
+                  {
+                    leaf = "windowsMove";
+                    enabled = true;
+                    speed = 1;
+                    bezier = "easeInOutCubic";
+                  }
+                  {
+                    leaf = "fadeIn";
+                    enabled = true;
+                    speed = 0.5;
+                    bezier = "almostLinear";
+                  }
+                  {
+                    leaf = "fadeOut";
+                    enabled = true;
+                    speed = 0.5;
+                    bezier = "almostLinear";
+                  }
+                  {
+                    leaf = "fade";
+                    enabled = true;
+                    speed = 1;
+                    bezier = "quick";
+                  }
+                  {
+                    leaf = "layers";
+                    enabled = true;
+                    speed = 3.81;
+                    bezier = "easeOutQuint";
+                  }
+                  {
+                    leaf = "layersIn";
+                    enabled = true;
+                    speed = 4;
+                    bezier = "easeOutQuint";
+                    style = "fade";
+                  }
+                  {
+                    leaf = "layersOut";
+                    enabled = true;
+                    speed = 1.5;
+                    bezier = "linear";
+                    style = "fade";
+                  }
+                  {
+                    leaf = "fadeLayersIn";
+                    enabled = true;
+                    speed = 1.79;
+                    bezier = "almostLinear";
+                  }
+                  {
+                    leaf = "fadeLayersOut";
+                    enabled = true;
+                    speed = 1.39;
+                    bezier = "almostLinear";
+                  }
+                  {
+                    leaf = "workspaces";
+                    enabled = true;
+                    speed = 1;
+                    bezier = "almostLinear";
+                    style = "slide";
+                  }
+                  {
+                    leaf = "workspacesIn";
+                    enabled = true;
+                    speed = 1;
+                    bezier = "easeInOutCubic";
+                    style = "slide";
+                  }
+                  {
+                    leaf = "workspacesOut";
+                    enabled = true;
+                    speed = 1;
+                    bezier = "easeInOutCubic";
+                    style = "slide";
+                  }
+                  {
+                    leaf = "zoomFactor";
+                    enabled = true;
+                    speed = 7;
+                    bezier = "quick";
+                  }
                 ];
 
                 bind = [
                   (bind "${mainMod} + R" (dsp ''hl.dsp.exec_cmd("${mreowScript}")''))
-                  (bind "${mainMod} + C" (dsp ''hl.dsp.window.close()''))
+                  (bind "${mainMod} + C" (dsp "hl.dsp.window.close()"))
                   (bind "${mainMod} + M" (dsp ''hl.dsp.exec_cmd("uwsm stop")''))
                   (bind "${mainMod} + Q" (dsp ''hl.dsp.exec_cmd("kitty")''))
                   (bind "${mainMod} + V" (dsp ''hl.dsp.window.float({ action = "toggle" })''))
@@ -262,13 +412,13 @@
                   (bind "${mainMod} + L" (dsp ''hl.dsp.exec_cmd("wlogout")''))
                   (bind "${mainMod} + S" (dsp ''hl.dsp.exec_cmd("wayfreeze --after-freeze-cmd '${meowScript}'")''))
                   (bind "${mainMod} + F" (dsp ''hl.dsp.window.fullscreen({ action = "toggle" })''))
-                  (bind "${mainMod} + SHIFT + Q" (dsp ''hl.dsp.window.close()''))
+                  (bind "${mainMod} + SHIFT + Q" (dsp "hl.dsp.window.close()"))
                   (bind "${mainMod} + mouse_down" (dsp ''hl.dsp.focus({ workspace = "e+1" })''))
                   (bind "${mainMod} + mouse_up" (dsp ''hl.dsp.focus({ workspace = "e-1" })''))
 
                   # Mouse binds
-                  (bind "${mainMod} + mouse:272" (dsp ''hl.dsp.window.drag()''))
+                  (bind "${mainMod} + mouse:272" (dsp "hl.dsp.window.drag()"))
-                  (bind "${mainMod} + mouse:273" (dsp ''hl.dsp.window.resize()''))
+                  (bind "${mainMod} + mouse:273" (dsp "hl.dsp.window.resize()"))
 
                   # Media keys
                   (bind "XF86AudioLowerVolume" (dsp ''hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-")''))
@@ -280,11 +430,11 @@
                   (bind "XF86AudioMicMute" (dsp ''hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle")''))
                   (bind "home" (dsp ''hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle")''))
                   (bind "end" (dsp ''hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle")''))
-                  (bind "F8" (dsp ''hl.dsp.pass({ window = [[match:class:^(com.obsproject.Studio)$]] })''))
+                  (bind "F8" (dsp "hl.dsp.pass({ window = [[match:class:^(com.obsproject.Studio)$]] })"))
 
                   # Workspaces
-                  (bind "${mainMod} + 0" (dsp ''hl.dsp.focus({ workspace = 10 })''))
+                  (bind "${mainMod} + 0" (dsp "hl.dsp.focus({ workspace = 10 })"))
-                  (bind "${mainMod} + SHIFT + 0" (dsp ''hl.dsp.window.move({ workspace = 10 })''))
+                  (bind "${mainMod} + SHIFT + 0" (dsp "hl.dsp.window.move({ workspace = 10 })"))
                 ]
                 ++ wsBinds;
 

config/modules/kitty.nix

@@ -17,8 +17,8 @@
           background_opacity = 0.6;
           cursor_trail = 1;
           auto_reload_config = -1;
-          input_delay = 1;
+          # input_delay = 1;
-          repaint_delay = 2;
+          # repaint_delay = 2;
           wayland_enable_ime = "no";
         };
       };

flake.lock

@@ -49,6 +49,28 @@
         "type": "github"
       }
     },
+    "barbar": {
+      "inputs": {
+        "crane": "crane",
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1789343725,
+        "narHash": "sha256-GTrZOJanHiT3cpL7L0fO7kbIqKcOICYTp07nevh0pd8=",
+        "ref": "master",
+        "rev": "e8c0e79baef6eac6f08d989fe019890ab312e081",
+        "revCount": 31,
+        "type": "git",
+        "url": "https://git.scug.io/doloro/barbar"
+      },
+      "original": {
+        "ref": "master",
+        "type": "git",
+        "url": "https://git.scug.io/doloro/barbar"
+      }
+    },
     "base16": {
       "inputs": {
         "fromYaml": "fromYaml"
@@ -118,6 +140,21 @@
       }
     },
     "crane": {
+      "locked": {
+        "lastModified": 1787326676,
+        "narHash": "sha256-lWhBbBvC05/xwivKBBiM2YNizpmgqCgyOIzomvRuwxs=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "692f7e9ef2ece8125b466f66f2af532b3edaed0d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
+    "crane_2": {
       "locked": {
         "lastModified": 1788465171,
         "narHash": "sha256-Y1/TTVXjYXGF068IThQH9fPSZ0SIE74PABlUxnWTUH0=",
@@ -151,15 +188,15 @@
     "direnv-instant": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1788419217,
+        "lastModified": 1789024098,
-        "narHash": "sha256-2GwP6Sot2NNBh7nUOi0y08m1RGwknIro+jMIM1yawz8=",
+        "narHash": "sha256-0vVoXxrufuddrRMhqijLdSMeAWhbyKI3Q4o3VU9bJo8=",
         "owner": "Mic92",
         "repo": "direnv-instant",
-        "rev": "d5cb5b1e1edc7ec17344839b1ce1d791d3785a7c",
+        "rev": "e88791710ef98b0d804d1d80e80c39445500a16a",
         "type": "github"
       },
       "original": {
@@ -170,7 +207,7 @@
     },
     "disko": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1781152676,
@@ -267,15 +304,15 @@
     },
     "flake-file": {
       "locked": {
-        "lastModified": 1788209062,
+        "lastModified": 1789150028,
-        "narHash": "sha256-j4yjVCCguq6s/SIZ2eh2Ll5Z9cJh7VOkIIFNo2PXRd0=",
+        "narHash": "sha256-o/o3n8+HAzFOFH83SuGW/w5J6glHtV+r8v+gJbMeoXM=",
-        "owner": "vic",
+        "owner": "denful",
         "repo": "flake-file",
-        "rev": "c460df7fe65ac759989daad04f303fb427406e56",
+        "rev": "eccac77d2c2567efb6f368330930f3d55af8668a",
         "type": "github"
       },
       "original": {
-        "owner": "vic",
+        "owner": "denful",
         "repo": "flake-file",
         "type": "github"
       }
@@ -288,11 +325,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787559586,
+        "lastModified": 1788450739,
-        "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=",
+        "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1",
+        "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
         "type": "github"
       },
       "original": {
@@ -347,11 +384,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787559586,
+        "lastModified": 1788450739,
-        "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=",
+        "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1",
+        "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
         "type": "github"
       },
       "original": {
@@ -383,7 +420,7 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -417,9 +454,27 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_5"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "font-patcher": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1765841187,
@@ -473,7 +528,7 @@
     "grimoire": {
       "inputs": {
         "grimoire-social": "grimoire-social",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "vpkmerge": "vpkmerge"
       },
       "locked": {
@@ -535,11 +590,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1788921139,
+        "lastModified": 1789235087,
-        "narHash": "sha256-2wRuvf9UDw1SYWtBcxNmxLeAtNU1i/hc1c0AKQHdvlM=",
+        "narHash": "sha256-6hZ6Gy8isRQsWdI4l81Egag/PUIh68nSmFr2maInUNg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a2dbe7c2c9333e8234ae8114c7f731784201d108",
+        "rev": "fe48612c5321a2cc09b0f563757a9c9733d641f8",
         "type": "github"
       },
       "original": {
@@ -617,17 +672,17 @@
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "hyprwire": "hyprwire",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_6",
         "pre-commit-hooks": "pre-commit-hooks",
-        "systems": "systems_2",
+        "systems": "systems_3",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1788777480,
+        "lastModified": 1789241536,
-        "narHash": "sha256-F33tKTtFrhst7rc5P20BkpgAJo4Qp3JQeyaHeVxZNJQ=",
+        "narHash": "sha256-O//GVrNjx6xOH+/08LBr5OJ7IQ147MDUu2AN3B/iGjY=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "7ebf13abb3c391604c60c9f627c7a403bcec8d17",
+        "rev": "c31b90c5fc87b6bfc494f4e66d5acc3b0ba5b0ad",
         "type": "github"
       },
       "original": {
@@ -869,14 +924,14 @@
     },
     "hytale-launcher": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1788890661,
+        "lastModified": 1789070605,
-        "narHash": "sha256-yH0nf7/BPVBcx3x2/6obgr4mQncHvI8KdYdEGgl4khU=",
+        "narHash": "sha256-QIo1r169N/jP71+YUXci6+fdD1WqKLE/FfWE8SLAqRI=",
         "owner": "JPyke3",
         "repo": "hytale-launcher-nix",
-        "rev": "0ba98a12d86d019005eb4fa1f4b1a89d710bf56d",
+        "rev": "9c26eaaef7e7b362dafa106e0de9567618e1698e",
         "type": "github"
       },
       "original": {
@@ -889,25 +944,25 @@
       "locked": {
         "lastModified": 1788467110,
         "narHash": "sha256-ljEMTXP/rH0tOvDzc9gzwww6KcHRPRnEHzd9lK48V7s=",
-        "owner": "vic",
+        "owner": "denful",
         "repo": "import-tree",
         "rev": "eb1b52eaecc57f7c136d07ae8a93e724dfecac46",
         "type": "github"
       },
       "original": {
-        "owner": "vic",
+        "owner": "denful",
         "repo": "import-tree",
         "type": "github"
       }
     },
     "iptsd": {
       "inputs": {
-        "crane": "crane",
+        "crane": "crane_2",
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay"
+        "rust-overlay": "rust-overlay_2"
       },
       "locked": {
         "lastModified": 1788847049,
@@ -960,7 +1015,7 @@
     },
     "nik-pkgs": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -1042,14 +1097,14 @@
       "inputs": {
         "flake-compat": "flake-compat_2",
         "flake-parts": "flake-parts_3",
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
-        "lastModified": 1788722952,
+        "lastModified": 1789241994,
-        "narHash": "sha256-3oLga8IyFIGcmdrU08wd323Fy/nopOSEP2FmnmCXrs0=",
+        "narHash": "sha256-kY+k8kGBd8w4kxrw8IPzQGpnYZQV4mik2ZNHtGN0eHI=",
         "owner": "xddxdd",
         "repo": "nix-cachyos-kernel",
-        "rev": "5dad735622e26198eaf193d6a523616a6cb715dd",
+        "rev": "444d135dde71c1de547cf7bfd73e67145e67aebb",
         "type": "github"
       },
       "original": {
@@ -1077,14 +1132,14 @@
     },
     "nixos-hardware": {
       "inputs": {
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1788942796,
+        "lastModified": 1789127271,
-        "narHash": "sha256-CLoJCCRi9sogsyGXYn8rOCWBLKAntfKUB9Rli/YXgEY=",
+        "narHash": "sha256-vL/Fpo7Zxa7wvO8V5FAToUBvP+K3XsMB1wUglTtd/J0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "83bbc895120516d6e86885a188c04beced6535d9",
+        "rev": "24cfdc1f9344b90a1eee329a3906e2f39f4d0f1e",
         "type": "github"
       },
       "original": {
@@ -1125,7 +1180,7 @@
         "argononed": "argononed",
         "flake-compat": "flake-compat_3",
         "nixos-images": "nixos-images",
-        "nixpkgs": "nixpkgs_9"
+        "nixpkgs": "nixpkgs_10"
       },
       "locked": {
         "lastModified": 1785596452,
@@ -1145,14 +1200,14 @@
     "nixos-wsl": {
       "inputs": {
         "flake-compat": "flake-compat_4",
-        "nixpkgs": "nixpkgs_10"
+        "nixpkgs": "nixpkgs_11"
       },
       "locked": {
-        "lastModified": 1784642409,
+        "lastModified": 1789164534,
-        "narHash": "sha256-hcbDqFuySAJawljt5r0sKBCJKYnbtGD0T/ZIozH1Dq0=",
+        "narHash": "sha256-DoYGPM6QpnYBLWj9gGw6ZwAzIX+HrAVov1BoT+8Jixo=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "eaeb18da90024448a60eb1ec7132eafa4003404e",
+        "rev": "72c92b11bb8289e6651c7fef29cc0a885fd6a255",
         "type": "github"
       },
       "original": {
@@ -1163,16 +1218,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1788039129,
+        "lastModified": 1787964612,
-        "narHash": "sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85+A=",
+        "narHash": "sha256-0N9nghg3nwzX6b6qc77EzjR9cu/Z+UR66FlfsCqiURs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d2f67949798825fe853f7c5d0492b8bf016d3f88",
+        "rev": "e8be7818e19ada32105a8af937a6a473b38167ca",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -1210,11 +1265,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1788946784,
+        "lastModified": 1789248843,
-        "narHash": "sha256-GQcnsu9y8AV22fDjDuyIsC+Lpfc7wBjmEAbR7lBuSG8=",
+        "narHash": "sha256-s8F5ErMKU8Rajwy6XkqBWVs8AuDvjRnxolSvMfUKFrQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "92300412ff7cc57585d4373410077c445b347825",
+        "rev": "e4d65c2135017ee3daf2fe40d8eca3479cc2a548",
         "type": "github"
       },
       "original": {
@@ -1242,27 +1297,27 @@
     },
     "nixpkgs_10": {
       "locked": {
-        "lastModified": 1783776592,
+        "lastModified": 1784856561,
-        "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=",
+        "narHash": "sha256-J+Bx1Z6Oeoj2FgnBhRMKyUhhtDoOpTgXYaVLZpDjW4A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3",
+        "rev": "597283ad8aa0b331c788e97c4c262d58877074ef",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_11": {
       "locked": {
-        "lastModified": 1788881743,
+        "lastModified": 1789006805,
-        "narHash": "sha256-2V9GZGvPfrNzxFozhI9dcqV+c3QdA8YZrvAAzqEB+dI=",
+        "narHash": "sha256-xB8mKMOx1IA9vTDNLmJZ6n4wCMq/cuWBBOzGCRnqxrU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d6524aaca2ff07876657ae2b323f24be4874944b",
+        "rev": "8ce4ef6cb6f871616146b9fe26d2a5ae594e94fe",
         "type": "github"
       },
       "original": {
@@ -1274,11 +1329,27 @@
     },
     "nixpkgs_12": {
       "locked": {
-        "lastModified": 1787631388,
+        "lastModified": 1789149629,
-        "narHash": "sha256-vMiXptXarfSdJb1Gkc+FYVOAibuBRj7qxGa8z68q1Uw=",
+        "narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ac6b2166e7a9375683b8e98f860f273222337b16",
+        "rev": "eaad089433ca2bb662274377d33df3d0e51ef28b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_13": {
+      "locked": {
+        "lastModified": 1789012029,
+        "narHash": "sha256-1CBkBf+Nhggykzlx0jvXrj5rk20btl+tK8Fa8Ml/BL4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d5dfd8e6716dde34398bc14bc87c10dece9c8c68",
         "type": "github"
       },
       "original": {
@@ -1288,7 +1359,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_13": {
+    "nixpkgs_14": {
       "locked": {
         "lastModified": 1774709303,
         "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
@@ -1304,7 +1375,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_14": {
+    "nixpkgs_15": {
       "locked": {
         "lastModified": 1745279238,
         "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=",
@@ -1320,7 +1391,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_15": {
+    "nixpkgs_16": {
       "locked": {
         "lastModified": 1788614874,
         "narHash": "sha256-PRK1fSEiAcO29DkUoOlsVLGYRK3h1YKVr+qQJB0VcYQ=",
@@ -1334,6 +1405,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1788614874,
+        "narHash": "sha256-7QYjT2vHLuX9Z1pdxHXDKCbh1CR3D/2rywB9Tx0MPRg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c043004d1c6985732bcc1cbc5a9c9aecbbb4e0f0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1780930886,
         "narHash": "sha256-rppURzHviaQN131F+nLiLdGfcb0uCd9gGP0E5+iw9MI=",
@@ -1349,7 +1436,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1704008649,
         "narHash": "sha256-rGPSWjXTXTurQN9beuHdyJhB8O761w1Zc5BqSSmHvoM=",
@@ -1362,7 +1449,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1787070829,
         "narHash": "sha256-vXNVDVtvfiQuXthP0NHPFdNvvMTkGpx0UP8oddIWbNk=",
@@ -1378,7 +1465,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1788404924,
         "narHash": "sha256-lhEhY8X5EgkQ/eg6IFz4cc8jRuSYSvnxx1al7d1dvZ0=",
@@ -1394,13 +1481,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_7": {
       "locked": {
-        "lastModified": 1788752844,
+        "lastModified": 1789006805,
-        "narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=",
+        "narHash": "sha256-xB8mKMOx1IA9vTDNLmJZ6n4wCMq/cuWBBOzGCRnqxrU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dc5d91f840324650bac8c379428c7037a416959a",
+        "rev": "8ce4ef6cb6f871616146b9fe26d2a5ae594e94fe",
         "type": "github"
       },
       "original": {
@@ -1410,13 +1497,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_8": {
       "locked": {
-        "lastModified": 1788659161,
+        "lastModified": 1789181251,
-        "narHash": "sha256-rIzUUvgwhfJeWwm7y1ZF+xRo2Gep+QYkxpj9mJbG6cM=",
+        "narHash": "sha256-8yaO1XLoObzYgb6Uj+0IkUxbkCI6kBLuImoZAuAHzB4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "de0ba0a81b0f6eed798a97fdec6f03a754b9d966",
+        "rev": "f496248152e1ad8c61b59a6739cc499b447168e4",
         "type": "github"
       },
       "original": {
@@ -1426,7 +1513,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_9": {
       "locked": {
         "lastModified": 1767892417,
         "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
@@ -1439,34 +1526,18 @@
         "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
       }
     },
-    "nixpkgs_9": {
-      "locked": {
-        "lastModified": 1784856561,
-        "narHash": "sha256-J+Bx1Z6Oeoj2FgnBhRMKyUhhtDoOpTgXYaVLZpDjW4A=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "597283ad8aa0b331c788e97c4c262d58877074ef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-26.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts_4",
-        "nixpkgs": "nixpkgs_12",
+        "nixpkgs": "nixpkgs_13",
-        "systems": "systems_5"
+        "systems": "systems_6"
       },
       "locked": {
-        "lastModified": 1788190018,
+        "lastModified": 1789067777,
-        "narHash": "sha256-59BAfH0txPAZrPBF4QJqwvUWppD+ICrcjA1LZAmPnrQ=",
+        "narHash": "sha256-gN3OnYgJwCK0HX01dQGWusnirJuVHE9WigmSqOnyuCE=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "41844750e55f17b1385d5b09ca7ade5f11f49506",
+        "rev": "16baff93297c63b6d4c497f00ffcf0b844b06fc6",
         "type": "github"
       },
       "original": {
@@ -1502,14 +1573,14 @@
     },
     "omp-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_13"
+        "nixpkgs": "nixpkgs_14"
       },
       "locked": {
-        "lastModified": 1788908668,
+        "lastModified": 1789164289,
-        "narHash": "sha256-fNiU1xCj+F75gJ6z0IMIoPtAUctYTWgo/9XmaeufRw4=",
+        "narHash": "sha256-uozt9mvCE+s5qDDmq+detqwa9JPFFzrHH7JsscMbQ/8=",
         "ref": "main",
-        "rev": "74815c8e77380d18fed16871bdaaba8f6fc80bab",
+        "rev": "25fd85bb7b05744d1aec77c2b93cdfc90474e43b",
-        "revCount": 480,
+        "revCount": 489,
         "type": "git",
         "url": "https://git.molez.org/mandlm/omp-nix"
       },
@@ -1545,7 +1616,7 @@
       "inputs": {
         "libcamera-src": "libcamera-src",
         "libpisp-src": "libpisp-src",
-        "nixpkgs": "nixpkgs_14",
+        "nixpkgs": "nixpkgs_15",
         "rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
         "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
         "rpi-firmware-src": "rpi-firmware-src",
@@ -1568,6 +1639,7 @@
     },
     "root": {
       "inputs": {
+        "barbar": "barbar",
         "den": "den",
         "direnv-instant": "direnv-instant",
         "disko": "disko",
@@ -1588,7 +1660,7 @@
         "nixos-hardware": "nixos-hardware",
         "nixos-raspberrypi": "nixos-raspberrypi",
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_11",
+        "nixpkgs": "nixpkgs_12",
         "nixpkgs-master": "nixpkgs-master",
         "nixvim": "nixvim",
         "omp-nix": "omp-nix",
@@ -1686,6 +1758,27 @@
       }
     },
     "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "barbar",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1788165049,
+        "narHash": "sha256-en4IoUeCqvq9F66YhwOrUFw1nc70OBhrJwrzfalezvY=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "d03cd474bd97389dcc2e8cd3b3bb6b8c6e346b1a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_2": {
       "inputs": {
         "nixpkgs": [
           "iptsd",
@@ -1728,8 +1821,8 @@
     },
     "spicetify-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_15",
+        "nixpkgs": "nixpkgs_16",
-        "systems": "systems_6"
+        "systems": "systems_7"
       },
       "locked": {
         "lastModified": 1788683578,
@@ -1758,7 +1851,7 @@
           "nixpkgs"
         ],
         "nur": "nur",
-        "systems": "systems_7",
+        "systems": "systems_8",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
         "tinted-tmux": "tinted-tmux",
@@ -1794,21 +1887,6 @@
       }
     },
     "systems_2": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_3": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1823,6 +1901,21 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
     "systems_4": {
       "locked": {
         "lastModified": 1681028828,
@@ -1839,6 +1932,21 @@
       }
     },
     "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_6": {
       "flake": false,
       "locked": {
         "lastModified": 1774449309,
@@ -1855,7 +1963,7 @@
         "type": "github"
       }
     },
-    "systems_6": {
+    "systems_7": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1870,7 +1978,7 @@
         "type": "github"
       }
     },
-    "systems_7": {
+    "systems_8": {
       "locked": {
         "lastModified": 1774449309,
         "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
@@ -1973,7 +2081,7 @@
     },
     "utils": {
       "inputs": {
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1731533236,

flake.nix

@@ -3,10 +3,11 @@
   outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./config);
 
   inputs = {
+    barbar.url = "git+https://git.scug.io/doloro/barbar?ref=master";
     den.url = "github:vic/den?ref=8101ec865c0bf4027d40b9fd8951e3e435a86d64";
     direnv-instant.url = "github:Mic92/direnv-instant";
     disko.url = "github:nix-community/disko";
-    flake-file.url = "github:vic/flake-file";
+    flake-file.url = "github:denful/flake-file";
     flake-parts = {
       url = "github:hercules-ci/flake-parts";
       inputs.nixpkgs-lib.follows = "nixpkgs";
@@ -23,7 +24,7 @@
     };
     hyprland.url = "github:hyprwm/Hyprland";
     hytale-launcher.url = "github:JPyke3/hytale-launcher-nix";
-    import-tree.url = "github:vic/import-tree";
+    import-tree.url = "github:denful/import-tree";
     iptsd = {
       url = "git+ssh://git@git.scug.io:/nikkuss/iptsd-rs.git?ref=main";
       inputs.nixpkgs.follows = "nixpkgs";