diff --git a/config/.config/amfora/config.toml b/config/amfora/config.toml
similarity index 100%
rename from config/.config/amfora/config.toml
rename to config/amfora/config.toml
diff --git a/config/.config/amfora/newtab.gmi b/config/amfora/newtab.gmi
similarity index 100%
rename from config/.config/amfora/newtab.gmi
rename to config/amfora/newtab.gmi
diff --git a/config/bat/bat b/config/bat/bat
new file mode 120000
index 0000000..706ab34
--- /dev/null
+++ b/config/bat/bat
@@ -0,0 +1 @@
+/home/jas/repos/git.hyperreal.coffee/hyperreal/dotfiles/config/bat
\ No newline at end of file
diff --git a/config/.config/bat/config b/config/bat/config
similarity index 100%
rename from config/.config/bat/config
rename to config/bat/config
diff --git a/config/.config/bat/themes/Catppuccin-mocha.tmTheme b/config/bat/themes/Catppuccin-mocha.tmTheme
similarity index 100%
rename from config/.config/bat/themes/Catppuccin-mocha.tmTheme
rename to config/bat/themes/Catppuccin-mocha.tmTheme
diff --git a/config/.config/devilspie2/devilspie2.lua b/config/devilspie2/devilspie2.lua
similarity index 100%
rename from config/.config/devilspie2/devilspie2.lua
rename to config/devilspie2/devilspie2.lua
diff --git a/config/.config/ghostty/config b/config/ghostty/config
similarity index 100%
rename from config/.config/ghostty/config
rename to config/ghostty/config
diff --git a/config/.config/git/config b/config/git/config
similarity index 100%
rename from config/.config/git/config
rename to config/git/config
diff --git a/config/git/git b/config/git/git
new file mode 120000
index 0000000..0d70d60
--- /dev/null
+++ b/config/git/git
@@ -0,0 +1 @@
+/home/jas/repos/git.hyperreal.coffee/hyperreal/dotfiles/config/git
\ No newline at end of file
diff --git a/config/.config/newsboat/config b/config/newsboat/config
similarity index 100%
rename from config/.config/newsboat/config
rename to config/newsboat/config
diff --git a/config/newsboat/newsboat b/config/newsboat/newsboat
new file mode 120000
index 0000000..47b6da0
--- /dev/null
+++ b/config/newsboat/newsboat
@@ -0,0 +1 @@
+/home/jas/repos/git.hyperreal.coffee/hyperreal/dotfiles/config/newsboat
\ No newline at end of file
diff --git a/config/.config/rofi/catppuccin.rasi b/config/rofi/catppuccin.rasi
similarity index 100%
rename from config/.config/rofi/catppuccin.rasi
rename to config/rofi/catppuccin.rasi
diff --git a/config/.config/rofi/config.rasi b/config/rofi/config.rasi
similarity index 100%
rename from config/.config/rofi/config.rasi
rename to config/rofi/config.rasi
diff --git a/config/rofi/rofi b/config/rofi/rofi
new file mode 120000
index 0000000..9c25fe6
--- /dev/null
+++ b/config/rofi/rofi
@@ -0,0 +1 @@
+/home/jas/repos/git.hyperreal.coffee/hyperreal/dotfiles/config/rofi
\ No newline at end of file
diff --git a/config/.config/starship.toml b/config/starship.toml
similarity index 100%
rename from config/.config/starship.toml
rename to config/starship.toml
diff --git a/config/.config/systemd/user/quick-backup.service b/config/systemd/user/quick-backup.service
similarity index 100%
rename from config/.config/systemd/user/quick-backup.service
rename to config/systemd/user/quick-backup.service
diff --git a/config/.config/systemd/user/quick-backup.timer b/config/systemd/user/quick-backup.timer
similarity index 100%
rename from config/.config/systemd/user/quick-backup.timer
rename to config/systemd/user/quick-backup.timer
diff --git a/config/.config/systemd/user/sync_to_remotes.service b/config/systemd/user/sync_to_remotes.service
similarity index 100%
rename from config/.config/systemd/user/sync_to_remotes.service
rename to config/systemd/user/sync_to_remotes.service
diff --git a/config/.config/systemd/user/sync_to_remotes.timer b/config/systemd/user/sync_to_remotes.timer
similarity index 100%
rename from config/.config/systemd/user/sync_to_remotes.timer
rename to config/systemd/user/sync_to_remotes.timer
diff --git a/config/.config/systemd/user/timers.target.wants/quick-backup.timer b/config/systemd/user/timers.target.wants/quick-backup.timer
similarity index 100%
rename from config/.config/systemd/user/timers.target.wants/quick-backup.timer
rename to config/systemd/user/timers.target.wants/quick-backup.timer
diff --git a/config/.config/systemd/user/timers.target.wants/sync_to_remotes.timer b/config/systemd/user/timers.target.wants/sync_to_remotes.timer
similarity index 100%
rename from config/.config/systemd/user/timers.target.wants/sync_to_remotes.timer
rename to config/systemd/user/timers.target.wants/sync_to_remotes.timer
diff --git a/config/.config/xfce4/desktop/icons.screen.latest.rc b/config/xfce4-desktop/desktop/icons.screen.latest.rc
similarity index 100%
rename from config/.config/xfce4/desktop/icons.screen.latest.rc
rename to config/xfce4-desktop/desktop/icons.screen.latest.rc
diff --git a/config/.config/xfce4/desktop/icons.screen0-1904x1036.rc b/config/xfce4-desktop/desktop/icons.screen0-1904x1036.rc
similarity index 100%
rename from config/.config/xfce4/desktop/icons.screen0-1904x1036.rc
rename to config/xfce4-desktop/desktop/icons.screen0-1904x1036.rc
diff --git a/config/.config/xfce4/desktop/icons.screen0-1904x1037.rc b/config/xfce4-desktop/desktop/icons.screen0-1904x1037.rc
similarity index 100%
rename from config/.config/xfce4/desktop/icons.screen0-1904x1037.rc
rename to config/xfce4-desktop/desktop/icons.screen0-1904x1037.rc
diff --git a/config/.config/xfce4/desktop/icons.screen0-3824x2117.rc b/config/xfce4-desktop/desktop/icons.screen0-3824x2117.rc
similarity index 100%
rename from config/.config/xfce4/desktop/icons.screen0-3824x2117.rc
rename to config/xfce4-desktop/desktop/icons.screen0-3824x2117.rc
diff --git a/config/.config/xfce4/helpers.rc b/config/xfce4-desktop/helpers.rc
similarity index 100%
rename from config/.config/xfce4/helpers.rc
rename to config/xfce4-desktop/helpers.rc
diff --git a/config/xfce4-desktop/panel/docklike-2.rc b/config/xfce4-desktop/panel/docklike-2.rc
new file mode 100644
index 0000000..64b4c2b
--- /dev/null
+++ b/config/xfce4-desktop/panel/docklike-2.rc
@@ -0,0 +1,3 @@
+[user]
+indicatorOrientation=0
+pinned=/usr/share/applications/thunar.desktop;/usr/share/applications/galculator.desktop;/usr/share/applications/librewolf.desktop;/var/lib/flatpak/exports/share/applications/fi.skyjake.Lagrange.desktop;/usr/share/applications/org.telegram.desktop.desktop;/var/lib/flatpak/exports/share/applications/com.discordapp.Discord.desktop;/usr/share/applications/org.gajim.Gajim.desktop;/usr/share/applications/calibre-gui.desktop;/usr/share/applications/timeshift-gtk.desktop;
diff --git a/config/.config/xfce4/panel/genmon-5.rc b/config/xfce4-desktop/panel/genmon-5.rc
similarity index 100%
rename from config/.config/xfce4/panel/genmon-5.rc
rename to config/xfce4-desktop/panel/genmon-5.rc
diff --git a/config/.config/xfce4/panel/genmon-9.rc b/config/xfce4-desktop/panel/genmon-9.rc
similarity index 100%
rename from config/.config/xfce4/panel/genmon-9.rc
rename to config/xfce4-desktop/panel/genmon-9.rc
diff --git a/config/.config/xfce4/panel/xfce4-clipman-actions.xml b/config/xfce4-desktop/panel/xfce4-clipman-actions.xml
similarity index 100%
rename from config/.config/xfce4/panel/xfce4-clipman-actions.xml
rename to config/xfce4-desktop/panel/xfce4-clipman-actions.xml
diff --git a/config/.config/xfce4/terminal/terminalrc b/config/xfce4-desktop/terminal/terminalrc
similarity index 100%
rename from config/.config/xfce4/terminal/terminalrc
rename to config/xfce4-desktop/terminal/terminalrc
diff --git a/config/xfce4-desktop/xfce4-desktop b/config/xfce4-desktop/xfce4-desktop
new file mode 120000
index 0000000..611dce7
--- /dev/null
+++ b/config/xfce4-desktop/xfce4-desktop
@@ -0,0 +1 @@
+/home/jas/repos/git.hyperreal.coffee/hyperreal/dotfiles/config/xfce4-desktop
\ No newline at end of file
diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/displays.xml
similarity index 100%
rename from config/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml
rename to config/xfce4-desktop/xfconf/xfce-perchannel-xml/displays.xml
diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/keyboards.xml
similarity index 100%
rename from config/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
rename to config/xfce4-desktop/xfconf/xfce-perchannel-xml/keyboards.xml
diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/thunar.xml
similarity index 100%
rename from config/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
rename to config/xfce4-desktop/xfconf/xfce-perchannel-xml/thunar.xml
diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
similarity index 59%
rename from config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
rename to config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
index c2b52a5..34e3801 100644
--- a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -65,6 +65,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
rename to config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
similarity index 93%
rename from config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
rename to config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
index e42f444..5bafdc9 100644
--- a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
+++ b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
@@ -5,6 +5,7 @@
+
diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-panel.xml
similarity index 94%
rename from config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
rename to config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index fc0d135..1540182 100644
--- a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -10,7 +10,7 @@
-
+
@@ -28,6 +28,7 @@
+
@@ -35,12 +36,6 @@
-
-
-
-
-
-
@@ -52,6 +47,8 @@
+
+
@@ -133,5 +130,6 @@
+
diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
similarity index 100%
rename from config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
rename to config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-session.xml
similarity index 100%
rename from config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
rename to config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-session.xml
diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
similarity index 100%
rename from config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
rename to config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfwm4.xml
similarity index 100%
rename from config/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
rename to config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfwm4.xml
diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xsettings.xml
similarity index 100%
rename from config/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
rename to config/xfce4-desktop/xfconf/xfce-perchannel-xml/xsettings.xml
diff --git a/config/.config/zellij/config.kdl b/config/zellij/config.kdl
similarity index 100%
rename from config/.config/zellij/config.kdl
rename to config/zellij/config.kdl
diff --git a/config/.config/zellij/layouts/default.kdl b/config/zellij/layouts/default.kdl
similarity index 81%
rename from config/.config/zellij/layouts/default.kdl
rename to config/zellij/layouts/default.kdl
index 744e4d0..300a1fa 100644
--- a/config/.config/zellij/layouts/default.kdl
+++ b/config/zellij/layouts/default.kdl
@@ -28,11 +28,6 @@ layout {
args "root@rpi400.headscale.moonshadow.dev"
}
}
- tab name="logs" {
- pane command="sudo" {
- args "/home/linuxbrew/.linuxbrew/bin/lnav" "/var/log/forwarded" "jas@moonshadow.headscale.moonshadow.dev:/var/log/httpd-access.log"
- }
- }
tab name="tilde.team IRC" {
pane command="autossh" {
args "hyperreal@tilde.team"
diff --git a/config/zellij/zellij b/config/zellij/zellij
new file mode 120000
index 0000000..500e84b
--- /dev/null
+++ b/config/zellij/zellij
@@ -0,0 +1 @@
+/home/jas/repos/git.hyperreal.coffee/hyperreal/dotfiles/config/zellij
\ No newline at end of file
diff --git a/just/.justfile b/just/.justfile
index 062193f..9156408 100644
--- a/just/.justfile
+++ b/just/.justfile
@@ -10,33 +10,26 @@ refresh-doom-emacs:
git clone --depth 1 https://github.com/doomemacs/doomemacs {{configdir}}/emacs
{{configdir}}/emacs/bin/doom install --force --verbose
-deploy-dotfiles:
- cp -rfv {{dotfiles_repo}}/just/.justfile {{homedir}}
- cp -rfv {{dotfiles_repo}}/doom/.doom.d {{homedir}}
- cp -fv {{dotfiles_repo}}/zsh/.zshrc {{homedir}}
- cp -rfv {{dotfiles_repo}}/zsh/.zshrc.d {{homedir}}
- cp -rfv {{dotfiles_repo}}/config/.config/bat {{configdir}}
- cp -rfv {{dotfiles_repo}}/config/.config/git {{configdir}}
- cp -rfv {{dotfiles_repo}}/config/.config/newsboat {{configdir}}
- cp -rfv {{dotfiles_repo}}/config/.config/rofi {{configdir}}
- cp -fv {{dotfiles_repo}}/config/.config/starship.toml {{configdir}}
- cp -rfv {{dotfiles_repo}}/config/.config/xfce4 {{configdir}}
- cp -rfv {{dotfiles_repo}}/config/.config/zellij {{configdir}}
- cp -rfv {{dotfiles_repo}}/local/.local/share/xfce4 {{localshare}}
+link-dotfiles:
+ #!/usr/bin/env bash
+ if [ "$(hostname)" = "desktop" ]; then
+ ln -sf {{dotfiles_repo}}/config/xfce4-desktop {{configdir}}/xfce4
+ fi
-save-dotfiles:
- cp -fv {{homedir}}/.justfile {{dotfiles_repo}}/just/
- cp -rfv {{homedir}}/.doom.d {{dotfiles_repo}}/doom/
- cp -fv {{homedir}}/.zshrc {{dotfiles_repo}}/zsh/
- cp -rfv {{homedir}}/.zshrc.d {{dotfiles_repo}}/zsh/
- cp -rfv {{configdir}}/bat {{dotfiles_repo}}/config/.config/
- cp -rfv {{configdir}}/git {{dotfiles_repo}}/config/.config/
- cp -rfv {{configdir}}/newsboat {{dotfiles_repo}}/config/.config/
- cp -rfv {{configdir}}/rofi {{dotfiles_repo}}/config/.config/
- cp -fv {{configdir}}/starship.toml {{dotfiles_repo}}/config/.config/
- cp -rfv {{configdir}}/xfce4 {{dotfiles_repo}}/config/.config/
- cp -rfv {{configdir}}/zellij {{dotfiles_repo}}/config/.config/
- cp -rfv {{localshare}}/xfce4 {{dotfiles_repo}}/local/.local/share/
+ if [ "$(hostname)" = "laptop" ]; then
+ ln -sf {{dotfiles_repo}}/config/xfce4-laptop {{configdir}}/xfce4
+ fi
+
+ ln -sf {{dotfiles_repo}}/just/.justfile {{homedir}}/.justfile
+ ln -sf {{dotfiles_repo}}/doom/.doom.d {{homedir}}/.doom.d
+ ln -sf {{dotfiles_repo}}/zsh/.zshrc {{homedir}}/.zshrc
+ ln -sf {{dotfiles_repo}}/zsh/.zshrc.d {{homedir}}/.zshrc.d
+ ln -sf {{dotfiles_repo}}/config/bat {{configdir}}/bat
+ ln -sf {{dotfiles_repo}}/config/git {{configdir}}/git
+ ln -sf {{dotfiles_repo}}/config/newsboat {{configdir}}/newsboat
+ ln -sf {{dotfiles_repo}}/config/rofi {{configdir}}/rofi
+ ln -sf {{dotfiles_repo}}/config/starship.toml {{configdir}}/starship.toml
+ ln -sf {{dotfiles_repo}}/config/zellij {{configdir}}/zellij
clean-dotfiles:
rm -fv {{homedir}}/.justfile
@@ -48,13 +41,22 @@ clean-dotfiles:
rm -rfv {{configdir}}/newsboat
rm -rfv {{configdir}}/rofi
rm -fv {{configdir}}/starship.toml
+ rm -rfv {{configdir}}/xfce4
rm -rfv {{configdir}}/zellij
+dl-catppuccin-xfce4-term:
+ mkdir -p {{homedir}}/.local/share/xfce4/terminal/colorschemes
+ wget https://raw.githubusercontent.com/catppuccin/xfce4-terminal/refs/heads/main/themes/catppuccin-mocha.theme -O {{homedir}}/.local/share/xfce4/terminal/colorschemes/catppuccin-mocha.theme
+
homebrew-progs:
#!/usr/bin/env bash
progs=(bat diff-so-fancy duf fastfetch fzf glow gum hugo lnav lsd newsboat nushell starship tealdeer yazi zellij)
for i in "${progs[@]}"; do brew install "$i"; done
+brewup:
+ brew update
+ brew upgrade
+
go-tools:
go install golang.org/x/tools/gopls@latest
go install github.com/fatih/gomodifytags@latest
diff --git a/local/.local/share/xfce4/helpers/custom-WebBrowser.desktop b/local/.local/share/xfce4/helpers/custom-WebBrowser.desktop
deleted file mode 100644
index 838a178..0000000
--- a/local/.local/share/xfce4/helpers/custom-WebBrowser.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-NoDisplay=true
-Version=1.0
-Encoding=UTF-8
-Type=X-XFCE-Helper
-X-XFCE-Category=WebBrowser
-X-XFCE-CommandsWithParameter=librewolf "%s"
-Icon=librewolf
-Name=librewolf
-X-XFCE-Commands=librewolf
-
diff --git a/local/.local/share/xfce4/terminal/colorschemes/catppuccin-mocha.theme b/local/.local/share/xfce4/terminal/colorschemes/catppuccin-mocha.theme
deleted file mode 100644
index 6441070..0000000
--- a/local/.local/share/xfce4/terminal/colorschemes/catppuccin-mocha.theme
+++ /dev/null
@@ -1,12 +0,0 @@
-[Scheme]
-Name=Catppuccin-Mocha
-ColorCursor=#f5e0dc
-ColorCursorForeground=#11111b
-ColorCursorUseDefault=FALSE
-ColorForeground=#cdd6f4
-ColorBackground=#1e1e2e
-ColorSelectionBackground=#585b70
-ColorSelection=#cdd6f4
-ColorSelectionUseDefault=FALSE
-TabActivityColor=#fab387
-ColorPalette=#45475a;#f38ba8;#a6e3a1;#f9e2af;#89b4fa;#f5c2e7;#94e2d5;#bac2de;#585b70;#f38ba8;#a6e3a1;#f9e2af;#89b4fa;#f5c2e7;#94e2d5;#a6adc8
\ No newline at end of file
diff --git a/vim/.vim/colors/catppuccin_mocha.vim b/vim/.vim/colors/catppuccin_mocha.vim
deleted file mode 100644
index 4879ed6..0000000
--- a/vim/.vim/colors/catppuccin_mocha.vim
+++ /dev/null
@@ -1,161 +0,0 @@
-" Name: catppuccin_mocha.vim
-
-set background=dark
-hi clear
-
-if exists('syntax on')
- syntax reset
-endif
-
-let g:colors_name='catppuccin_mocha'
-set t_Co=256
-
-let s:rosewater = "#F5E0DC"
-let s:flamingo = "#F2CDCD"
-let s:pink = "#F5C2E7"
-let s:mauve = "#CBA6F7"
-let s:red = "#F38BA8"
-let s:maroon = "#EBA0AC"
-let s:peach = "#FAB387"
-let s:yellow = "#F9E2AF"
-let s:green = "#A6E3A1"
-let s:teal = "#94E2D5"
-let s:sky = "#89DCEB"
-let s:sapphire = "#74C7EC"
-let s:blue = "#89B4FA"
-let s:lavender = "#B4BEFE"
-
-let s:text = "#CDD6F4"
-let s:subtext1 = "#BAC2DE"
-let s:subtext0 = "#A6ADC8"
-let s:overlay2 = "#9399B2"
-let s:overlay1 = "#7F849C"
-let s:overlay0 = "#6C7086"
-let s:surface2 = "#585B70"
-let s:surface1 = "#45475A"
-let s:surface0 = "#313244"
-
-let s:base = "#1E1E2E"
-let s:mantle = "#181825"
-let s:crust = "#11111B"
-
-function! s:hi(group, guisp, guifg, guibg, gui, cterm)
- let cmd = ""
- if a:guisp != ""
- let cmd = cmd . " guisp=" . a:guisp
- endif
- if a:guifg != ""
- let cmd = cmd . " guifg=" . a:guifg
- endif
- if a:guibg != ""
- let cmd = cmd . " guibg=" . a:guibg
- endif
- if a:gui != ""
- let cmd = cmd . " gui=" . a:gui
- endif
- if a:cterm != ""
- let cmd = cmd . " cterm=" . a:cterm
- endif
- if cmd != ""
- exec "hi " . a:group . cmd
- endif
-endfunction
-
-
-
-call s:hi("Normal", "NONE", s:text, s:base, "NONE", "NONE")
-call s:hi("Visual", "NONE", "NONE", s:surface1,"bold", "bold")
-call s:hi("Conceal", "NONE", s:overlay1, "NONE", "NONE", "NONE")
-call s:hi("ColorColumn", "NONE", "NONE", s:surface0, "NONE", "NONE")
-call s:hi("Cursor", "NONE", s:base, s:text, "NONE", "NONE")
-call s:hi("lCursor", "NONE", s:base, s:text, "NONE", "NONE")
-call s:hi("CursorIM", "NONE", s:base, s:text, "NONE", "NONE")
-call s:hi("CursorColumn", "NONE", "NONE", s:mantle, "NONE", "NONE")
-call s:hi("CursorLine", "NONE", "NONE", s:surface0, "NONE", "NONE")
-call s:hi("Directory", "NONE", s:blue, "NONE", "NONE", "NONE")
-call s:hi("DiffAdd", "NONE", s:base, s:green, "NONE", "NONE")
-call s:hi("DiffChange", "NONE", s:base, s:yellow, "NONE", "NONE")
-call s:hi("DiffDelete", "NONE", s:base, s:red, "NONE", "NONE")
-call s:hi("DiffText", "NONE", s:base, s:blue, "NONE", "NONE")
-call s:hi("EndOfBuffer", "NONE", "NONE", "NONE", "NONE", "NONE")
-call s:hi("ErrorMsg", "NONE", s:red, "NONE", "bolditalic" , "bold,italic")
-call s:hi("VertSplit", "NONE", s:crust, "NONE", "NONE", "NONE")
-call s:hi("Folded", "NONE", s:blue, s:surface1, "NONE", "NONE")
-call s:hi("FoldColumn", "NONE", s:overlay0, s:base, "NONE", "NONE")
-call s:hi("SignColumn", "NONE", s:surface1, s:base, "NONE", "NONE")
-call s:hi("IncSearch", "NONE", s:surface1, s:pink, "NONE", "NONE")
-call s:hi("CursorLineNR", "NONE", s:lavender, "NONE", "NONE", "NONE")
-call s:hi("LineNr", "NONE", s:surface1, "NONE", "NONE", "NONE")
-call s:hi("MatchParen", "NONE", s:peach, "NONE", "bold", "bold")
-call s:hi("ModeMsg", "NONE", s:text, "NONE", "bold", "bold")
-call s:hi("MoreMsg", "NONE", s:blue, "NONE", "NONE", "NONE")
-call s:hi("NonText", "NONE", s:overlay0, "NONE", "NONE", "NONE")
-call s:hi("Pmenu", "NONE", s:overlay2, s:surface0, "NONE", "NONE")
-call s:hi("PmenuSel", "NONE", s:text, s:surface1, "bold", "bold")
-call s:hi("PmenuSbar", "NONE", "NONE", s:surface1, "NONE", "NONE")
-call s:hi("PmenuThumb", "NONE", "NONE", s:overlay0, "NONE", "NONE")
-call s:hi("Question", "NONE", s:blue, "NONE", "NONE", "NONE")
-call s:hi("QuickFixLine", "NONE", "NONE", s:surface1, "bold", "bold")
-call s:hi("Search", "NONE", s:pink, s:surface1, "bold", "bold")
-call s:hi("SpecialKey", "NONE", s:subtext0, "NONE", "NONE", "NONE")
-call s:hi("SpellBad", s:red, "NONE", "NONE", "underline", "underline")
-call s:hi("SpellCap", s:yellow, "NONE", "NONE", "underline", "underline")
-call s:hi("SpellLocal", s:blue, "NONE", "NONE", "underline", "underline")
-call s:hi("SpellRare", s:green, "NONE", "NONE", "underline", "underline")
-call s:hi("StatusLine", "NONE", s:text, s:mantle, "NONE", "NONE")
-call s:hi("StatusLineNC", "NONE", s:surface1, s:mantle, "NONE", "NONE")
-call s:hi("TabLine", "NONE", s:surface1, s:mantle, "NONE", "NONE")
-call s:hi("TabLineFill", "NONE", "NONE", s:mantle, "NONE", "NONE")
-call s:hi("TabLineSel", "NONE", s:green, s:surface1, "NONE", "NONE")
-call s:hi("Title", "NONE", s:blue, "NONE", "bold", "bold")
-call s:hi("VisualNOS", "NONE", "NONE", s:surface1, "bold", "bold")
-call s:hi("WarningMsg", "NONE", s:yellow, "NONE", "NONE", "NONE")
-call s:hi("WildMenu", "NONE", "NONE", s:overlay0, "NONE", "NONE")
-call s:hi("Comment", "NONE", s:surface2, "NONE", "NONE", "NONE")
-call s:hi("Constant", "NONE", s:peach, "NONE", "NONE", "NONE")
-call s:hi("Identifier", "NONE", s:flamingo, "NONE", "NONE", "NONE")
-call s:hi("Statement", "NONE", s:mauve, "NONE", "NONE", "NONE")
-call s:hi("PreProc", "NONE", s:pink, "NONE", "NONE", "NONE")
-call s:hi("Type", "NONE", s:blue, "NONE", "NONE", "NONE")
-call s:hi("Special", "NONE", s:pink, "NONE", "NONE", "NONE")
-call s:hi("Underlined", "NONE", s:text, s:base, "underline", "underline")
-call s:hi("Error", "NONE", s:red, "NONE", "NONE", "NONE")
-call s:hi("Todo", "NONE", s:base, s:yellow, "bold", "bold")
-
-call s:hi("String", "NONE", s:green, "NONE", "NONE", "NONE")
-call s:hi("Character", "NONE", s:teal, "NONE", "NONE", "NONE")
-call s:hi("Number", "NONE", s:peach, "NONE", "NONE", "NONE")
-call s:hi("Boolean", "NONE", s:peach, "NONE", "NONE", "NONE")
-call s:hi("Float", "NONE", s:peach, "NONE", "NONE", "NONE")
-call s:hi("Function", "NONE", s:blue, "NONE", "NONE", "NONE")
-call s:hi("Conditional", "NONE", s:red, "NONE", "NONE", "NONE")
-call s:hi("Repeat", "NONE", s:red, "NONE", "NONE", "NONE")
-call s:hi("Label", "NONE", s:peach, "NONE", "NONE", "NONE")
-call s:hi("Operator", "NONE", s:sky, "NONE", "NONE", "NONE")
-call s:hi("Keyword", "NONE", s:pink, "NONE", "NONE", "NONE")
-call s:hi("Include", "NONE", s:pink, "NONE", "NONE", "NONE")
-call s:hi("StorageClass", "NONE", s:yellow, "NONE", "NONE", "NONE")
-call s:hi("Structure", "NONE", s:yellow, "NONE", "NONE", "NONE")
-call s:hi("Typedef", "NONE", s:yellow, "NONE", "NONE", "NONE")
-call s:hi("debugPC", "NONE", "NONE", s:crust, "NONE", "NONE")
-call s:hi("debugBreakpoint", "NONE", s:overlay0, s:base, "NONE", "NONE")
-
-hi link Define PreProc
-hi link Macro PreProc
-hi link PreCondit PreProc
-hi link SpecialChar Special
-hi link Tag Special
-hi link Delimiter Special
-hi link SpecialComment Special
-hi link Debug Special
-hi link Exception Error
-hi link StatusLineTerm StatusLine
-hi link StatusLineTermNC StatusLineNC
-hi link Terminal Normal
-hi link Ignore Comment
-
-" Set terminal colors for playing well with plugins like fzf
-let g:terminal_ansi_colors = [
- \ s:surface1, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:subtext1,
- \ s:surface2, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:subtext0
-\ ]
diff --git a/vim/.vimrc b/vim/.vimrc
deleted file mode 100644
index 66785ab..0000000
--- a/vim/.vimrc
+++ /dev/null
@@ -1,3 +0,0 @@
-set termguicolors
-colorscheme catppuccin_mocha
-set relativenumber