diff --git a/flake.lock b/flake.lock index ae78299..ca514e0 100644 --- a/flake.lock +++ b/flake.lock @@ -1,49 +1,5 @@ { "nodes": { - "ags": { - "inputs": { - "astal": "astal", - "nixpkgs": [ - "hyprpanel-stable-nixos", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736090999, - "narHash": "sha256-B5CJuHqfJrzPa7tObK0H9669/EClSHpa/P7B9EuvElU=", - "owner": "aylur", - "repo": "ags", - "rev": "5527c3c07d92c11e04e7fd99d58429493dba7e3c", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "ags", - "type": "github" - } - }, - "astal": { - "inputs": { - "nixpkgs": [ - "hyprpanel-stable-nixos", - "ags", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735172721, - "narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=", - "owner": "aylur", - "repo": "astal", - "rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -228,6 +184,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "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" + } + }, "fromYaml": { "flake": false, "locked": { @@ -310,6 +284,48 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "hyprpanel-stable-nixos", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750798083, + "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager-stable-nixos": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751468302, + "narHash": "sha256-tWosziZTT039x6PgEZUhzGlV8oLvdDmIgKTE8ESMaEA=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "501cfec8277f931a9c9af9f23d3105c537faeafe", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-25.05", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "stylix-stable-nixos", @@ -331,28 +347,7 @@ "type": "github" } }, - "home-manager-stable-nixos": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750704637, - "narHash": "sha256-PHhDLtkEBkH+ee27YCsMziijpbypsRGDTuOuz6mG7iE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "873c5b2dc5c9387bf67e59a12abc4de12a4b8697", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "873c5b2dc5c9387bf67e59a12abc4de12a4b8697", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { + "home-manager_3": { "inputs": { "nixpkgs": [ "zen-browser-stable-nixos", @@ -375,21 +370,21 @@ }, "hyprpanel-stable-nixos": { "inputs": { - "ags": "ags", + "flake-utils": "flake-utils", + "home-manager": "home-manager", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748284447, - "narHash": "sha256-99/GrZHZ+e8MLgUvEqLM0tXlVbgKBEYuGMHTigjYgvQ=", + "lastModified": 1751528316, + "narHash": "sha256-MGJmxnjlERXJLDywrSHYSgpt7fhh3/HOHQboRrxDW64=", "owner": "Jas-SinghFSU", - "repo": "HyprPanel", - "rev": "436dcbfcf2458784203d83c4b96e7b0c3fb66762", + "repo": "Hyprpanel", + "rev": "343c9857bd7f1d302d591e8d5f3f9952dc84775b", "type": "github" }, "original": { "owner": "Jas-SinghFSU", - "repo": "HyprPanel", - "rev": "436dcbfcf2458784203d83c4b96e7b0c3fb66762", + "repo": "Hyprpanel", "type": "github" } }, @@ -524,11 +519,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -556,11 +551,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751472477, - "narHash": "sha256-DpGMd/4DAawRGegP8ISHHbpARRhDS2ABwjiLTAjO7Uk=", + "lastModified": 1751498133, + "narHash": "sha256-QWJ+NQbMU+NcU2xiyo7SNox1fAuwksGlQhpzBl76g1I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b32441ec0fae600e647cf4e6d6c245286a583106", + "rev": "d55716bb59b91ae9d1ced4b1ccdea7a442ecbfdb", "type": "github" }, "original": { @@ -640,12 +635,12 @@ "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "nixpkgs": [ "nixpkgs" ], "nur": "nur", - "systems": "systems", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -682,6 +677,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -809,17 +819,17 @@ }, "zen-browser-stable-nixos": { "inputs": { - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1751466296, - "narHash": "sha256-64N3qvaJOMYdm96pvvV+7/v1vehYIG7PBDDUrnh/CeA=", + "lastModified": 1751512826, + "narHash": "sha256-7ZacraAVWZBXGlg+UoPsZs+DACSsKJKTnCA83nXT6rM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "947204cae31597b29efee0fcf79585c7dac53bc2", + "rev": "fedb07931fc9b162a972b8966fdd9ba76273a590", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1c67f9b..dfef399 100644 --- a/flake.nix +++ b/flake.nix @@ -13,13 +13,12 @@ }; home-manager-stable-nixos = { - url = "github:nix-community/home-manager?ref=873c5b2dc5c9387bf67e59a12abc4de12a4b8697"; - #url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; hyprpanel-stable-nixos = { - url = "github:Jas-SinghFSU/HyprPanel?rev=436dcbfcf2458784203d83c4b96e7b0c3fb66762"; + url = "github:Jas-SinghFSU/Hyprpanel"; }; nix-flatpak-stable-nixos = { diff --git a/nodes/hosts/common/home/jay/home.nix b/nodes/hosts/common/home/jay/home.nix index 82440a3..ff91f67 100644 --- a/nodes/hosts/common/home/jay/home.nix +++ b/nodes/hosts/common/home/jay/home.nix @@ -7,7 +7,6 @@ home.homeDirectory = "/home/jay"; imports = [ - inputs.hyprpanel.homeManagerModules.hyprpanel inputs.stylix.homeModules.stylix ./programs/alacritty.nix ./programs/bash.nix diff --git a/nodes/hosts/common/home/jay/programs/hyprpanel.nix b/nodes/hosts/common/home/jay/programs/hyprpanel.nix index 50eb2a0..26d4e9a 100644 --- a/nodes/hosts/common/home/jay/programs/hyprpanel.nix +++ b/nodes/hosts/common/home/jay/programs/hyprpanel.nix @@ -1,16 +1,12 @@ { pkgs, ...}: { programs.hyprpanel = { enable = true; - overlay.enable = true; - hyprland.enable = true; settings = { - layout = { - "bar.layouts" = { - "0" = { - left = [ "dashboard" "separator" "microphone" "volume" "bluetooth" "hypridle" "separator" "network" "separator" "workspaces" "windowtitle" ]; - middle = [ "media" "cava" ]; - right = [ "netstat" "cpu" "cputemp" "ram" "storage" "separator" "systray" "notifications" "separator" "weather" "clock" ]; - }; + "bar.layouts" = { + "0" = { + left = [ "dashboard" "separator" "microphone" "volume" "bluetooth" "hypridle" "separator" "network" "separator" "workspaces" "windowtitle" ]; + middle = [ "media" "cava" ]; + right = [ "netstat" "cpu" "cputemp" "ram" "storage" "separator" "systray" "notifications" "separator" "weather" "clock" ]; }; }; @@ -58,12 +54,6 @@ }; }; - #theme.name = "nord"; - # Wipeout HD Theme - #theme.name = "catppuccin_latte"; - # Wipeout HD Reverse Theme - theme.name = "nord"; - menus.clock = { time = { military = true;