diff --git a/flake.lock b/flake.lock index 47c7445..3555736 100644 --- a/flake.lock +++ b/flake.lock @@ -1,70 +1,5 @@ { "nodes": { - "ags": { - "inputs": { - "astal": "astal", - "nixpkgs": [ - "hyprpanel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744557573, - "narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=", - "owner": "aylur", - "repo": "ags", - "rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "ags", - "type": "github" - } - }, - "astal": { - "inputs": { - "nixpkgs": [ - "hyprpanel", - "ags", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1742571008, - "narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=", - "owner": "aylur", - "repo": "astal", - "rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, - "astal_2": { - "inputs": { - "nixpkgs": [ - "hyprpanel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748416910, - "narHash": "sha256-FEQcs58HL8Fe4i7XlqVEUwthjxwvRvgX15gTTfW17sU=", - "owner": "aylur", - "repo": "astal", - "rev": "c1bd89a47c81c66ab5fc6872db5a916c0433fb89", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, "blobs": { "flake": false, "locked": { @@ -86,11 +21,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748080874, - "narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=", + "lastModified": 1750153510, + "narHash": "sha256-NYHXXJZ9m4fJpKk9tKn/EExX87SqcBcRINOGF7hKRLI=", "owner": "catppuccin", "repo": "nix", - "rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112", + "rev": "4e95eaf8a351956d75cc400318579967ca2b6d0f", "type": "github" }, "original": { @@ -168,11 +103,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1748772835, - "narHash": "sha256-p/hGSN1DOU/pELQi5PTds8eL+czjmb/0RvwvLm7nGC8=", + "lastModified": 1750918833, + "narHash": "sha256-c87JpXIPSJP+Yyax+BydEKI5D8asFPR90BRQEp4DCgw=", "owner": "rishabh5321", "repo": "grayjay-flake", - "rev": "998cbc285d936a45daf07414d03db3f60c133caa", + "rev": "986c42094f9be9bcc18d09da9e2ee89b706f7801", "type": "github" }, "original": { @@ -188,11 +123,11 @@ ] }, "locked": { - "lastModified": 1748665073, - "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", + "lastModified": 1750792728, + "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", "owner": "nix-community", "repo": "home-manager", - "rev": "282e1e029cb6ab4811114fc85110613d72771dea", + "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", "type": "github" }, "original": { @@ -223,26 +158,6 @@ "type": "github" } }, - "hyprpanel": { - "inputs": { - "ags": "ags", - "astal": "astal_2", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1748962037, - "narHash": "sha256-MkrOyZ6CqTzzmlfmvkPiezy51hG96xqucrR38xQpK/0=", - "owner": "Jas-SinghFSU", - "repo": "HyprPanel", - "rev": "8422c6b80526f8289a30b93cb5b354d9f007141d", - "type": "github" - }, - "original": { - "owner": "Jas-SinghFSU", - "repo": "HyprPanel", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1744463964, @@ -277,11 +192,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1748889542, - "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=", + "lastModified": 1750838302, + "narHash": "sha256-aVkL3/yu50oQzi2YuKo0ceiCypVZpZXYd2P2p1FMJM4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922", + "rev": "7284e2decc982b81a296ab35aa46e804baaa1cfe", "type": "github" }, "original": { @@ -293,11 +208,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -309,11 +224,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -325,27 +240,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1748370509, - "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1748889542, - "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=", + "lastModified": 1750838302, + "narHash": "sha256-aVkL3/yu50oQzi2YuKo0ceiCypVZpZXYd2P2p1FMJM4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922", + "rev": "7284e2decc982b81a296ab35aa46e804baaa1cfe", "type": "github" }, "original": { @@ -355,7 +254,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1747179050, "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", @@ -371,7 +270,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1743448293, "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", @@ -392,8 +291,7 @@ "catppuccin": "catppuccin", "grayjay": "grayjay", "home-manager": "home-manager", - "hyprpanel": "hyprpanel", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "simple-nixos-mailserver": "simple-nixos-mailserver", @@ -407,7 +305,7 @@ "blobs": "blobs", "flake-compat": "flake-compat", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { @@ -432,11 +330,11 @@ ] }, "locked": { - "lastModified": 1747603214, - "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", + "lastModified": 1750119275, + "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=", "owner": "mic92", "repo": "sops-nix", - "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", + "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2", "type": "github" }, "original": { @@ -453,11 +351,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1748752728, - "narHash": "sha256-en008ncPUQjVx2i3PbM4RWeZkD9DNbJwIy0epppXe2o=", + "lastModified": 1750567035, + "narHash": "sha256-GVNXxMZynKZt+83QQQEVXscqtkJbScvaBrwianovUW4=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "0e03de40d5128eb2ad600c98f57cf5db2cdf3240", + "rev": "e32285f5d1dfc184b039a813644e226c3914e7d7", "type": "github" }, "original": { @@ -484,14 +382,14 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1748920570, - "narHash": "sha256-m7EshkqPxa3IxN/qwxP1LlMlRdn37aiK0hghDieho8A=", + "lastModified": 1750907909, + "narHash": "sha256-2WzRZLFUlu13iRGsP+tsaJhCOUESmL8gKtT7zY14TzE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "ff5bf0bcf588e8c1d0f5fcd635b0c8e1cce8aee5", + "rev": "ac0fcd7e963dce814b69cbedc4d510a95094cc15", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f2fda50..37e1fa8 100644 --- a/flake.nix +++ b/flake.nix @@ -29,8 +29,6 @@ }; # Catppuccin theming catppuccin.url = "github:catppuccin/nix"; - # Bar - hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05"; # Spotify spicetify-nix = { @@ -48,7 +46,6 @@ self, nixpkgs, home-manager, - simple-nixos-mailserver, ... }@inputs: let @@ -179,9 +176,7 @@ }; } { - nixpkgs.overlays = with inputs; [ - hyprpanel.overlay - ]; + nixpkgs.overlays = [ ]; } ]; }; diff --git a/shared/desktop/home-manager/hyprland/hyprpanel/default.nix b/shared/desktop/home-manager/hyprland/hyprpanel/default.nix index d8d2637..ccf4f60 100644 --- a/shared/desktop/home-manager/hyprland/hyprpanel/default.nix +++ b/shared/desktop/home-manager/hyprland/hyprpanel/default.nix @@ -1,6 +1,5 @@ { pkgs, - inputs, common, theme, lib, @@ -8,28 +7,10 @@ }: { - imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ]; + wayland.windowManager.hyprland.settings.exec-once = [ "hyprpanel" ]; programs.hyprpanel = { enable = true; - # Add hyprpanel to the Hyprland config 'exec-once'. - hyprland.enable = true; - # Fix the overwrite issue with HyprPanel. - overwrite.enable = true; - - # Override the final config with an arbitrary set. - # Useful for overriding colors in your selected theme. - # TODO fixes theming bugs in recent versions, should be removed when fixed - override = { - theme = { - bar.transparent = true; - font = { - name = "${theme.nerdFont} NF"; - size = "15px"; - }; - }; - }; - # Configure and theme almost all options from the GUI. # Options that require '{}' or '[]' are not yet implemented, # except for the layout above. @@ -56,24 +37,22 @@ }; # Configure bar layouts for monitors. - layout = { - "bar.layouts" = { - "*" = { - left = [ - "dashboard" - "workspaces" - "windowtitle" - ]; - middle = [ "media" ]; - right = [ - "kbinput" - "volume" - "network" - "systray" - "clock" - "notifications" - ]; - }; + bar.layouts = { + "*" = { + left = [ + "dashboard" + "workspaces" + "windowtitle" + ]; + middle = [ "media" ]; + right = [ + "kbinput" + "volume" + "network" + "systray" + "clock" + "notifications" + ]; }; }; @@ -117,7 +96,7 @@ bar.transparent = true; font = { name = "${theme.nerdFont} NF"; - size = "16px"; + size = "15px"; }; };