diff --git a/flake.lock b/flake.lock index 605e372..ae0b6f4 100644 --- a/flake.lock +++ b/flake.lock @@ -38,21 +38,6 @@ "type": "github" } }, - "crane": { - "locked": { - "lastModified": 1765739568, - "narHash": "sha256-gQYx35Of4UDKUjAYvmxjUEh/DdszYeTtT6MDin4loGE=", - "owner": "ipetkov", - "repo": "crane", - "rev": "67d2baff0f9f677af35db61b32b5df6863bcc075", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -81,11 +66,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1767585814, - "narHash": "sha256-7iodv57Ppq05AHVKnS9/IdhhgBYTVpTDZmz2u2enr/E=", + "lastModified": 1767931411, + "narHash": "sha256-/SLSxYFoqDGguH0xaXiCdV5/eeBIeJBBvJxl4jnJgtA=", "owner": "rycee", "repo": "nur-expressions", - "rev": "66bfeb87deb83ca2f9fa2045704b72de52c6433a", + "rev": "45d1193599ec23b4ea0e18d8db76f777095a908e", "type": "gitlab" }, "original": { @@ -95,24 +80,6 @@ "type": "gitlab" } }, - "flake-utils": { - "inputs": { - "systems": "systems_3" - }, - "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" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -141,11 +108,11 @@ ] }, "locked": { - "lastModified": 1767556355, - "narHash": "sha256-RDTUBDQBi9D4eD9iJQWtUDN/13MDLX+KmE+TwwNUp2s=", + "lastModified": 1767930051, + "narHash": "sha256-YXtqo8h5bAbqC64XAPMMsZdYk8XkwkyNj/7XOsIyVf8=", "owner": "nix-community", "repo": "home-manager", - "rev": "f894bc4ffde179d178d8deb374fcf9855d1a82b7", + "rev": "297a08510894822ddd93ee2cfc66d6ac65a3cebb", "type": "github" }, "original": { @@ -200,11 +167,11 @@ ] }, "locked": { - "lastModified": 1767028240, - "narHash": "sha256-0/fLUqwJ4Z774muguUyn5t8AQ6wyxlNbHexpje+5hRo=", + "lastModified": 1767718503, + "narHash": "sha256-V+VkFs0aSG0ca8p/N3gib7FAf4cq9jyr5Gm+ZBrHQpo=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c31afa6e76da9bbc7c9295e39c7de9fca1071ea1", + "rev": "9f48ffaca1f44b3e590976b4da8666a9e86e6eb1", "type": "github" }, "original": { @@ -250,11 +217,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1767480499, - "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", + "lastModified": 1767799921, + "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92", + "rev": "d351d0653aeb7877273920cd3e823994e7579b0b", "type": "github" }, "original": { @@ -352,22 +319,6 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1765934234, - "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "af84f9d270d404c17699522fab95bbf928a2d92f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -379,8 +330,7 @@ "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable", "zellij-switch": "zellij-switch", - "zen-browser": "zen-browser", - "zjstatus": "zjstatus" + "zen-browser": "zen-browser" } }, "rust-overlay": { @@ -401,27 +351,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "zjstatus", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1765939271, - "narHash": "sha256-7F/d+ZrTYyOxnBZcleQZjOOEWc1IMXR/CLLRLLsVtHo=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "8028944c1339469124639da276d403d8ab7929a8", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -452,21 +381,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" - } - }, "zellij-switch": { "inputs": { "nixpkgs": "nixpkgs_5", @@ -493,11 +407,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1767568852, - "narHash": "sha256-6s8hL3YX9zAq2T7qvcwwzaEVwc9MEYbW+C2LcAAQfbk=", + "lastModified": 1767763594, + "narHash": "sha256-5ysv8EuVAgDoYmNuXEUNf7vBzdeRaFxeIlIndv5HMvs=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "350c729b261e6f5529460140a5f0943dd4c5e156", + "rev": "8b2302d8c10369c9135552cc892da75cff5ddb03", "type": "github" }, "original": { @@ -505,27 +419,6 @@ "repo": "zen-browser-flake", "type": "github" } - }, - "zjstatus": { - "inputs": { - "crane": "crane", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_8", - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1766016463, - "narHash": "sha256-aWp608krMtk5I+c3GXyuHkb6ugah40cBI0R52fNqMiI=", - "owner": "dj95", - "repo": "zjstatus", - "rev": "9a4b88fdceee8eb2b8c28111c53e94254d61c994", - "type": "github" - }, - "original": { - "owner": "dj95", - "repo": "zjstatus", - "type": "github" - } } }, "root": "root", diff --git a/modules/zellij/default.nix b/modules/zellij/default.nix index e5ea8bd..fafe586 100644 --- a/modules/zellij/default.nix +++ b/modules/zellij/default.nix @@ -4,9 +4,9 @@ source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dev/nix-config/modules/zellij/config.kdl"; }; - xdg.configFile."zellij/layouts/default.kdl" = { - source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dev/nix-config/modules/zellij/layouts/default.kdl"; - }; + # xdg.configFile."zellij/layouts/default.kdl" = { + # source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dev/nix-config/modules/zellij/layouts/default.kdl"; + # }; programs.zellij = { enable = true; diff --git a/modules/zellij/layouts/default.kdl b/modules/zellij/layouts/default.kdl deleted file mode 100644 index 4c5bd38..0000000 --- a/modules/zellij/layouts/default.kdl +++ /dev/null @@ -1,55 +0,0 @@ -layout { - default_tab_template { - children - pane size=1 borderless=false { - plugin location="https://github.com/dj95/zjstatus/releases/latest/download/zjstatus.wasm" { - color_fg "#ffffff" - color_fg_alt "#bf8a9f" - color_fg_dim "#807c9f" - color_bg "#0f0b15" - color_bg_secondary "#1d202f" - color_grey "#807c9f" - color_grey_bright "#807c9f" - color_red "#f47359" - color_red_bright "#ff6a7a" - color_red_subtle_bg "#67182f" - color_green "#29a444" - color_green_bright "#00a392" - color_green_subtle_bg "#10452f" - color_yellow "#b58a52" - color_yellow_bright "#df9080" - color_yellow_brighter "#FCC1B6" - color_yellow_subtle_bg "#54362a" - color_blue "#3f95f6" - color_blue_bright "#029fff" - color_blue_subtle_bg "#2a346e" - color_blue_subtle_dark_bg "#003045" - color_magenta "#d369af" - color_magenta_bright "#af85ea" - color_magenta_brighter "#c57faf" - color_magenta_subtle_bg "#572454" - color_magenta_subtle_bg_darker "#331531" - color_cyan "#4fbaef" - color_cyan_bright "#35afbf" - color_cyan_subtle_bg "#133d56" - color_silver "#b8c6d5" - color_silver_bright "#ffffff" - - format_left "#[bg=$bg_secondary]{tabs}" - format_center "" - format_right "#[fg=$magenta_brighter,italic][{session}] " - - tab_normal "#[fg=$fg_dim][{index}] {name}" - tab_normal_fullscreen "#[fg=$fg_dim][{index}] {name} [Z]" - tab_normal_sync "#[fg=$fg_dim][{index}] {name} [S]" - - tab_active "#[fg=$magenta_brighter,bold][{index}] {name}" - tab_active_fullscreen "#[fg=$magenta_brighter,bold][{index}] {name} [Z]" - tab_active_sync "#[fg=$magenta_brighter,bold][{index}] {name} [S]" - - tab_rename "#[fg=$cyan_bright]{name}" - tab_separator "#[fg=$fg_dim] | " - } - } - } - }