From 5b99da7effdfd7064526e9c93abe9fd0f31c9822 Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Wed, 13 Nov 2024 23:19:57 +0100 Subject: [PATCH] treewide: add ironbar for niri --- flake.lock | 379 ++++++++++++++++++++---------- flake.nix | 5 +- home/programs/ironbar/default.nix | 36 +++ home/programs/niri/default.nix | 5 + hosts/default.nix | 4 +- hosts/vamos/default.nix | 2 +- modules/default.nix | 2 +- system/programs/fonts.nix | 19 +- 8 files changed, 314 insertions(+), 138 deletions(-) create mode 100644 home/programs/ironbar/default.nix diff --git a/flake.lock b/flake.lock index dcc6c7b..5ae19f5 100644 --- a/flake.lock +++ b/flake.lock @@ -25,15 +25,15 @@ }, "ags": { "inputs": { - "nixpkgs": "nixpkgs", - "systems": "systems_2" + "astal": "astal", + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1728326430, - "narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=", + "lastModified": 1731689198, + "narHash": "sha256-XMFaDht3RHtlwZ7NQKbz2Cd0e4oDMB7syyOd9ifbn98=", "owner": "Aylur", "repo": "ags", - "rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d", + "rev": "3e270c8172ae7b61c5e5f24aea69985f792aa000", "type": "github" }, "original": { @@ -42,6 +42,27 @@ "type": "github" } }, + "astal": { + "inputs": { + "nixpkgs": [ + "ags", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731533099, + "narHash": "sha256-q0JcigMAoz3bJqCJwms5mR2de5J1Cw5NgjCev+2ylDA=", + "owner": "aylur", + "repo": "astal", + "rev": "f7cfc8eb77a395373bf40f83b0d779ece34a6108", + "type": "github" + }, + "original": { + "owner": "aylur", + "repo": "astal", + "type": "github" + } + }, "basix": { "inputs": { "flake-compat": "flake-compat", @@ -49,11 +70,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1727493962, - "narHash": "sha256-9eYh6s5ChKmm2uqsZijk6PCGoyZyEgZ0BJqt+ESDrqU=", + "lastModified": 1731727882, + "narHash": "sha256-GLHrsoW8nrEGU7Oarwkyhtks5YqPvtcTqWl0+dtFqjM=", "owner": "notashelf", "repo": "basix", - "rev": "742cefc42e7fa7bb77f5bd1c3191ff8c8fa8d610", + "rev": "5cdb4c25956c93a192c37572236d0a12b068d7f8", "type": "github" }, "original": { @@ -63,6 +84,21 @@ } }, "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", @@ -134,11 +170,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1731297786, - "narHash": "sha256-YC+FPREQqPF2HNSu1PkvVps5mBzexxvCV6NXfTf/kQI=", + "lastModified": 1731788701, + "narHash": "sha256-M3AwY7SeSjFZh1XA7zL8roVXiEAvb9BVaGoJZ+1rZM8=", "owner": "rycee", "repo": "nur-expressions", - "rev": "85c8db7e7e901f656072b01f89c8fffcab26bfa6", + "rev": "9da3f74ac2cba8d812aef5fe16686afa25033b21", "type": "gitlab" }, "original": { @@ -270,7 +306,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -288,7 +324,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -306,7 +342,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1726560853, @@ -406,11 +442,11 @@ ] }, "locked": { - "lastModified": 1731235328, - "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", + "lastModified": 1731786860, + "narHash": "sha256-130gQ5k8kZlxjBEeLpE+SvWFgSOFgQFeZlqIik7KgtQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "60bb110917844d354f3c18e05450606a435d2d10", + "rev": "1bd5616e33c0c54d7a5b37db94160635a9b27aeb", "type": "github" }, "original": { @@ -419,9 +455,30 @@ "type": "github" } }, - "lanzaboote": { + "ironbar": { "inputs": { "crane": "crane", + "naersk": "naersk", + "nixpkgs": "nixpkgs_5", + "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", "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", "flake-utils": "flake-utils_2", @@ -429,7 +486,7 @@ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1718178907, @@ -479,6 +536,24 @@ } }, "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": [ "nvf", @@ -510,7 +585,7 @@ "nvf", "nixpkgs" ], - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1714571717, @@ -530,17 +605,17 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable_2", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1731340075, - "narHash": "sha256-Ompgm7Rrdcp8MwDNRyq5U8lF9VC4fBBYt0pS7H0l0V0=", + "lastModified": 1731786605, + "narHash": "sha256-Ceq6Vn9cvDh+kXDvLf/U30xUKfV047D/l7G0TvOaink=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a810c547fd00e98b302b52d9ac35c3bee037e4fd", + "rev": "b312712206428678b4602f1255c68df2d3e4534f", "type": "github" }, "original": { @@ -569,11 +644,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1731337661, - "narHash": "sha256-9QXxi0H0+lPUwa82knlj6Yxy79LsYkwxSOBToNxh/xY=", + "lastModified": 1731575130, + "narHash": "sha256-V+bIsYXshtdMv7Ycw1Y/xVfKdWVywXuqHHII7FgV6dg=", "owner": "YaLTeR", "repo": "niri", - "rev": "17861e0003c122dec9ad8cca1177c750ca6390c8", + "rev": "1a0612cbfd0abee0796efa86470226686ae78f21", "type": "github" }, "original": { @@ -589,11 +664,11 @@ ] }, "locked": { - "lastModified": 1731209121, - "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=", + "lastModified": 1731593150, + "narHash": "sha256-FvksinoI2Y6kuwH+cKBu1oDA8uPGfoRqgtQV6O8GDc4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3", + "rev": "40d882b55e89add1ded379cc99edaab24983d6d9", "type": "github" }, "original": { @@ -604,11 +679,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731332224, - "narHash": "sha256-0ctfVp27ingWtY7dbP5+QpSQ98HaOZleU0teyHQUAw0=", + "lastModified": 1731740897, + "narHash": "sha256-teFd31vsE/0Z0WR6XVeKhKPw6Eyb2gXGpG0tjpMfBDM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "184687ae1a3139faa4746168baf071f60d0310c8", + "rev": "c2c275fbb2e656948ba6e1f67b8ddd430f158c5f", "type": "github" }, "original": { @@ -619,15 +694,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", - "owner": "NixOS", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -675,11 +750,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1731239293, - "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", + "lastModified": 1731652201, + "narHash": "sha256-XUO0JKP1hlww0d7mm3kpmIr4hhtR4zicg5Wwes9cPMg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", + "rev": "c21b77913ea840f8bcf9adf4c41cecc2abffd38d", "type": "github" }, "original": { @@ -689,6 +764,38 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1731531548, + "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "24f0d4acd634792badd6470134c387a3b039dace", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "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, @@ -723,37 +830,67 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1730272153, + "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs_5": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", - "owner": "NixOS", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_6": { + "locked": { + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1726871744, "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", @@ -769,7 +906,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { "lastModified": 1656753965, "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", @@ -785,38 +922,6 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1711404521, - "narHash": "sha256-cYhDZ3RYLiXAi4LQDGuQjjDDbtP00Wd/Vjal/jWyTuA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "07518c851b0f12351d7709274bbbd4ecc1f089c7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "07518c851b0f12351d7709274bbbd4ecc1f089c7", - "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": { @@ -839,7 +944,7 @@ "flake-utils": "flake-utils_3", "mnw": "mnw", "nil": "nil", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_8", "nmd": "nmd", "plugin-alpha-nvim": "plugin-alpha-nvim", "plugin-bufdelete-nvim": "plugin-bufdelete-nvim", @@ -944,7 +1049,7 @@ "plugin-vim-vsnip": "plugin-vim-vsnip", "plugin-which-key": "plugin-which-key", "rnix-lsp": "rnix-lsp", - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1731058322, @@ -2618,14 +2723,15 @@ }, "portfolio": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_10", + "sam-zola": "sam-zola" }, "locked": { - "lastModified": 1730891412, - "narHash": "sha256-EEXp1jQMoA7off1ioqB5aJM1a5ZfGS6KQVsYSZ/ub78=", + "lastModified": 1731578190, + "narHash": "sha256-9T5+xa1Qz4iJn31oq3q4T5JLr4bx3KHolwtPx1EBvlk=", "owner": "nezia1", "repo": "portfolio", - "rev": "082cc68c67deead967bf177d048995c6a27ef84e", + "rev": "34130f9c530d0f009865a443bef40531ef9b3dbe", "type": "github" }, "original": { @@ -2663,8 +2769,8 @@ }, "rnix-lsp": { "inputs": { - "naersk": "naersk", - "nixpkgs": "nixpkgs_7", + "naersk": "naersk_2", + "nixpkgs": "nixpkgs_9", "utils": "utils_2" }, "locked": { @@ -2689,20 +2795,42 @@ "deploy-rs": "deploy-rs", "firefox-addons": "firefox-addons", "home-manager": "home-manager_2", + "ironbar": "ironbar", "lanzaboote": "lanzaboote", "niri": "niri", "nix-index-db": "nix-index-db", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "nvf": "nvf", "plasma-manager": "plasma-manager", "portfolio": "portfolio", - "systems": "systems_7", + "systems": "systems_6", "treefmt-nix": "treefmt-nix", "wezterm": "wezterm" } }, "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", @@ -2727,7 +2855,7 @@ "type": "github" } }, - "rust-overlay_2": { + "rust-overlay_3": { "inputs": { "flake-utils": [ "nvf", @@ -2754,7 +2882,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_4": { "inputs": { "nixpkgs": [ "wezterm", @@ -2775,6 +2903,22 @@ "type": "github" } }, + "sam-zola": { + "flake": false, + "locked": { + "lastModified": 1612976548, + "narHash": "sha256-ut1NiSM0GooRrHFikvuTCLU2XhpplhFQejFSbTa9ZdU=", + "owner": "janbaudisch", + "repo": "zola-sam", + "rev": "890b51b4105fd2e63f5e417e5cb63b8e25d5721f", + "type": "github" + }, + "original": { + "owner": "janbaudisch", + "repo": "zola-sam", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -2792,16 +2936,16 @@ }, "systems_2": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -2851,21 +2995,6 @@ } }, "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" - } - }, - "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -2880,7 +3009,7 @@ "type": "github" } }, - "systems_8": { + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2897,7 +3026,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1730321837, @@ -2915,7 +3044,7 @@ }, "utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1701680307, @@ -2955,16 +3084,16 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_3", + "rust-overlay": "rust-overlay_4", "zlib": "zlib" }, "locked": { "dir": "nix", - "lastModified": 1730734444, - "narHash": "sha256-lNgCAphrq3/bYGjgDxEl2rVcer6GnmfWXDhxc+kdYOk=", + "lastModified": 1731625276, + "narHash": "sha256-NbgX4nfGJYFflQauJZMTJrpgTD5oY3hgs+KNE3JJgSc=", "owner": "wez", "repo": "wezterm", - "rev": "51c794ac500a2033b9dc570c71810518bfa667a9", + "rev": "979df7826965348345a3305ed889a4b9aef838e1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0a6b284..881a991 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system}); treefmtEval = eachSystem (pkgs: treefmt-nix.lib.evalModule pkgs ./treefmt.nix); in { + imports = [./modules]; devShells = eachSystem (pkgs: { default = pkgs.mkShell { packages = [ @@ -24,7 +25,6 @@ }; }); formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper); - nixosModules = import ./modules; nixosConfigurations = let lib' = import ./lib {inherit inputs lib';}; in @@ -58,15 +58,14 @@ ags.url = "github:Aylur/ags"; basix.url = "github:notashelf/basix"; deploy-rs.url = "github:serokell/deploy-rs"; + ironbar.url = "github:JakeStanger/ironbar"; firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; }; niri.url = "github:sodiboo/niri-flake"; nvf.url = "github:notashelf/nvf"; - portfolio.url = "github:nezia1/portfolio"; - plasma-manager = { url = "github:nix-community/plasma-manager"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/programs/ironbar/default.nix b/home/programs/ironbar/default.nix new file mode 100644 index 0000000..a45edc8 --- /dev/null +++ b/home/programs/ironbar/default.nix @@ -0,0 +1,36 @@ +{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/niri/default.nix b/home/programs/niri/default.nix index 700416d..e77ab14 100644 --- a/home/programs/niri/default.nix +++ b/home/programs/niri/default.nix @@ -7,6 +7,7 @@ ... }: let colors = inputs.basix.schemeData.base16.${osConfig.theme.scheme}.palette; + inherit (lib) getExe mkIf; in { imports = [./binds.nix]; @@ -91,6 +92,10 @@ in { "DISPLAY" = ":0"; "_JAVA_AWT_WM_NONREPARENTING" = "1"; # https://wiki.archlinux.org/title/Sway#Java_applications }; + + spawn-at-startup = [ + (mkIf config.programs.ironbar.enable {command = [(getExe inputs.ironbar.packages.${pkgs.system}.default)];}) + ]; }; }; diff --git a/hosts/default.nix b/hosts/default.nix index 556e606..06acffc 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -9,7 +9,7 @@ in { system = "x86_64-linux"; modules = [ ./vamos - inputs.self.nixosModules.theme + ../modules inputs.nixos-hardware.nixosModules.framework-13-7040-amd ]; }; @@ -18,7 +18,7 @@ in { system = "x86_64-linux"; modules = [ ./solaire - inputs.self.nixosModules.theme + ../modules ]; }; diff --git a/hosts/vamos/default.nix b/hosts/vamos/default.nix index 7d97a90..5ad95f4 100644 --- a/hosts/vamos/default.nix +++ b/hosts/vamos/default.nix @@ -28,7 +28,7 @@ in { "${home}/services/udiskie.nix" "${home}/programs/niri" - "${home}/programs/ags" + "${home}/programs/ironbar" "${home}/programs/fuzzel.nix" "${home}/programs/swaybg.nix" "${home}/programs/swaylock.nix" diff --git a/modules/default.nix b/modules/default.nix index 5bca15b..eecd825 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,3 +1,3 @@ { - theme = import ./theme; + imports = [./theme]; } diff --git a/system/programs/fonts.nix b/system/programs/fonts.nix index cf12b2d..35941ba 100644 --- a/system/programs/fonts.nix +++ b/system/programs/fonts.nix @@ -1,19 +1,26 @@ {pkgs, ...}: { fonts = { + fontDir = { + enable = true; + decompressFonts = true; + }; packages = with pkgs; [ noto-fonts noto-fonts-cjk-sans noto-fonts-emoji noto-fonts-extra - (nerdfonts.override {fonts = ["IntelOneMono"];}) + intel-one-mono ]; enableDefaultPackages = false; - fontconfig.defaultFonts = { - serif = ["Noto Serif"]; - sansSerif = ["Inter"]; - monospace = ["IntoneMono NF"]; - emoji = ["Noto Color Emoji"]; + fontconfig = { + enable = true; + defaultFonts = { + serif = ["Noto Serif"]; + sansSerif = ["Inter Medium"]; + monospace = ["Intel One Mono"]; + emoji = ["Noto Color Emoji"]; + }; }; }; }