diff --git a/dot_tmux.conf b/dot_tmux.conf index d2b8135..6c0a609 100644 --- a/dot_tmux.conf +++ b/dot_tmux.conf @@ -28,8 +28,8 @@ bind-key -n M-z resize-pane -Z # pane zoom bind-key -n M-w confirm-before -p "are you sure you want to kill #P?" kill-pane set-option -g prefix ` # " -set-option -g default-terminal "$TERM" # 256-colors -set-option -ag terminal-overrides ",$TERM:Tc" # " +set-option -g default-terminal "xterm" # 256-colors +# set-option -ag terminal-overrides ",$TERM:Tc" # " set-option -s escape-time 0 # vi-mode switch delay set-option -g history-limit 50000 # scrollback buffer size set-option -g display-time 6000 # tmux msg display duration diff --git a/private_dot_config/alacritty/alacritty.toml b/private_dot_config/alacritty/alacritty.toml index 22e8c30..8ab7dc9 100644 --- a/private_dot_config/alacritty/alacritty.toml +++ b/private_dot_config/alacritty/alacritty.toml @@ -11,49 +11,8 @@ bold = { family = "JetBrainsMonoNL Nerd Font" } italic = { family = "JetBrainsMonoNL Nerd Font" } size = 9 -# [colors.primary] -# foreground = "#eeeeee" -# background = "#3b224c" -# -# [colors.normal] -# black = "#181818" -# red = "#ac4242" -# green = "#90a959" -# yellow = "#f4bf75" -# blue = "#6a9fb5" -# magenta = "#aa759f" -# cyan = "#75b5aa" -# white = "#d8d8d8" - -[colors.primary] -foreground = "#ebeafa" -background = "#3b224c" - -[colors.selection] -foreground = "#eaeaea" -background = "#404040" - -[colors.normal] -black = "#3b224c" -red = "#f47868" -green = "#9ff28f" -yellow = "#efba5d" -blue = "#a4a0e8" -magenta = "#dbbfef" -cyan = "#6acdca" -white = "#ebeafa" - -[colors.bright] -black = "#697c81" -red = "#ff3334" -green = "#9ec400" -yellow = "#e7c547" -blue = "#7aa6da" -magenta = "#b77ee0" -cyan = "#54ced6" -white = "#ffffff" - [window] +opacity = 1.0 padding.x = 4 padding.y = 4 decorations = "None" @@ -65,4 +24,7 @@ bindings = [ { key = "Insert", mods = "Control", action = "Copy" }, ] -[terminal] +[general] +import = [ + "~/.config/alacritty/colibri.toml" +] diff --git a/private_dot_config/niri/binds.kdl b/private_dot_config/niri/binds.kdl index 07e8428..24a115e 100644 --- a/private_dot_config/niri/binds.kdl +++ b/private_dot_config/niri/binds.kdl @@ -18,7 +18,7 @@ binds { Mod+S { spawn "dms" "ipc" "call" "notepad" "toggle"; } Mod+Space { spawn "dms" "ipc" "call" "spotlight" "toggle"; } - Mod+Return { spawn "alacritty"; } + Mod+Return { spawn "ghostty"; } Mod+F { spawn-sh "uwsm app -- nautilus --new-window"; } Mod+B { spawn "chromium"; } Mod+D { spawn "vesktop"; } diff --git a/private_dot_config/niri/config.kdl b/private_dot_config/niri/config.kdl index 62a9ee4..17e4f6a 100644 --- a/private_dot_config/niri/config.kdl +++ b/private_dot_config/niri/config.kdl @@ -6,6 +6,7 @@ include "binds.kdl" include "windowrules.kdl" include "startup.kdl" include "recentwindows.kdl" +include "dms/colors.kdl" environment { QT_QPA_PLATFORM "wayland" @@ -29,11 +30,6 @@ layout { } border { width 2 - active-color "#ffc87f" - inactive-color "#505050" - urgent-color "#9b0000" - active-gradient from="#e5989b" to="#ffb4a2" angle=45 relative-to="workspace-view" in="oklch longer hue" - inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" } tab-indicator { hide-when-single-tab @@ -49,13 +45,10 @@ layout { softness 3 spread 1 offset x=3 y=3 - color "#0007" } struts { - left 24 - right 24 - //top -4 - // bottom 64 + left 16 + right 16 } } diff --git a/private_dot_config/niri/windowrules.kdl b/private_dot_config/niri/windowrules.kdl index 4d36d8c..b5a6e63 100644 --- a/private_dot_config/niri/windowrules.kdl +++ b/private_dot_config/niri/windowrules.kdl @@ -4,12 +4,12 @@ window-rule { window-rule { match is-focused=false - opacity 0.9 + opacity 0.86 } window-rule { match is-focused=true - opacity 0.97 + opacity 0.95 } window-rule { diff --git a/private_dot_config/nvim/init.lua b/private_dot_config/nvim/init.lua index 6a8451c..c92d39a 100644 --- a/private_dot_config/nvim/init.lua +++ b/private_dot_config/nvim/init.lua @@ -39,4 +39,4 @@ require("config.20_keymaps") require("config.30_autocmds") require("config.40_statusline") -vim.cmd.colorscheme("colibri") +vim.cmd.colorscheme("colibri-transparent")