From 049c9396a25f5fd639b79afe0b8f62d8b30f65bf Mon Sep 17 00:00:00 2001 From: Cameron Reed Date: Mon, 5 Feb 2024 23:40:43 -0700 Subject: [PATCH] Nothing ever works on the first commit --- common/users/cameron/home-manager/alacritty.nix | 6 +++--- common/users/cameron/home-manager/hyprland.nix | 2 +- common/users/cameron/home-manager/kitty.nix | 2 +- common/users/cameron/home-manager/sway.nix | 2 +- common/users/cameron/home-manager/tmux.nix | 2 ++ common/users/cameron/home.nix | 2 ++ 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/common/users/cameron/home-manager/alacritty.nix b/common/users/cameron/home-manager/alacritty.nix index e5f7ddb..44ce9f9 100644 --- a/common/users/cameron/home-manager/alacritty.nix +++ b/common/users/cameron/home-manager/alacritty.nix @@ -2,7 +2,7 @@ { programs.alacritty = { - enable = config.term == "alacritty"; + enable = (config.term == "alacritty"); settings = { window = { @@ -10,13 +10,13 @@ dynamic_padding = true; }; - "colors.primary" = { + colors.primary = { foreground = "#cccccc"; background = "#333333"; }; cursor = { - "style.blinking" = "On"; + style.blinking = "On"; blink_interval = 500; blink_timeout = 15; }; diff --git a/common/users/cameron/home-manager/hyprland.nix b/common/users/cameron/home-manager/hyprland.nix index ee03e7c..7edabc5 100644 --- a/common/users/cameron/home-manager/hyprland.nix +++ b/common/users/cameron/home-manager/hyprland.nix @@ -121,7 +121,7 @@ ]; bind = [ - "$mod, Return, exec, ${config.runInTerm} ${pkgs.tmux}" + "$mod, Return, exec, ${config.runInTerm} ${pkgs.tmux}/bin/tmux" "$mod, B, exec, $browser" "$mod, E, killactive," "$mod, Q, exec, hyprctl kill" diff --git a/common/users/cameron/home-manager/kitty.nix b/common/users/cameron/home-manager/kitty.nix index fdd8044..e1fa903 100644 --- a/common/users/cameron/home-manager/kitty.nix +++ b/common/users/cameron/home-manager/kitty.nix @@ -2,7 +2,7 @@ { programs.kitty = { - enable = config.term == "kitty"; + enable = (config.term == "kitty"); settings = { background = "#333333"; diff --git a/common/users/cameron/home-manager/sway.nix b/common/users/cameron/home-manager/sway.nix index e2af940..37db48d 100644 --- a/common/users/cameron/home-manager/sway.nix +++ b/common/users/cameron/home-manager/sway.nix @@ -53,7 +53,7 @@ menu = config.wayland.windowManager.sway.config.menu; in lib.mkOptionDefault { "${mod}+c" = "mark --toggle caffeine"; - "${mod}+Return" = "exec ${config.runInTerm} ${pkgs.tmux}"; + "${mod}+Return" = "exec ${config.runInTerm} ${pkgs.tmux}/bin/tmux"; "${mod}+n" = "exec ${pkgs.firefox}/bin/firefox"; "${mod}+d" = "exec pkill wmenu || ${menu}"; "${mod}+Shift+q" = "kill"; diff --git a/common/users/cameron/home-manager/tmux.nix b/common/users/cameron/home-manager/tmux.nix index b914499..a877cc2 100644 --- a/common/users/cameron/home-manager/tmux.nix +++ b/common/users/cameron/home-manager/tmux.nix @@ -8,6 +8,8 @@ keyMode = "vi"; mouse = true; + sensibleOnTop = false; + extraConfig = '' set -g prefix C-a set -g prefix2 C-k diff --git a/common/users/cameron/home.nix b/common/users/cameron/home.nix index 6879680..0f33c8d 100644 --- a/common/users/cameron/home.nix +++ b/common/users/cameron/home.nix @@ -31,4 +31,6 @@ home.packages = with pkgs; [ eza ]; + + term = "alacritty"; }