diff --git a/flake.lock b/flake.lock index 24681c9..b02441c 100644 --- a/flake.lock +++ b/flake.lock @@ -19,6 +19,25 @@ "type": "github" } }, + "ags_2": { + "inputs": { + "nixpkgs": "nixpkgs_4", + "systems": "systems_2" + }, + "locked": { + "lastModified": 1728326430, + "narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=", + "owner": "Aylur", + "repo": "ags", + "rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d", + "type": "github" + }, + "original": { + "owner": "Aylur", + "repo": "ags", + "type": "github" + } + }, "aquamarine": { "inputs": { "hyprutils": [ @@ -465,6 +484,25 @@ "type": "github" } }, + "hyprpanel": { + "inputs": { + "ags": "ags_2", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1732080094, + "narHash": "sha256-EENo8OqFYqquoyBGg4gFm2aTiEeLjHICIzOSYs+tSx4=", + "owner": "Jas-SinghFSU", + "repo": "HyprPanel", + "rev": "c10c9d0e93ff89f0314a382aaf8e21eb2b7c0877", + "type": "github" + }, + "original": { + "owner": "Jas-SinghFSU", + "repo": "HyprPanel", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -608,6 +646,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1731676054, "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", @@ -623,7 +677,23 @@ "type": "github" } }, - "nixpkgs_5": { + "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": 1731763621, "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", @@ -639,7 +709,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_8": { "locked": { "lastModified": 1731531548, "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", @@ -655,7 +725,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { "lastModified": 1715534503, "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", @@ -702,7 +772,8 @@ "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", - "nixpkgs": "nixpkgs_4", + "hyprpanel": "hyprpanel", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable_2", "sops-nix": "sops-nix", "stylix": "stylix", @@ -711,7 +782,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1731954233, @@ -737,8 +808,8 @@ "flake-utils": "flake-utils", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_6", - "systems": "systems_2", + "nixpkgs": "nixpkgs_8", + "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" @@ -773,6 +844,21 @@ } }, "systems_2": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -840,7 +926,7 @@ "tlock": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1716429453, diff --git a/flake.nix b/flake.nix index c7ef532..b3b1e51 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,7 @@ ayugram-desktop.url = "github:/ayugram-port/ayugram-desktop/release?submodules=1"; tlock.url = "git+https://github.com/eklairs/tlock?submodules=1"; + hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; hyprland.url = "github:hyprwm/Hyprland"; hyprland-plugins = { url = "github:hyprwm/hyprland-plugins"; @@ -23,12 +24,13 @@ }; }; - outputs = { self, nixpkgs, nixpkgs-stable, home-manager, ... }@inputs: - - let - system = "x86_64-linux"; - in { - + outputs = { self, nixpkgs, nixpkgs-stable, home-manager, ... }@inputs: let + system = "x86_64-linux"; + pkgs = import nixpkgs { + inherit system; + overlays = [ inputs.hyprpanel.overlay ]; + }; + in { nixosConfigurations = { Rias = nixpkgs.lib.nixosSystem { specialArgs = { @@ -75,7 +77,7 @@ homeConfigurations = { sweetbread = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.${system}; + inherit pkgs; extraSpecialArgs = { inherit inputs; pkgs-stable = import nixpkgs-stable { @@ -92,7 +94,7 @@ }; chest = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.${system}; + inherit pkgs; extraSpecialArgs = { inherit inputs; pkgs-stable = import nixpkgs-stable { diff --git a/home-manager/patterns/hyprland.nix b/home-manager/patterns/hyprland.nix index 01869ad..1bcaa00 100644 --- a/home-manager/patterns/hyprland.nix +++ b/home-manager/patterns/hyprland.nix @@ -2,7 +2,6 @@ home.packages = with pkgs; [ swww kitty - waybar pamixer wofi clipse @@ -133,7 +132,7 @@ "systemctl --user start plasma-polkit-agent" "swww init" "python3 ${lib.getExe wallpaper_changer}" - "waybar" + "${lib.getExe pkgs.hyprpanel}" "${clipsync}" "clipse -listen" ];