diff --git a/flake.lock b/flake.lock index 50ec69f..c7c5b6b 100644 --- a/flake.lock +++ b/flake.lock @@ -41,27 +41,6 @@ "type": "github" } }, - "crane": { - "inputs": { - "nixpkgs": [ - "ironbar", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717025063, - "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=", - "owner": "ipetkov", - "repo": "crane", - "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -107,7 +86,7 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixvim", "nixpkgs" @@ -198,24 +177,6 @@ "inputs": { "systems": "systems_3" }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_4" - }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -230,9 +191,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1701680307, @@ -522,47 +483,6 @@ "type": "github" } }, - "ironbar": { - "inputs": { - "crane": "crane", - "naersk": "naersk", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1719310238, - "narHash": "sha256-AFqooELYPC+0k8IbDMpFjBbyFYarlA8SV2DWvHtzr+g=", - "owner": "JakeStanger", - "repo": "ironbar", - "rev": "6a06fa534a8f02aa1fa3fe04a9da59697a3fff25", - "type": "github" - }, - "original": { - "owner": "JakeStanger", - "repo": "ironbar", - "type": "github" - } - }, - "naersk": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1717067539, - "narHash": "sha256-oIs5EF+6VpHJRvvpVWuqCYJMMVW/6h59aYUv9lABLtY=", - "owner": "nix-community", - "repo": "naersk", - "rev": "fa19d8c135e776dc97f4dcca08656a0eeb28d5c0", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -587,8 +507,8 @@ "nix-vscode-extensions": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_4" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1719451583, @@ -637,20 +557,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1717112898, - "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1713805509, "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=", @@ -666,7 +572,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1719426051, "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", @@ -681,7 +587,7 @@ "type": "indirect" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1718428119, "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", @@ -747,41 +653,18 @@ "darwin": "darwin_2", "home-manager": "home-manager_2", "hyprland": "hyprland", - "ironbar": "ironbar", "nix-vscode-extensions": "nix-vscode-extensions", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixvim": "nixvim", "nur": "nur", - "rust-overlay": "rust-overlay_2", + "rust-overlay": "rust-overlay", "unstable": "unstable", "utils": "utils" } }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "ironbar", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717121863, - "narHash": "sha256-/3sxIe7MZqF/jw1RTQCSmgTjwVod43mmrk84m50MJQ4=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "2a7b53172ed08f856b8382d7dcfd36a4e0cbd866", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1719454714, @@ -872,21 +755,6 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -925,7 +793,7 @@ }, "utils": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, diff --git a/flake.nix b/flake.nix index 2d7acaa..e53b77b 100644 --- a/flake.nix +++ b/flake.nix @@ -25,10 +25,6 @@ rust-overlay.url = "github:oxalica/rust-overlay"; nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - ironbar = { - url = "github:JakeStanger/ironbar"; - inputs.nixpkgs.follows = "nixpkgs"; - }; ags.url = "github:Aylur/ags"; agenix = { url = "github:ryantm/agenix"; diff --git a/user/modules/ironbar/default.nix b/user/modules/ironbar/default.nix deleted file mode 100644 index 4304611..0000000 --- a/user/modules/ironbar/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - inputs, - lib, - ... -}: { - imports = [ - inputs.ironbar.homeManagerModules.default - ]; - - programs.ironbar = { - enable = true; - config = { - "anchor_to_edges" = true; - position = "top"; - start = [ - { - "type" = "workspaces"; - "all_monitors" = false; - # "name_map" = { - # "1" = "󰙯"; - # "2" = "icon:firefox"; - # "3" = ""; - # "Games" = "icon:steam"; - # "Code" = ""; - # }; - favorites = map (x: toString x) (lib.lists.range 1 8); - } - ]; - center = [ - { - type = "clock"; - } - ]; - end = [ - { - type = "volume"; - format = "{icon}"; - max_volume = 100; - icons = { - volume_high = "󰕾"; - volume_medium = "󰖀"; - volume_low = "󰕿"; - muted = "󰝟"; - }; - } - { - type = "notifications"; - show_count = true; - icons = { - closed_none = "󰍥"; - closed_some = "󱥂"; - closed_dnd = "󱅯"; - open_none = "󰍡"; - open_some = "󱥁"; - open_dnd = "󱅮"; - }; - } - ]; - }; - style = ""; - # package = inputs.ironbar; - systemd = false; - }; - - systemd.user.services.ironbar = { - Unit = { - Description = "Systemd service for Ironbar"; - Requires = ["graphical-session.target"]; - }; - - Service = { - Type = "simple"; - ExecStart = "${inputs.ironbar}/bin/ironbar"; - }; - - Install.WantedBy = [ - "hyprland-session.target" - ]; - }; -}