diff --git a/flake.lock b/flake.lock index b4c2e33..703d17a 100644 --- a/flake.lock +++ b/flake.lock @@ -84,21 +84,6 @@ } }, "crane": { - "locked": { - "lastModified": 1730060262, - "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", - "owner": "ipetkov", - "repo": "crane", - "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -455,32 +440,9 @@ "type": "github" } }, - "ironbar": { - "inputs": { - "crane": "crane", - "naersk": "naersk", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1731790092, - "narHash": "sha256-qO4282Y6iw5z37LuQQ8P5LVy7ZOZFFE7Ch/tP8Y/mWw=", - "owner": "JakeStanger", - "repo": "ironbar", - "rev": "42e25f5ef2ce9886d8fafb42aff9ced7ef183726", - "type": "github" - }, - "original": { - "owner": "JakeStanger", - "repo": "ironbar", - "type": "github" - } - }, "lanzaboote": { "inputs": { - "crane": "crane_2", + "crane": "crane", "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", "flake-utils": "flake-utils_2", @@ -488,7 +450,7 @@ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1718178907, @@ -538,24 +500,6 @@ } }, "naersk": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1721727458, - "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=", - "owner": "nix-community", - "repo": "naersk", - "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, - "naersk_2": { "inputs": { "nixpkgs": [ "neovim-flake", @@ -611,7 +555,7 @@ "nvf", "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1714571717, @@ -631,7 +575,7 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable_2", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -790,22 +734,6 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1726871744, - "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1715266358, @@ -839,20 +767,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1730272153, - "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1726871744, "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", @@ -868,7 +782,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1656753965, "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", @@ -884,7 +798,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1731676054, "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", @@ -900,7 +814,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1731319897, "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", @@ -916,7 +830,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1731531548, "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", @@ -932,6 +846,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1726871744, + "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nmd": { "flake": false, "locked": { @@ -954,7 +884,7 @@ "flake-utils": "flake-utils_3", "mnw": "mnw", "nil": "nil", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nmd": "nmd", "plugin-alpha-nvim": "plugin-alpha-nvim", "plugin-bufdelete-nvim": "plugin-bufdelete-nvim", @@ -2733,7 +2663,7 @@ }, "portfolio": { "inputs": { - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "sam-zola": "sam-zola" }, "locked": { @@ -2779,8 +2709,8 @@ }, "rnix-lsp": { "inputs": { - "naersk": "naersk_2", - "nixpkgs": "nixpkgs_6", + "naersk": "naersk", + "nixpkgs": "nixpkgs_5", "utils": "utils_2" }, "locked": { @@ -2805,13 +2735,12 @@ "deploy-rs": "deploy-rs", "firefox-addons": "firefox-addons", "home-manager": "home-manager_2", - "ironbar": "ironbar", "lanzaboote": "lanzaboote", "neovim-flake": "neovim-flake", "niri": "niri", "nix-index-db": "nix-index-db", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "plasma-manager": "plasma-manager", "portfolio": "portfolio", "systems": "systems_6", @@ -2820,27 +2749,6 @@ } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "ironbar", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730341826, - "narHash": "sha256-RFaeY7EWzXOmAL2IQEACbnrEza3TgD5UQApHR4hGHhY=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "815d1b3ee71716fc91a7bd149801e1f04d45fbc5", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "flake-utils": [ "lanzaboote", @@ -2865,7 +2773,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_2": { "inputs": { "flake-utils": [ "neovim-flake", @@ -2894,7 +2802,7 @@ "type": "github" } }, - "rust-overlay_4": { + "rust-overlay_3": { "inputs": { "nixpkgs": [ "wezterm", @@ -3038,7 +2946,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1730321837, @@ -3096,7 +3004,7 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_4", + "rust-overlay": "rust-overlay_3", "zlib": "zlib" }, "locked": { diff --git a/flake.nix b/flake.nix index 6ee7a15..2dedbb2 100644 --- a/flake.nix +++ b/flake.nix @@ -58,10 +58,6 @@ ags.url = "github:Aylur/ags"; basix.url = "github:notashelf/basix"; deploy-rs.url = "github:serokell/deploy-rs"; - ironbar = { - url = "github:JakeStanger/ironbar"; - inputs.nixpkgs.follows = "nixpkgs"; - }; firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/programs/ironbar/default.nix b/home/programs/ironbar/default.nix deleted file mode 100644 index a45edc8..0000000 --- a/home/programs/ironbar/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{inputs, ...}: { - imports = [inputs.ironbar.homeManagerModules.default]; - programs.ironbar = { - enable = true; - systemd = true; - config = { - position = "top"; - anchor_to_edges = true; - center = [ - { - type = "focused"; - show_icon = true; - show_title = true; - icon_size = 20; - truncate = "end"; - } - ]; - end = [ - {type = "volume";} - {type = "clock";} - {type = "tray";} - ]; - }; - style = '' - .tray { - margin-top: 5px; - padding: 10px; - border-radius: 50px; - } - .tray .item { - border-radius: 50px; - min-height: 25px; - padding: 0; - ''; - }; -} diff --git a/home/programs/waybar/style.nix b/home/programs/waybar/style.nix index 74174cd..2b7f276 100644 --- a/home/programs/waybar/style.nix +++ b/home/programs/waybar/style.nix @@ -42,7 +42,7 @@ in { #workspaces, .modules-right box { background: @base02; - padding: 0.15em 0.25; + padding: 0.15em 0.25em; border-radius: 1em; margin: 0 0.25em; }