From 7eae8fe22c55de739bd817789df896a3e150616c Mon Sep 17 00:00:00 2001 From: Jonas Hahn Date: Mon, 1 Sep 2025 00:04:34 +0200 Subject: [PATCH] Modular stow folders. Replaced kitty with alacritty --- {config => cli}/.config/lazygit/config.yml | 0 {config => cli}/.config/weechat/alias.conf | 0 {config => cli}/.config/weechat/buflist.conf | 0 {config => cli}/.config/weechat/charset.conf | 0 {config => cli}/.config/weechat/exec.conf | 0 {config => cli}/.config/weechat/fifo.conf | 0 {config => cli}/.config/weechat/fset.conf | 0 {config => cli}/.config/weechat/guile.conf | 0 {config => cli}/.config/weechat/irc.conf | 0 {config => cli}/.config/weechat/logger.conf | 0 {config => cli}/.config/weechat/lua.conf | 0 {config => cli}/.config/weechat/perl.conf | 0 {config => cli}/.config/weechat/plugins.conf | 0 {config => cli}/.config/weechat/python.conf | 0 {config => cli}/.config/weechat/relay.conf | 0 {config => cli}/.config/weechat/ruby.conf | 0 {config => cli}/.config/weechat/script.conf | 0 {config => cli}/.config/weechat/sec.conf | 0 {config => cli}/.config/weechat/spell.conf | 0 {config => cli}/.config/weechat/tcl.conf | 0 {config => cli}/.config/weechat/trigger.conf | 0 {config => cli}/.config/weechat/typing.conf | 0 {config => cli}/.config/weechat/weechat.conf | 0 {config => cli}/.config/weechat/xfer.conf | 0 .../yazi/flavors/kanagawa.yazi/LICENSE | 0 .../flavors/kanagawa.yazi/LICENSE-tmtheme | 0 .../yazi/flavors/kanagawa.yazi/README.md | 0 .../yazi/flavors/kanagawa.yazi/flavor.toml | 0 .../yazi/flavors/kanagawa.yazi/preview.png | Bin .../yazi/flavors/kanagawa.yazi/tmtheme.xml | 0 {config => cli}/.config/yazi/keymap.toml | 0 {config => cli}/.config/yazi/package.toml | 0 .../yazi/plugins/bookmarks.yazi/LICENSE | 0 .../yazi/plugins/bookmarks.yazi/README.md | 0 .../yazi/plugins/bookmarks.yazi/main.lua | 0 .../.config/yazi/plugins/chmod.yazi/LICENSE | 0 .../.config/yazi/plugins/chmod.yazi/README.md | 0 .../.config/yazi/plugins/chmod.yazi/main.lua | 0 .../.config/yazi/plugins/lazygit.yazi/LICENSE | 0 .../yazi/plugins/lazygit.yazi/README.md | 0 .../yazi/plugins/lazygit.yazi/main.lua | 0 .../.config/yazi/plugins/restore.yazi/LICENSE | 0 .../yazi/plugins/restore.yazi/README.md | 0 .../yazi/plugins/restore.yazi/main.lua | 0 .../yazi/plugins/what-size.yazi/LICENSE | 0 .../yazi/plugins/what-size.yazi/README.md | 0 .../yazi/plugins/what-size.yazi/main.lua | 0 {config => cli}/.config/yazi/theme.toml | 0 {config => cli}/.config/yazi/yazi.toml | 3 +- gui/.config/alacritty.toml | 41 +++++++++++ {config => gui}/.config/dunst/dunstrc | 0 {config => gui}/.config/hypr/hyprland.conf | 64 ++---------------- {config => gui}/.config/hypr/hyprpaper.conf | 0 {config => gui}/.config/kitty/kitty.conf | 0 {config => gui}/.config/kitty/theme.conf | 0 {config => gui}/.config/sioyek/prefs.config | 0 {config => gui}/.config/tofi/config | 0 {config => gui}/.config/waybar/config | 0 {config => gui}/.config/waybar/style.css | 0 home/.common_shell | 47 ++++--------- home/.ssh/config | 5 ++ 61 files changed, 65 insertions(+), 95 deletions(-) rename {config => cli}/.config/lazygit/config.yml (100%) rename {config => cli}/.config/weechat/alias.conf (100%) rename {config => cli}/.config/weechat/buflist.conf (100%) rename {config => cli}/.config/weechat/charset.conf (100%) rename {config => cli}/.config/weechat/exec.conf (100%) rename {config => cli}/.config/weechat/fifo.conf (100%) rename {config => cli}/.config/weechat/fset.conf (100%) rename {config => cli}/.config/weechat/guile.conf (100%) rename {config => cli}/.config/weechat/irc.conf (100%) rename {config => cli}/.config/weechat/logger.conf (100%) rename {config => cli}/.config/weechat/lua.conf (100%) rename {config => cli}/.config/weechat/perl.conf (100%) rename {config => cli}/.config/weechat/plugins.conf (100%) rename {config => cli}/.config/weechat/python.conf (100%) rename {config => cli}/.config/weechat/relay.conf (100%) rename {config => cli}/.config/weechat/ruby.conf (100%) rename {config => cli}/.config/weechat/script.conf (100%) rename {config => cli}/.config/weechat/sec.conf (100%) rename {config => cli}/.config/weechat/spell.conf (100%) rename {config => cli}/.config/weechat/tcl.conf (100%) rename {config => cli}/.config/weechat/trigger.conf (100%) rename {config => cli}/.config/weechat/typing.conf (100%) rename {config => cli}/.config/weechat/weechat.conf (100%) rename {config => cli}/.config/weechat/xfer.conf (100%) rename {config => cli}/.config/yazi/flavors/kanagawa.yazi/LICENSE (100%) rename {config => cli}/.config/yazi/flavors/kanagawa.yazi/LICENSE-tmtheme (100%) rename {config => cli}/.config/yazi/flavors/kanagawa.yazi/README.md (100%) rename {config => cli}/.config/yazi/flavors/kanagawa.yazi/flavor.toml (100%) rename {config => cli}/.config/yazi/flavors/kanagawa.yazi/preview.png (100%) rename {config => cli}/.config/yazi/flavors/kanagawa.yazi/tmtheme.xml (100%) rename {config => cli}/.config/yazi/keymap.toml (100%) rename {config => cli}/.config/yazi/package.toml (100%) rename {config => cli}/.config/yazi/plugins/bookmarks.yazi/LICENSE (100%) rename {config => cli}/.config/yazi/plugins/bookmarks.yazi/README.md (100%) rename {config => cli}/.config/yazi/plugins/bookmarks.yazi/main.lua (100%) rename {config => cli}/.config/yazi/plugins/chmod.yazi/LICENSE (100%) rename {config => cli}/.config/yazi/plugins/chmod.yazi/README.md (100%) rename {config => cli}/.config/yazi/plugins/chmod.yazi/main.lua (100%) rename {config => cli}/.config/yazi/plugins/lazygit.yazi/LICENSE (100%) rename {config => cli}/.config/yazi/plugins/lazygit.yazi/README.md (100%) rename {config => cli}/.config/yazi/plugins/lazygit.yazi/main.lua (100%) rename {config => cli}/.config/yazi/plugins/restore.yazi/LICENSE (100%) rename {config => cli}/.config/yazi/plugins/restore.yazi/README.md (100%) rename {config => cli}/.config/yazi/plugins/restore.yazi/main.lua (100%) rename {config => cli}/.config/yazi/plugins/what-size.yazi/LICENSE (100%) rename {config => cli}/.config/yazi/plugins/what-size.yazi/README.md (100%) rename {config => cli}/.config/yazi/plugins/what-size.yazi/main.lua (100%) rename {config => cli}/.config/yazi/theme.toml (100%) rename {config => cli}/.config/yazi/yazi.toml (97%) create mode 100644 gui/.config/alacritty.toml rename {config => gui}/.config/dunst/dunstrc (100%) rename {config => gui}/.config/hypr/hyprland.conf (74%) rename {config => gui}/.config/hypr/hyprpaper.conf (100%) rename {config => gui}/.config/kitty/kitty.conf (100%) rename {config => gui}/.config/kitty/theme.conf (100%) rename {config => gui}/.config/sioyek/prefs.config (100%) rename {config => gui}/.config/tofi/config (100%) rename {config => gui}/.config/waybar/config (100%) rename {config => gui}/.config/waybar/style.css (100%) diff --git a/config/.config/lazygit/config.yml b/cli/.config/lazygit/config.yml similarity index 100% rename from config/.config/lazygit/config.yml rename to cli/.config/lazygit/config.yml diff --git a/config/.config/weechat/alias.conf b/cli/.config/weechat/alias.conf similarity index 100% rename from config/.config/weechat/alias.conf rename to cli/.config/weechat/alias.conf diff --git a/config/.config/weechat/buflist.conf b/cli/.config/weechat/buflist.conf similarity index 100% rename from config/.config/weechat/buflist.conf rename to cli/.config/weechat/buflist.conf diff --git a/config/.config/weechat/charset.conf b/cli/.config/weechat/charset.conf similarity index 100% rename from config/.config/weechat/charset.conf rename to cli/.config/weechat/charset.conf diff --git a/config/.config/weechat/exec.conf b/cli/.config/weechat/exec.conf similarity index 100% rename from config/.config/weechat/exec.conf rename to cli/.config/weechat/exec.conf diff --git a/config/.config/weechat/fifo.conf b/cli/.config/weechat/fifo.conf similarity index 100% rename from config/.config/weechat/fifo.conf rename to cli/.config/weechat/fifo.conf diff --git a/config/.config/weechat/fset.conf b/cli/.config/weechat/fset.conf similarity index 100% rename from config/.config/weechat/fset.conf rename to cli/.config/weechat/fset.conf diff --git a/config/.config/weechat/guile.conf b/cli/.config/weechat/guile.conf similarity index 100% rename from config/.config/weechat/guile.conf rename to cli/.config/weechat/guile.conf diff --git a/config/.config/weechat/irc.conf b/cli/.config/weechat/irc.conf similarity index 100% rename from config/.config/weechat/irc.conf rename to cli/.config/weechat/irc.conf diff --git a/config/.config/weechat/logger.conf b/cli/.config/weechat/logger.conf similarity index 100% rename from config/.config/weechat/logger.conf rename to cli/.config/weechat/logger.conf diff --git a/config/.config/weechat/lua.conf b/cli/.config/weechat/lua.conf similarity index 100% rename from config/.config/weechat/lua.conf rename to cli/.config/weechat/lua.conf diff --git a/config/.config/weechat/perl.conf b/cli/.config/weechat/perl.conf similarity index 100% rename from config/.config/weechat/perl.conf rename to cli/.config/weechat/perl.conf diff --git a/config/.config/weechat/plugins.conf b/cli/.config/weechat/plugins.conf similarity index 100% rename from config/.config/weechat/plugins.conf rename to cli/.config/weechat/plugins.conf diff --git a/config/.config/weechat/python.conf b/cli/.config/weechat/python.conf similarity index 100% rename from config/.config/weechat/python.conf rename to cli/.config/weechat/python.conf diff --git a/config/.config/weechat/relay.conf b/cli/.config/weechat/relay.conf similarity index 100% rename from config/.config/weechat/relay.conf rename to cli/.config/weechat/relay.conf diff --git a/config/.config/weechat/ruby.conf b/cli/.config/weechat/ruby.conf similarity index 100% rename from config/.config/weechat/ruby.conf rename to cli/.config/weechat/ruby.conf diff --git a/config/.config/weechat/script.conf b/cli/.config/weechat/script.conf similarity index 100% rename from config/.config/weechat/script.conf rename to cli/.config/weechat/script.conf diff --git a/config/.config/weechat/sec.conf b/cli/.config/weechat/sec.conf similarity index 100% rename from config/.config/weechat/sec.conf rename to cli/.config/weechat/sec.conf diff --git a/config/.config/weechat/spell.conf b/cli/.config/weechat/spell.conf similarity index 100% rename from config/.config/weechat/spell.conf rename to cli/.config/weechat/spell.conf diff --git a/config/.config/weechat/tcl.conf b/cli/.config/weechat/tcl.conf similarity index 100% rename from config/.config/weechat/tcl.conf rename to cli/.config/weechat/tcl.conf diff --git a/config/.config/weechat/trigger.conf b/cli/.config/weechat/trigger.conf similarity index 100% rename from config/.config/weechat/trigger.conf rename to cli/.config/weechat/trigger.conf diff --git a/config/.config/weechat/typing.conf b/cli/.config/weechat/typing.conf similarity index 100% rename from config/.config/weechat/typing.conf rename to cli/.config/weechat/typing.conf diff --git a/config/.config/weechat/weechat.conf b/cli/.config/weechat/weechat.conf similarity index 100% rename from config/.config/weechat/weechat.conf rename to cli/.config/weechat/weechat.conf diff --git a/config/.config/weechat/xfer.conf b/cli/.config/weechat/xfer.conf similarity index 100% rename from config/.config/weechat/xfer.conf rename to cli/.config/weechat/xfer.conf diff --git a/config/.config/yazi/flavors/kanagawa.yazi/LICENSE b/cli/.config/yazi/flavors/kanagawa.yazi/LICENSE similarity index 100% rename from config/.config/yazi/flavors/kanagawa.yazi/LICENSE rename to cli/.config/yazi/flavors/kanagawa.yazi/LICENSE diff --git a/config/.config/yazi/flavors/kanagawa.yazi/LICENSE-tmtheme b/cli/.config/yazi/flavors/kanagawa.yazi/LICENSE-tmtheme similarity index 100% rename from config/.config/yazi/flavors/kanagawa.yazi/LICENSE-tmtheme rename to cli/.config/yazi/flavors/kanagawa.yazi/LICENSE-tmtheme diff --git a/config/.config/yazi/flavors/kanagawa.yazi/README.md b/cli/.config/yazi/flavors/kanagawa.yazi/README.md similarity index 100% rename from config/.config/yazi/flavors/kanagawa.yazi/README.md rename to cli/.config/yazi/flavors/kanagawa.yazi/README.md diff --git a/config/.config/yazi/flavors/kanagawa.yazi/flavor.toml b/cli/.config/yazi/flavors/kanagawa.yazi/flavor.toml similarity index 100% rename from config/.config/yazi/flavors/kanagawa.yazi/flavor.toml rename to cli/.config/yazi/flavors/kanagawa.yazi/flavor.toml diff --git a/config/.config/yazi/flavors/kanagawa.yazi/preview.png b/cli/.config/yazi/flavors/kanagawa.yazi/preview.png similarity index 100% rename from config/.config/yazi/flavors/kanagawa.yazi/preview.png rename to cli/.config/yazi/flavors/kanagawa.yazi/preview.png diff --git a/config/.config/yazi/flavors/kanagawa.yazi/tmtheme.xml b/cli/.config/yazi/flavors/kanagawa.yazi/tmtheme.xml similarity index 100% rename from config/.config/yazi/flavors/kanagawa.yazi/tmtheme.xml rename to cli/.config/yazi/flavors/kanagawa.yazi/tmtheme.xml diff --git a/config/.config/yazi/keymap.toml b/cli/.config/yazi/keymap.toml similarity index 100% rename from config/.config/yazi/keymap.toml rename to cli/.config/yazi/keymap.toml diff --git a/config/.config/yazi/package.toml b/cli/.config/yazi/package.toml similarity index 100% rename from config/.config/yazi/package.toml rename to cli/.config/yazi/package.toml diff --git a/config/.config/yazi/plugins/bookmarks.yazi/LICENSE b/cli/.config/yazi/plugins/bookmarks.yazi/LICENSE similarity index 100% rename from config/.config/yazi/plugins/bookmarks.yazi/LICENSE rename to cli/.config/yazi/plugins/bookmarks.yazi/LICENSE diff --git a/config/.config/yazi/plugins/bookmarks.yazi/README.md b/cli/.config/yazi/plugins/bookmarks.yazi/README.md similarity index 100% rename from config/.config/yazi/plugins/bookmarks.yazi/README.md rename to cli/.config/yazi/plugins/bookmarks.yazi/README.md diff --git a/config/.config/yazi/plugins/bookmarks.yazi/main.lua b/cli/.config/yazi/plugins/bookmarks.yazi/main.lua similarity index 100% rename from config/.config/yazi/plugins/bookmarks.yazi/main.lua rename to cli/.config/yazi/plugins/bookmarks.yazi/main.lua diff --git a/config/.config/yazi/plugins/chmod.yazi/LICENSE b/cli/.config/yazi/plugins/chmod.yazi/LICENSE similarity index 100% rename from config/.config/yazi/plugins/chmod.yazi/LICENSE rename to cli/.config/yazi/plugins/chmod.yazi/LICENSE diff --git a/config/.config/yazi/plugins/chmod.yazi/README.md b/cli/.config/yazi/plugins/chmod.yazi/README.md similarity index 100% rename from config/.config/yazi/plugins/chmod.yazi/README.md rename to cli/.config/yazi/plugins/chmod.yazi/README.md diff --git a/config/.config/yazi/plugins/chmod.yazi/main.lua b/cli/.config/yazi/plugins/chmod.yazi/main.lua similarity index 100% rename from config/.config/yazi/plugins/chmod.yazi/main.lua rename to cli/.config/yazi/plugins/chmod.yazi/main.lua diff --git a/config/.config/yazi/plugins/lazygit.yazi/LICENSE b/cli/.config/yazi/plugins/lazygit.yazi/LICENSE similarity index 100% rename from config/.config/yazi/plugins/lazygit.yazi/LICENSE rename to cli/.config/yazi/plugins/lazygit.yazi/LICENSE diff --git a/config/.config/yazi/plugins/lazygit.yazi/README.md b/cli/.config/yazi/plugins/lazygit.yazi/README.md similarity index 100% rename from config/.config/yazi/plugins/lazygit.yazi/README.md rename to cli/.config/yazi/plugins/lazygit.yazi/README.md diff --git a/config/.config/yazi/plugins/lazygit.yazi/main.lua b/cli/.config/yazi/plugins/lazygit.yazi/main.lua similarity index 100% rename from config/.config/yazi/plugins/lazygit.yazi/main.lua rename to cli/.config/yazi/plugins/lazygit.yazi/main.lua diff --git a/config/.config/yazi/plugins/restore.yazi/LICENSE b/cli/.config/yazi/plugins/restore.yazi/LICENSE similarity index 100% rename from config/.config/yazi/plugins/restore.yazi/LICENSE rename to cli/.config/yazi/plugins/restore.yazi/LICENSE diff --git a/config/.config/yazi/plugins/restore.yazi/README.md b/cli/.config/yazi/plugins/restore.yazi/README.md similarity index 100% rename from config/.config/yazi/plugins/restore.yazi/README.md rename to cli/.config/yazi/plugins/restore.yazi/README.md diff --git a/config/.config/yazi/plugins/restore.yazi/main.lua b/cli/.config/yazi/plugins/restore.yazi/main.lua similarity index 100% rename from config/.config/yazi/plugins/restore.yazi/main.lua rename to cli/.config/yazi/plugins/restore.yazi/main.lua diff --git a/config/.config/yazi/plugins/what-size.yazi/LICENSE b/cli/.config/yazi/plugins/what-size.yazi/LICENSE similarity index 100% rename from config/.config/yazi/plugins/what-size.yazi/LICENSE rename to cli/.config/yazi/plugins/what-size.yazi/LICENSE diff --git a/config/.config/yazi/plugins/what-size.yazi/README.md b/cli/.config/yazi/plugins/what-size.yazi/README.md similarity index 100% rename from config/.config/yazi/plugins/what-size.yazi/README.md rename to cli/.config/yazi/plugins/what-size.yazi/README.md diff --git a/config/.config/yazi/plugins/what-size.yazi/main.lua b/cli/.config/yazi/plugins/what-size.yazi/main.lua similarity index 100% rename from config/.config/yazi/plugins/what-size.yazi/main.lua rename to cli/.config/yazi/plugins/what-size.yazi/main.lua diff --git a/config/.config/yazi/theme.toml b/cli/.config/yazi/theme.toml similarity index 100% rename from config/.config/yazi/theme.toml rename to cli/.config/yazi/theme.toml diff --git a/config/.config/yazi/yazi.toml b/cli/.config/yazi/yazi.toml similarity index 97% rename from config/.config/yazi/yazi.toml rename to cli/.config/yazi/yazi.toml index 7a9f441..51daa84 100644 --- a/config/.config/yazi/yazi.toml +++ b/cli/.config/yazi/yazi.toml @@ -1,6 +1,6 @@ [mgr] sort_by = "extension" -show_hidden = true +show_hidden = false [opener] imagefeh = [ @@ -30,4 +30,3 @@ rules = [ append_rules = [ { name = "*", use = ["edit", "open", "play"]} ] - diff --git a/gui/.config/alacritty.toml b/gui/.config/alacritty.toml new file mode 100644 index 0000000..4441845 --- /dev/null +++ b/gui/.config/alacritty.toml @@ -0,0 +1,41 @@ +[window] +opacity = 0.8 + +[font] +normal = { family = "monospace", style = "Medium" } + +[colors.primary] +foreground = "#f7f6ec" +background = "#1c1c1c" + +[colors.cursor] +text = "#1d1d1d" +cursor = "#eccf4f" + +[colors.selection] +text = "#f7f6ec" +background = "#385776" + +[colors.normal] +black = "#343835" +red = "#ce3e60" +green = "#7bb75b" +yellow = "#e8b32a" +blue = "#4c99d3" +magenta = "#a57fc4" +cyan = "#389aac" +white = "#f9faf6" + +[colors.bright] +black = "#585a58" +red = "#d18ea6" +green = "#767e2b" +yellow = "#77592e" +blue = "#337879" +magenta = "#7f5190" +cyan = "#76bbca" +white = "#b1b5ae" + +[window.padding] +x = 1 +y = 1 diff --git a/config/.config/dunst/dunstrc b/gui/.config/dunst/dunstrc similarity index 100% rename from config/.config/dunst/dunstrc rename to gui/.config/dunst/dunstrc diff --git a/config/.config/hypr/hyprland.conf b/gui/.config/hypr/hyprland.conf similarity index 74% rename from config/.config/hypr/hyprland.conf rename to gui/.config/hypr/hyprland.conf index cb4ee64..0fdb398 100644 --- a/config/.config/hypr/hyprland.conf +++ b/gui/.config/hypr/hyprland.conf @@ -1,16 +1,12 @@ #######################################################################################hypr -# Current setup for mirroring -# TODO: create a keybind for F7 to switch betwen -#monitor=,preferred,auto,1 monitor = , preferred, auto, 1, mirror, eDP-1 ####################################################################################### -#$terminal = ~/projects/scripts/run_kitty.sh -$terminal = kitty +$terminal = alacritty $explorer = dolphin --platformtheme kvantum -$menu = tofi-drun --terminal=$terminal | sh +$menu = tofi-drun --terminal=kitty | sh # Need to use kitty here ####################################################################################### @@ -39,13 +35,10 @@ workspace=7,monitor:HDMI-A-2 workspace=9,monitor:HDMI-A-2 workspace=0,monitor:HDMI-A-2 - env = HYPRCURSOR_THEME,catppuccin-frappe-rosewater-cursors -# This cursor needs to bigger than defined in nix becuase I dont know env = HYPRCURSOR_SIZE,18 env = WLR_NO_HARDWARE_CURSORS,1 - ####################################################################################### general { @@ -59,34 +52,8 @@ general { animations { enabled = no - - # Default curves, see https://wiki.hypr.land/Configuring/Animations/#curves - # NAME, X0, Y0, X1, Y1 - bezier = easeOutQuint, 0.23, 1, 0.32, 1 - bezier = easeInOutCubic, 0.65, 0.05, 0.36, 1 - bezier = linear, 0, 0, 1, 1 - bezier = almostLinear, 0.5, 0.5, 0.75, 1 - bezier = quick, 0.15, 0, 0.1, 1 - - # Default animations, see https://wiki.hypr.land/Configuring/Animations/ - # NAME, ONOFF, SPEED, CURVE, [STYLE] - animation = global, 1, 10, default - animation = border, 1, 5.39, easeOutQuint - animation = windows, 1, 4.79, easeOutQuint - animation = windowsIn, 1, 4.1, easeOutQuint, popin 87% - animation = windowsOut, 1, 1.49, linear, popin 87% - animation = fadeIn, 1, 1.73, almostLinear - animation = fadeOut, 1, 1.46, almostLinear - animation = fade, 1, 3.03, quick - animation = layers, 1, 3.81, easeOutQuint - animation = layersIn, 1, 4, easeOutQuint, fade - animation = layersOut, 1, 1.5, linear, fade - animation = fadeLayersIn, 1, 1.79, almostLinear - animation = fadeLayersOut, 1, 1.39, almostLinear - animation = workspaces, 1, 1.94, almostLinear, fade - animation = workspacesIn, 1, 1.21, almostLinear, fade - animation = workspacesOut, 1, 1.94, almostLinear, fade } + misc { disable_hyprland_logo = true } @@ -99,18 +66,14 @@ input { } } -################### -### KEYBINDINGS ### -################### - $mainMod = SUPER # Quick openers and default bindings bind = $mainMod, Q, exec, $terminal bind = $mainMod, C, killactive, bind = $mainMod, B, exec, firefox -bind = $mainMod, R, exec, kitty -e yazi -bind = $mainMod, V, exec, kitty -e nvim +bind = $mainMod, R, exec, alacritty -e yazi +bind = $mainMod, V, exec, alacritty -e nvim bind = $mainMod, M, exit, bind = $mainMod, F, togglefloating, bind = $mainMod, P, exec, $menu @@ -148,8 +111,6 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8 bind = $mainMod SHIFT, 9, movetoworkspace, 9 bind = $mainMod SHIFT, 0, movetoworkspace, 10 bind = $mainMod, F12, exec, ~/projects/scripts/unison_sync.sh -# showing the clipboard history -#bind = SUPER, V, exec, kitty --class clipse -e clipse # Resizeing with mouse buttons while pressed mod bindm = $mainMod, mouse:272, movewindow @@ -166,10 +127,6 @@ bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 3%- bindt = Super_L, W,exec, pkill -SIGUSR1 waybar bindt = $mainMod SHIFT, L, exec, hyprlock -####################################################################################### - -# Some settings for floating apps - # Ignore maximize requests from apps. You'll probably like this. windowrulev2 = suppressevent maximize, class:.* @@ -179,11 +136,9 @@ windowrulev2 = stayfocused, class:(clipse) windowrulev2 = float, class:(org.kde.dolphin) # App rules -# Terminal basekittyd +windowrulev2 = workspace 1, class:(Alacritty) windowrulev2 = workspace 1, class:(kitty) windowrulev2 = workspace 1, class:(Emacs) -windowrulev2 = workspace 1, class:(foot) -windowrulev2 = workspace 1, class:(Alacritty) # Browsers windowrulev2 = workspace 2, class:(firefox) @@ -245,13 +200,11 @@ windowrulev2 = float, title:(Open File) windowrulev2 = float, title:(Open Folder) windowrulev2 = float, title:(Save As) -# fixing the movement for smaller res displays windowrulev2 = size 450 450, class:(Gnuplot) windowrulev2 = move 100 203100, class:(Gnuplot) windowrulev2 = float, class:(io.github.Qalculate.qalculate-qt) windowrulev2 = size 700 700, class:(Qalculate!) -#windowrulev2 = tile, class:^(sioyek)$ windowrulev2 = float, title:(Select Document) windowrulev2 = size 800 250, class:(org.pulseaudio.pavucontrol) @@ -259,15 +212,10 @@ windowrulev2 = move 40 80, class:(org.pulseaudio.pavucontrol) windowrulev2 = float, class:(org.pulseaudio.pavucontrol) windowrulev2 = float, class:(cheese) - - -# Setup drag and drop support for terminal based applications windowrulev2 = move 50 100, class:(xdragon) windowrulev2 = pin, class:(xdragon) windowrulev2 = pseudo, class:(xdragon) -#windowrulev2 = opacity 0.9, class:(xdragon) windowrulev2 = bordersize 30, class:(xdragon) windowrulev2 = bordercolor rgba(b3cc1aee) rgba(a3af1aee), class:(xdragon) windowrulev2 = rounding 3, class:(xdragon) -####################################################################################### diff --git a/config/.config/hypr/hyprpaper.conf b/gui/.config/hypr/hyprpaper.conf similarity index 100% rename from config/.config/hypr/hyprpaper.conf rename to gui/.config/hypr/hyprpaper.conf diff --git a/config/.config/kitty/kitty.conf b/gui/.config/kitty/kitty.conf similarity index 100% rename from config/.config/kitty/kitty.conf rename to gui/.config/kitty/kitty.conf diff --git a/config/.config/kitty/theme.conf b/gui/.config/kitty/theme.conf similarity index 100% rename from config/.config/kitty/theme.conf rename to gui/.config/kitty/theme.conf diff --git a/config/.config/sioyek/prefs.config b/gui/.config/sioyek/prefs.config similarity index 100% rename from config/.config/sioyek/prefs.config rename to gui/.config/sioyek/prefs.config diff --git a/config/.config/tofi/config b/gui/.config/tofi/config similarity index 100% rename from config/.config/tofi/config rename to gui/.config/tofi/config diff --git a/config/.config/waybar/config b/gui/.config/waybar/config similarity index 100% rename from config/.config/waybar/config rename to gui/.config/waybar/config diff --git a/config/.config/waybar/style.css b/gui/.config/waybar/style.css similarity index 100% rename from config/.config/waybar/style.css rename to gui/.config/waybar/style.css diff --git a/home/.common_shell b/home/.common_shell index e752d03..a9be2ce 100644 --- a/home/.common_shell +++ b/home/.common_shell @@ -1,8 +1,15 @@ -############################# -# common conf across shells # -############################# +######################################### +# Common config across different shells # +######################################### + +export EDITOR='nvim' +export HTTP_HOME="duckduckgo.com" +export RANGER_LOAD_DEFAULT_RC=false +export PATH=$HOME/programs_local/:$HOME/.cargo/bin:~/projects/scripts:$HOME/.local/bin:/usr/local/bin:$PATH +export MANPAGER="nvim +Man!" +export GOPATH=$HOME/.go +export PATH=$HOME/.go/bin:$PATH -# Setting some aliases alias on="nvim ~/projects/planner/quick.md" alias ns="nix-shell -p " alias um="umount /mnt/webdav" @@ -27,7 +34,6 @@ alias m="make" alias mn="make nix" alias syn="~/projects/scripts/run_unison.sh" alias s="~/projects/scripts/run_unison.sh" -#alias synu="unison MainAll_CIP" alias rmt="rm /tmp/all_git_projects" alias fu="chch && fla && shd" alias fla="sudo nixos-rebuild switch --flake ~/nixos#" @@ -38,19 +44,8 @@ alias tkkk="tmux kill-server" alias feh="feh -d" alias os="cd /nix/store && yazi" - -# command to rest to the current dir of the tmux session (as in the session name) -# replace a leading _ in the session name with a . -# This breaks the shell if no tmux session is there -# alias rr="\cd ~$(tmux display-message -p '#S' | sed 's/^_/\./')" - -# ripgrep all +export loc="$HOME/files_local/" alias rga="rg --hidden --no-ignore" -# light ripgrep -# Does not work as excpected -#alias rgl='rg --files --hidden --glob "!**/.git/*" --glob "!**/.cache/*" --glob "!**/.local/*" --glob "!**/bigfiles/*" --glob "!**/*.{jpg,png,gif,mp4,mkv,tar,zip,iso}"' -# ripgrep preview -# TODO: make find dotfiles alias g='nvim -c "lua require(\"telescope.builtin\").live_grep()"' alias n="nvim" alias nr='nvim -c "lua require(\"telescope.builtin\").oldfiles()"' @@ -72,36 +67,18 @@ alias chch="~/projects/scripts/check_git.sh" alias fa="fastfetch" alias gui="Hyprland && clear" alias ls='ls --color=auto' -# This updates the tofi database alias tofiu='rm ~/.cache/tofi-drun' alias ll='exa -la ' -#alias shd="~/projects/scripts/run_unison.sh && pkill -u $(whoami)" -# TODO: implement a way to always sync on startup and shutdown alias shd="shutdown now" alias ttt='timer -f 10m' alias zshconfig="mate ~/.zshrc" alias giter="git add . && git commit -a -m 'auto commit' && git push" alias grep='grep --color=always' -# Office stuff alias oiiiii="bash ~/management/office/sync.sh in" alias ou="bash ~/management/office/sync.sh out" alias aiiiii="bash ~/projects/scripts/sync_all.sh in" alias au="bash ~/projects/scripts/sync_all.sh out" -########################################################################### - -# Exports # -export EDITOR='nvim' -export HTTP_HOME="duckduckgo.com" -export RANGER_LOAD_DEFAULT_RC=false -export PATH=$HOME/programs_local/:$HOME/.cargo/bin:~/projects/scripts:$HOME/.local/bin:/usr/local/bin:$PATH -export MANPAGER="nvim +Man!" - -export PATH=$HOME/go/bin:$PATH - -# Used by some scripts as shortcuts -export loc="$HOME/files_local/" - diff --git a/home/.ssh/config b/home/.ssh/config index 08f9fbc..4e9964a 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -3,6 +3,11 @@ Host github.com User git IdentityFile ~/.ssh/id_github +Host gitlab.gwdg.de + HostName gitlab.gwdg.de + User git + IdentityFile ~/.ssh/id_gitlab_gwdg + Host strato HostName hahn1.one User root