From bdae9d7696ed086a52f09511662f657f14a04a31 Mon Sep 17 00:00:00 2001
From: Asmir A <asmir.abdulahovic@gmail.com>
Date: Sun, 31 May 2026 11:53:24 +0200
Subject: [PATCH] fuji: sway bar -> quickshell_bar

---
 flake.lock           | 57 +++++++++++++++++++++++++++++++++++++-------
 flake.nix            |  4 ++++
 home/common/sway.nix | 17 ++++---------
 3 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index ad8d5ad..91d058d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -193,11 +193,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769036658,
-        "narHash": "sha256-bia1yOQtC8A7XZRCTdLvY0Bdv4i/V6hMqb0NM/9h/jc=",
+        "lastModified": 1780213167,
+        "narHash": "sha256-50MzkuYn590Tk89/YivGZ8Z8ZtKRXcP+iHqpLv6TYXA=",
         "ref": "refs/heads/master",
-        "rev": "9c1eb1b999522b965ce129043c7112fc9e38c75a",
-        "revCount": 52,
+        "rev": "a5224c23744b0a89e32992442bba4cfaa8464d59",
+        "revCount": 54,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/nvim_flake"
       },
@@ -228,6 +228,46 @@
         "url": "https://git.project-cloud.net/asmir/project-cloud"
       }
     },
+    "quickshell": {
+      "inputs": {
+        "nixpkgs": [
+          "quickshell_bar",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1779430452,
+        "narHash": "sha256-zTslhsxLqUlRTML506iougTGzyR38Fzhzn7t4KDEuuE=",
+        "ref": "refs/heads/master",
+        "rev": "4b4fca3224ab977dc515ac0bb78d00b3dfa71e00",
+        "revCount": 819,
+        "type": "git",
+        "url": "https://git.outfoxxed.me/quickshell/quickshell"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.outfoxxed.me/quickshell/quickshell"
+      }
+    },
+    "quickshell_bar": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2",
+        "quickshell": "quickshell"
+      },
+      "locked": {
+        "lastModified": 1780212524,
+        "narHash": "sha256-r+zAR7SijYiQlanbuOKLEItYXfIOnkyQBPl3QoMWLIg=",
+        "ref": "refs/heads/master",
+        "rev": "f8a4536a02e9ce2d78eabf8df0b7ccc59b8ebb15",
+        "revCount": 1,
+        "type": "git",
+        "url": "https://git.project-cloud.net/asmir/quickshell_bar"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.project-cloud.net/asmir/quickshell_bar"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
@@ -236,6 +276,7 @@
         "nixpkgs": "nixpkgs",
         "nvim": "nvim",
         "project-cloud": "project-cloud",
+        "quickshell_bar": "quickshell_bar",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
         "sops-nix": "sops-nix",
         "swaysw": "swaysw",
@@ -341,11 +382,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764579633,
-        "narHash": "sha256-gOD5RMHOB9Fw4T3nk2a95YdU0J24QU3uWUiZVIQza64=",
+        "lastModified": 1780166195,
+        "narHash": "sha256-kqViUrWwIJP7xVCpcZbRk7IygAw/Tll/UmbcAW9zRPk=",
         "ref": "refs/heads/master",
-        "rev": "b0707744e2b4a077e759145cdbfa8d8d1017e732",
-        "revCount": 25,
+        "rev": "e1aecedf30f3b3cedd89d84364bd7e548a011bcd",
+        "revCount": 26,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/zremap"
       },
diff --git a/flake.nix b/flake.nix
index 47025e1..6bff343 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,6 +20,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    quickshell_bar = {
+      url = "git+https://git.project-cloud.net/asmir/quickshell_bar";
+    };
+
     nvim = {
       url = "git+https://git.project-cloud.net/asmir/nvim_flake";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/home/common/sway.nix b/home/common/sway.nix
index 6207a80..ba194f6 100644
--- a/home/common/sway.nix
+++ b/home/common/sway.nix
@@ -25,6 +25,7 @@ let
     --hooks ''\'systemctl --user restart lisgd.service''\'
   '';
   swaysw = inputs.swaysw.packages.${system}.swaysw;
+  quickshell_bar = inputs.quickshell_bar.packages.${system}.default;
   term = "${pkgs.foot}/bin/footclient";
 in
 {
@@ -92,19 +93,9 @@ in
         };
       };
 
-      bars = [
-        {
-          position = "top";
-          fonts = {
-            names = [
-              "Iosevka"
-              "FontAwesome"
-            ];
-            style = "Bold Semi-Condensed";
-            size = 12.0;
-          };
-          statusCommand = "${lib.getExe pkgs.i3status-rust} ~/.config/i3status-rust/config-top.toml";
-        }
+      bars = [ ];
+      startup = [
+        { command = "exec ${quickshell_bar}/bin/quickshell-bar"; }
       ];
 
       keybindings = {