diff --git a/core/theme.nix b/core/theme.nix new file mode 100644 index 0000000..e1624a4 --- /dev/null +++ b/core/theme.nix @@ -0,0 +1,21 @@ +{...}: { + x = c: "#${c}"; + + colors = rec { + "base" = "f191724"; + "surface" = "f1f1d2e"; + "overlay" = "f26233a"; + "muted" = "f6e6a86"; + "subtle" = "f6e6a86"; + "text" = "ffe0def4"; + "love" = "ffeb6f92"; + "gold" = "fff6c177"; + "rose" = "ffebbcba"; + "pine" = "ff31748f"; + "foam" = "ff9ccfd8"; + "iris" = "ffc4a7e7"; + "highlightlow" = "ff21202e"; + "highlightmed" = "ff403d52"; + "highlighthigh" = "ff524f67"; + }; +} diff --git a/hosts/earth/configuration.nix b/hosts/earth/configuration.nix index c231752..52b5dc4 100644 --- a/hosts/earth/configuration.nix +++ b/hosts/earth/configuration.nix @@ -140,7 +140,10 @@ home-manager = { extraSpecialArgs = {inherit inputs;}; users = { - "zack" = import ../../modules/home-manager; + "zack" = { + imports = [../../modules/home-manager]; + _module.args.theme = import ../../core/theme.nix; + }; }; }; diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 8950b23..ba8d6fb 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -57,6 +57,7 @@ pkgs.wofi pkgs.alejandra pkgs.dconf + pkgs.wl-clipboard # # You can also create simple shell scripts directly inside your # # configuration. For example, this adds a command 'my-hello' to your diff --git a/modules/rice/hyprland/binds.nix b/modules/rice/hyprland/binds.nix index 2a72efd..3c7af71 100644 --- a/modules/rice/hyprland/binds.nix +++ b/modules/rice/hyprland/binds.nix @@ -30,10 +30,7 @@ in { "${mod},M,exit" "${mod},P,pseudo" - "${mod},H,movefocus,l" - "${mod},L,movefocus,r" - "${mod},K,movefocus,u" - "${mod},J,movefocus,d" + "${mod},J,togglesplit,d" "${mod},T,togglegroup," # group focused window "${modshift},G,changegroupactive," # switch within the active group diff --git a/modules/rice/hyprland/config.nix b/modules/rice/hyprland/config.nix index 29d6fbb..7a3f632 100644 --- a/modules/rice/hyprland/config.nix +++ b/modules/rice/hyprland/config.nix @@ -1,6 +1,6 @@ # home.nix -{ - wayland.windowManager.hyprland.settings = { +{theme, ...}: { + wayland.windowManager.hyprland.settings = with theme.colors; { exec-once = [ "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" ]; @@ -15,6 +15,10 @@ # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse) apply_sens_to_raw = 0; + + # active border color + # "col.active_border" = "rgb(${rose}) rgb(${pine}) rgb(${love}) rgb(${iris}) 90deg"; + # "col.inactive_border" = "rgb(${muted})"; }; input = {