diff options
Diffstat (limited to 'hm/env')
| -rw-r--r-- | hm/env/awww.nix | 3 | ||||
| -rw-r--r-- | hm/env/cursor.nix | 30 | ||||
| -rw-r--r-- | hm/env/env.nix | 1 | ||||
| -rw-r--r-- | hm/env/niri/binds.nix | 20 | ||||
| -rw-r--r-- | hm/env/niri/niri.nix | 2 | ||||
| -rw-r--r-- | hm/env/swayidle.nix | 4 | ||||
| -rw-r--r-- | hm/env/theme.nix | 9 |
7 files changed, 51 insertions, 18 deletions
diff --git a/hm/env/awww.nix b/hm/env/awww.nix index d666742..a25f4e6 100644 --- a/hm/env/awww.nix +++ b/hm/env/awww.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, inputs, ... }: +{ config, lib, ... }: let cfg = config.hm.env.awww; in @@ -7,7 +7,6 @@ in config = lib.mkIf cfg.enable { services.swww = { enable = true; - package = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww; }; }; } diff --git a/hm/env/cursor.nix b/hm/env/cursor.nix new file mode 100644 index 0000000..49e8313 --- /dev/null +++ b/hm/env/cursor.nix @@ -0,0 +1,30 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.hm.env.cursor; + + miyabi-cursor-pkg = pkgs.runCommand "miyabi" {} '' + mkdir -p $out/share/icons/miyabi + cp -rv ${../../resources/cursors/miyabi}/* $out/share/icons/miyabi/ + ''; +in +{ + options.hm.env.cursor = { + enableMiyabi = lib.mkEnableOption "Enables the Miyabi cursor"; + + size = lib.mkOption { + type = lib.types.int; + default = 24; + description = "The size of the mouse cursor"; + }; + }; + + config = lib.mkIf cfg.enableMiyabi { + home.pointerCursor = { + gtk.enable = true; + x11.enable = true; + package = miyabi-cursor-pkg; + name = "miyabi"; + size = cfg.size; + }; + }; +} diff --git a/hm/env/env.nix b/hm/env/env.nix index 2f0fab1..80e19f8 100644 --- a/hm/env/env.nix +++ b/hm/env/env.nix @@ -4,6 +4,7 @@ ./niri/niri.nix ./awww.nix + ./cursor.nix ./fuzzel.nix ./screenshot.nix ./swayidle.nix diff --git a/hm/env/niri/binds.nix b/hm/env/niri/binds.nix index d22d0e7..cfa15e8 100644 --- a/hm/env/niri/binds.nix +++ b/hm/env/niri/binds.nix @@ -68,16 +68,16 @@ in "Mod+BracketLeft".action = consume-or-expel-window-left; "Mod+BracketRight".action = consume-or-expel-window-right; - "XF86Tools" = { - action = spawn "sh" "-c" '' - pkill -9 firefox || true - swaylock -f - wpctl set-mute @DEFAULT_AUDIO_SINK@ 1 - wpctl set-mute @DEFAULT_AUDIO_SOURCE@ 1 - niri msg action power-off-monitors - ''; - repeat = false; - }; + # "XF86Tools" = { + # action = spawn "sh" "-c" '' + # pkill -9 firefox || true + # swaylock -f + # wpctl set-mute @DEFAULT_AUDIO_SINK@ 1 + # wpctl set-mute @DEFAULT_AUDIO_SOURCE@ 1 + # niri msg action power-off-monitors + # ''; + # repeat = false; + # }; "Mod+R".action = switch-preset-column-width; "Mod+Shift+R".action = reset-window-height; diff --git a/hm/env/niri/niri.nix b/hm/env/niri/niri.nix index 577e52c..b751d3d 100644 --- a/hm/env/niri/niri.nix +++ b/hm/env/niri/niri.nix @@ -91,8 +91,6 @@ in ]; gestures.hot-corners.enable = false; spawn-at-startup = [ - { command = [ "${lib.getExe pkgs.xwayland-satellite}" ]; } - { command = [ "awww-daemon" ]; } { command = [ "waybar" ]; } { command = [ "obs" "--disable-missing-files-check" "--startreplaybuffer" ]; } ]; diff --git a/hm/env/swayidle.nix b/hm/env/swayidle.nix index 1d703cc..94e819a 100644 --- a/hm/env/swayidle.nix +++ b/hm/env/swayidle.nix @@ -16,8 +16,8 @@ in { timeout = 300; command = "${pkgs.swaylock-effects}/bin/swaylock -f"; } { timeout = 600; - command = "${pkgs.niri-unstable}/bin/niri msg action power-off-monitors"; - resumeCommand = "${pkgs.niri-unstable}/bin/niri msg action power-on-monitors"; + command = "niri msg action power-off-monitors"; + resumeCommand = "niri msg action power-on-monitors"; } ]; }; diff --git a/hm/env/theme.nix b/hm/env/theme.nix index 0915024..285e263 100644 --- a/hm/env/theme.nix +++ b/hm/env/theme.nix @@ -4,10 +4,16 @@ let in { options.hm.env.themes = { + enable = lib.mkEnableOption "enables global dark mode"; gtk.enable = lib.mkEnableOption "GTK theming"; qt.enable = lib.mkEnableOption "QT theming"; }; + config = lib.mkMerge [ + (lib.mkIf cfg.enable { + dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark"; + }) + (lib.mkIf cfg.gtk.enable { gtk = { enable = true; @@ -24,9 +30,8 @@ in (lib.mkIf cfg.qt.enable { qt = { enable = true; + platformTheme.name = "gtk"; style.name = "adwaita-dark"; - style.package = pkgs.adwaita-qt; - platformTheme.name = "adwaita"; }; }) ]; |