diff --git a/config.default.nix b/config.default.nix index f102ffe..ed3f43c 100644 --- a/config.default.nix +++ b/config.default.nix @@ -28,6 +28,10 @@ allowUnfree = true; # allows installation of commercial apps. touchpadSupport = false; + logitech-hardware = { + enable = false; + }; + # Custom Applications linux-apps = { gamingDesktop = true; # adds steam diff --git a/config.local.nix b/config.local.nix index 548aa27..7af1a97 100644 --- a/config.local.nix +++ b/config.local.nix @@ -31,6 +31,10 @@ allowUnfree = true; # allows installation of commercial apps. touchpadSupport = false; + logitech-hardware = { + enable = true; + }; + # Custom Applications linux-apps = { gamingDesktop = true; # adds steam diff --git a/pkgs/hyprland/default.nix b/pkgs/hyprland/default.nix index 72c2413..d63e005 100644 --- a/pkgs/hyprland/default.nix +++ b/pkgs/hyprland/default.nix @@ -10,17 +10,15 @@ "$mod" = "SUPER"; "$term" = "kitty --single-instance"; "$browser" = "firefox"; - "$bar" = "ags run"; monitor = hyprconf.monitor; - exec = [ - "$bar" + exec-once = [ "[workspace 20 silent] kitty --single-insance --hold fastfetch" "[workspace 20 silent] firefox" "[workspace 1] kitty --single-instance --hold fastfetch" - # FIXME no abs! - "swww img /home/${username}/.config/nixos/assets/wallpapers/ascii-nixos.png" + "pkill gjs & ags run" + # "matugen image /home/${username}/.config/nixos/assets/wallpapers/ultrawide-nixos-default.png" "hyprctl setcursor Bibata-Original-Classic 24" ]; diff --git a/system/default.nix b/system/default.nix index 3670847..c28b3be 100644 --- a/system/default.nix +++ b/system/default.nix @@ -4,6 +4,7 @@ timezone, touchpadSupport, inputs, + logitech-hardware, ... }: { environment.systemPackages = with pkgs; @@ -32,17 +33,18 @@ tldr jq - - solaar ] ++ [ inputs.matugen.packages.${pkgs.system}.default + ] + ++ lib.optionals (logitech-hardware.enable == true) [ + logiops ]; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; hardware = { - logitech.wireless.enable = true; + logitech.wireless.enable = logitech-hardware.enable; bluetooth = { enable = true; powerOnBoot = true;