From 95e25e6dee8f9e7c02d0709d3d69137480c3b41d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Sat, 13 May 2023 16:38:44 +0200 Subject: [PATCH] update config --- .tmux.conf | 10 +++++++++- .zshrc | 8 ++++---- sway/config.d/{bar.conf => 20-bar.conf} | 0 sway/config.d/{idle.conf => 20-idle.conf} | 0 sway/config.d/{input.conf => 20-input.conf} | 0 .../{key_bindings.conf => 20-key_bindings.conf} | 0 sway/config.d/{layout.conf => 20-layout.conf} | 0 sway/config.d/{motions.conf => 20-motions.conf} | 0 sway/config.d/{output.conf => 20-output.conf} | 0 sway/config.d/{resize.conf => 20-resize.conf} | 0 sway/config.d/{scratchpad.conf => 20-scratchpad.conf} | 0 sway/config.d/20-theme.conf | 8 ++++++++ sway/config.d/{workspace.conf => 20-workspace.conf} | 7 +++++++ sway/config.d/99-startup.conf | 2 ++ 14 files changed, 30 insertions(+), 5 deletions(-) rename sway/config.d/{bar.conf => 20-bar.conf} (100%) rename sway/config.d/{idle.conf => 20-idle.conf} (100%) rename sway/config.d/{input.conf => 20-input.conf} (100%) rename sway/config.d/{key_bindings.conf => 20-key_bindings.conf} (100%) rename sway/config.d/{layout.conf => 20-layout.conf} (100%) rename sway/config.d/{motions.conf => 20-motions.conf} (100%) rename sway/config.d/{output.conf => 20-output.conf} (100%) rename sway/config.d/{resize.conf => 20-resize.conf} (100%) rename sway/config.d/{scratchpad.conf => 20-scratchpad.conf} (100%) create mode 100644 sway/config.d/20-theme.conf rename sway/config.d/{workspace.conf => 20-workspace.conf} (87%) create mode 100644 sway/config.d/99-startup.conf diff --git a/.tmux.conf b/.tmux.conf index 237d270..3b77a36 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -15,6 +15,14 @@ set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'catppuccin/tmux' set -g @catppuccin_flavour 'macchiato' # or frappe, macchiato, mocha + +set -g @catppuccin_window_tabs_enabled on # or off to disable window_tabs +#set -g @catppuccin_date_time "%Y-%m-%d %H:%M" + +set -g @catppuccin_date_time "off" +set -g @catppuccin_user "off" +set -g @catppuccin_host "on" + # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) run '~/.tmux/plugins/tpm/tpm' -# vim: ft=tmux +# vim: ft=tmuxset -g @catppuccin_date_time "%Y-%m-%d %H:%M" diff --git a/.zshrc b/.zshrc index 65c1da1..40aaf66 100644 --- a/.zshrc +++ b/.zshrc @@ -130,7 +130,7 @@ source $ZSH/oh-my-zsh.sh typeset -g POWERLEVEL9K_INSTANT_PROMPT=off alias vim=nvim -export vflgeist=/home/crimsen/git/flaschengeist/flaschengeist/venv/bin/activate + if [ -n "$VIRTUAL_ENV" ]; then source $VIRTUAL_ENV/bin/activate; fi @@ -140,10 +140,10 @@ fi tmux has-session -t "default" 2>/dev/null if [ $? != 0 ]; then - TMUX='' tmux new-session -s "default" -d + TMUX='' tmux new-session -s default -d fi if [[ -z "$TMUX" ]]; then tmux attach -t default -else - tmux switch-client -t default +#else +# tmux switch-client -t default fi diff --git a/sway/config.d/bar.conf b/sway/config.d/20-bar.conf similarity index 100% rename from sway/config.d/bar.conf rename to sway/config.d/20-bar.conf diff --git a/sway/config.d/idle.conf b/sway/config.d/20-idle.conf similarity index 100% rename from sway/config.d/idle.conf rename to sway/config.d/20-idle.conf diff --git a/sway/config.d/input.conf b/sway/config.d/20-input.conf similarity index 100% rename from sway/config.d/input.conf rename to sway/config.d/20-input.conf diff --git a/sway/config.d/key_bindings.conf b/sway/config.d/20-key_bindings.conf similarity index 100% rename from sway/config.d/key_bindings.conf rename to sway/config.d/20-key_bindings.conf diff --git a/sway/config.d/layout.conf b/sway/config.d/20-layout.conf similarity index 100% rename from sway/config.d/layout.conf rename to sway/config.d/20-layout.conf diff --git a/sway/config.d/motions.conf b/sway/config.d/20-motions.conf similarity index 100% rename from sway/config.d/motions.conf rename to sway/config.d/20-motions.conf diff --git a/sway/config.d/output.conf b/sway/config.d/20-output.conf similarity index 100% rename from sway/config.d/output.conf rename to sway/config.d/20-output.conf diff --git a/sway/config.d/resize.conf b/sway/config.d/20-resize.conf similarity index 100% rename from sway/config.d/resize.conf rename to sway/config.d/20-resize.conf diff --git a/sway/config.d/scratchpad.conf b/sway/config.d/20-scratchpad.conf similarity index 100% rename from sway/config.d/scratchpad.conf rename to sway/config.d/20-scratchpad.conf diff --git a/sway/config.d/20-theme.conf b/sway/config.d/20-theme.conf new file mode 100644 index 0000000..c9782bd --- /dev/null +++ b/sway/config.d/20-theme.conf @@ -0,0 +1,8 @@ +set $gnome-schema org.gnome.desktop.interface + +exec_always { + gsettings set $gnome-schema gtk-theme 'Catppuccin-Macchiato-Standard-Blue-Dark' + #gsettings set $gnome-schema icon-theme 'Your icon theme' + #gsettings set $gnome-schema cursor-theme 'Your cursor Theme' + #gsettings set $gnome-schema font-name 'Your font name' +} diff --git a/sway/config.d/workspace.conf b/sway/config.d/20-workspace.conf similarity index 87% rename from sway/config.d/workspace.conf rename to sway/config.d/20-workspace.conf index 1bc9e77..a13db0a 100644 --- a/sway/config.d/workspace.conf +++ b/sway/config.d/20-workspace.conf @@ -25,3 +25,10 @@ bindsym $mod+Shift+0 move container to workspace number 10 # Note: workspaces can have any name you want, not just numbers. # We just use 1-10 as the default. + +workspace_layout tabbed + +assign [app_id="Alacritty"] 1 +assign [class="Google-chrome"] 2 +assign [class="jetbrains-studio"] 3 +assign [app_id="org.gnome.Nautilus"] 4 diff --git a/sway/config.d/99-startup.conf b/sway/config.d/99-startup.conf new file mode 100644 index 0000000..b78e8f0 --- /dev/null +++ b/sway/config.d/99-startup.conf @@ -0,0 +1,2 @@ +exec alacritty +exec google-chrome-stable