hyprland rewrite home-manager

MatthiasBenaets · Mar 11, 2024 · 72e7934 · 72e7934
1 parent 54b4c20
commit 72e7934
Show file tree

Hide file tree

Showing 12 changed files with 655 additions and 418 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -67,14 +67,24 @@
         inputs.nixpkgs.follows = "nixpkgs-unstable";
       };
 
+      hyprlock = {
+        url = "github:hyprwm/hyprlock";
+        inputs.nixpkgs.follows = "nixpkgs-unstable";
+      };
+
+      hypridle = {
+        url = "github:hyprwm/hypridle";
+        inputs.nixpkgs.follows = "nixpkgs-unstable";
+      };
+
       plasma-manager = {                                                    # KDE Plasma User Settings Generator
         url = "github:pjones/plasma-manager";
         inputs.nixpkgs.follows = "nixpkgs";
         inputs.home-manager.follows = "nixpkgs";
       };
     };
 
-  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, darwin, nur, nixgl, nixvim, nixvim-unstable, doom-emacs, hyprland, plasma-manager, ... }:   # Function telling flake which inputs to use
+  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, darwin, nur, nixgl, nixvim, nixvim-unstable, doom-emacs, hyprland, hyprlock, hypridle, plasma-manager, ... }:   # Function telling flake which inputs to use
     let
       vars = {                                                              # Variables Used In Flake
         user = "matthias";
@@ -87,7 +97,7 @@
       nixosConfigurations = (                                               # NixOS Configurations
         import ./hosts {
           inherit (nixpkgs) lib;
-          inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager nur nixvim doom-emacs hyprland plasma-manager vars;   # Inherit inputs
+          inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager nur nixvim doom-emacs hyprland hyprlock hypridle plasma-manager vars;   # Inherit inputs
         }
       );
 

diff --git a/hosts/beelink/default.nix b/hosts/beelink/default.nix
@@ -63,6 +63,7 @@
       gimp                  # Image Editor
       gmtp                  # Mount GoPro
       go2tv                 # Casting
+      google-cloud-sdk-gce  # Google Cloud
       jellyfin-media-player # Media Player
       kodi                  # Media Player
       moonlight-qt          # Remote Streaming

diff --git a/hosts/default.nix b/hosts/default.nix
@@ -9,7 +9,7 @@
 #           └─ default.nix
 #
 
-{ lib, inputs, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, nur, nixvim, doom-emacs, hyprland, plasma-manager, vars, ... }:
+{ lib, inputs, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, nur, nixvim, doom-emacs, hyprland, hyprlock, hypridle, plasma-manager, vars, ... }:
 
 let
   system = "x86_64-linux";                                  # System Architecture
@@ -30,7 +30,7 @@ in
   beelink = lib.nixosSystem {                               # Desktop Profile
     inherit system;
     specialArgs = {                                         # Pass Flake Variable
-      inherit inputs system unstable hyprland vars;
+      inherit inputs system unstable hyprland hyprlock hypridle vars;
       host = {
         hostName = "beelink";
         mainMonitor = "HDMI-A-2";

diff --git a/modules/desktops/bspwm.nix b/modules/desktops/bspwm.nix
@@ -35,7 +35,7 @@ let
 
     #pgrep -x sxhkd > /dev/null || sxhkd &
 
-    feh --bg-tile $HOME/.config/wall                # Wallpaper
+    feh --bg-tile $HOME/.config/wall.png            # Wallpaper
 
     polybar main & #2>~/log &
   '';