diff --git a/flake.lock b/flake.lock index 3015b8a..501e85c 100644 --- a/flake.lock +++ b/flake.lock @@ -22,7 +22,7 @@ }, "hyprcursor": { "inputs": { - "hyprlang": "hyprlang", + "hyprlang": "hyprlang_2", "nixpkgs": [ "hyprland", "nixpkgs" @@ -46,13 +46,35 @@ "type": "github" } }, + "hypridle": { + "inputs": { + "hyprlang": "hyprlang", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1710180874, + "narHash": "sha256-ZSn3wXQuRz36Ta/L+UCFKuUVG6QpwK2QmRkPjpQprU4=", + "owner": "hyprwm", + "repo": "hypridle", + "rev": "4395339a2dc410bcf49f3e24f9ed3024fdb25b0a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hypridle", + "type": "github" + } + }, "hyprland": { "inputs": { "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang_2", + "hyprlang": "hyprlang_3", "nixpkgs": "nixpkgs", - "systems": "systems_2", + "systems": "systems_3", "wlroots": "wlroots", "xdph": "xdph" }, @@ -70,6 +92,31 @@ "type": "github" } }, + "hyprland-plugins": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1711847900, + "narHash": "sha256-7lnDcHDZooMw6kTUuJOOHGGd4/VMfBiAgA+xx9qXr0M=", + "owner": "hyprwm", + "repo": "hyprland-plugins", + "rev": "e45066d0741a1a4b9298a4c5ec43a5e57b059a4e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-plugins", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -96,13 +143,34 @@ } }, "hyprlang": { + "inputs": { + "nixpkgs": [ + "hypridle", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708212860, + "narHash": "sha256-nW3Zrhh9RJcMTvOcXAaKADnJM/g6tDf3121lJtTHnYo=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "11d5ccda071c153dfdc18ef65338956a51cef96a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { "inputs": { "nixpkgs": [ "hyprland", "hyprcursor", "nixpkgs" ], - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1709914708, @@ -118,7 +186,7 @@ "type": "github" } }, - "hyprlang_2": { + "hyprlang_3": { "inputs": { "nixpkgs": [ "hyprland", @@ -143,6 +211,50 @@ "type": "github" } }, + "hyprlang_4": { + "inputs": { + "nixpkgs": [ + "hyprlock", + "nixpkgs" + ], + "systems": "systems_4" + }, + "locked": { + "lastModified": 1711250455, + "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlock": { + "inputs": { + "hyprlang": "hyprlang_4", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_5" + }, + "locked": { + "lastModified": 1711884603, + "narHash": "sha256-y1Om75muuJcEoLd/FOYGIZ5/ja/Mc4iBX/9S7vWF0C8=", + "owner": "hyprwm", + "repo": "hyprlock", + "rev": "071ebcefb9070e4397d75103f5f535b58dacf250", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlock", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1711523803, @@ -178,7 +290,10 @@ "root": { "inputs": { "home-manager": "home-manager", + "hypridle": "hypridle", "hyprland": "hyprland", + "hyprland-plugins": "hyprland-plugins", + "hyprlock": "hyprlock", "nixpkgs": "nixpkgs_2" } }, @@ -212,6 +327,51 @@ "type": "github" } }, + "systems_3": { + "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_4": { + "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_5": { + "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" + } + }, "wlroots": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index e031a3a..940fabc 100644 --- a/flake.nix +++ b/flake.nix @@ -9,10 +9,18 @@ }; hyprland.url = "github:hyprwm/Hyprland"; - hyprlan-plugins = { + hyprland-plugins = { url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; }; + hyprlock = { + url = "github:hyprwm/hyprlock"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + hypridle = { + url = "github:hyprwm/hypridle"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, ... }@inputs: diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 1fd8f5a..634d1c2 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -172,6 +172,9 @@ nixpkgs.overlays = [ # $ nix search wget environment.systemPackages = with pkgs; [ vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + fd + file + ripgrep wget spotify discord diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 22a621c..f388b32 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -33,6 +33,7 @@ emacs-all-the-icons-fonts # emacsPackages.pdf-tools exfatprogs + filezilla firefox floorp gnome.gnome-keyring diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index e859b46..4085974 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -8,10 +8,16 @@ }: { + imports = with inputs; [ + hypridle.homeManagerModules.default + hyprlock.homeManagerModules.default + #hyprpaper.homeManagerModules.default + ]; home.packages = with pkgs; [ hyprpicker # hyprlock # hypridle + ]; wayland.windowManager.hyprland = { enable = true; @@ -28,7 +34,6 @@ "wl-paste -p --watch wl-copy -p ''" ]; env = [ - "PATH,PATH:$HOME/.local" "HYPRCURSOR_THEME,${config.gtk.cursorTheme.name}" "HYPRCURSOR_SIZE,24" "WLR_NO_HARDWARE_CURSORS,1" @@ -300,4 +305,15 @@ submap = reset ''; }; + # programs.hyprlock = { + # enable = true; + # general = { }; + # backgrounds = [ + # { + # path = "$HOME/pictures/wallpapers/desert.jpg"; + # } + # ]; + # }; + # programs.hypridle = { + # }; }