diff --git a/homes/nathan/home-manager/default.nix b/homes/nathan/home-manager/default.nix index 8bb098f..f88280c 100644 --- a/homes/nathan/home-manager/default.nix +++ b/homes/nathan/home-manager/default.nix @@ -44,7 +44,6 @@ hyprland.enable = lib.mkDefault config.homeconfig.graphical; hyprlock.enable = lib.mkDefault config.homeconfig.hyprland.enable; wal.enable = lib.mkDefault config.homeconfig.graphical; -#hyprpanel.enable = lib.mkDefault config.homeconfig.hyprland.enable; rofi.enable = lib.mkDefault config.homeconfig.hyprland.enable; firefox.enable = lib.mkDefault config.homeconfig.graphical; diff --git a/homes/nathan/home-manager/dotfiles/hypr/main.conf b/homes/nathan/home-manager/dotfiles/hypr/main.conf index d7c8f37..b99a272 100644 --- a/homes/nathan/home-manager/dotfiles/hypr/main.conf +++ b/homes/nathan/home-manager/dotfiles/hypr/main.conf @@ -94,6 +94,7 @@ master { } scrolling { + direction = "right" } misc { diff --git a/profiles/laptop/default.nix b/profiles/laptop/default.nix index 0b6206b..b1a455e 100644 --- a/profiles/laptop/default.nix +++ b/profiles/laptop/default.nix @@ -61,7 +61,6 @@ programs = { steam.enable = mkDefault true; - hyprpanel.enable = mkDefault true; hyprland.enable = mkDefault true; }; diff --git a/system/programs/hyprland/default.nix b/system/programs/hyprland/default.nix index 49da6c5..a526f75 100644 --- a/system/programs/hyprland/default.nix +++ b/system/programs/hyprland/default.nix @@ -26,6 +26,27 @@ portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; }; + + services = { + upower.enable = true; + gvfs.enable = true; + power-profiles-daemon.enable = true; + }; + + environment.systemPackages = with pkgs; [ + bluez + bluez-tools + libgtop + dart-sass + wl-clipboard + gtksourceview + libsoup_3 + brightnessctl + swww + hyprpicker + hyprsunset + wf-recorder + ]; }; }; } diff --git a/system/programs/hyprpanel/default.nix b/system/programs/hyprpanel/default.nix deleted file mode 100644 index 06deda3..0000000 --- a/system/programs/hyprpanel/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ ... }: { - - flake.nixosModules.default = { config, lib, pkgs, ... }: { - - options.sysconfig.programs.hyprpanel.enable = lib.options.mkOption { - type = lib.types.bool; - default = false; - }; - - config = lib.mkIf config.sysconfig.programs.hyprpanel.enable { - services = { - upower.enable = true; - gvfs.enable = true; - power-profiles-daemon.enable = true; - }; - - environment.systemPackages = with pkgs; [ - bluez - bluez-tools - libgtop - dart-sass - wl-clipboard - gtksourceview - libsoup_3 - brightnessctl - swww - hyprpicker - hyprsunset - wf-recorder - ]; - }; - }; -} -