diff --git a/.gitignore b/.gitignore index 2a54598..37e7e69 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ **/fishd.tmp* vscode/argv.json -fish/completions/wezterm.fish -fish/fish_variables diff --git a/backup.sh b/backup.sh index db4603e..96934f9 100755 --- a/backup.sh +++ b/backup.sh @@ -103,6 +103,3 @@ if command_exists "xbps-install"; then cp /usr/bin/sway-runner $GIT_DIR/ sudo chown $(whoami) sway-runner fi - -# Wezterm -cp ~/.wezterm.lua $GIT_DIR/wezterm.lua \ No newline at end of file diff --git a/fish/conf.d/aliases.fish b/fish/conf.d/aliases.fish index 6402598..804978c 100644 --- a/fish/conf.d/aliases.fish +++ b/fish/conf.d/aliases.fish @@ -20,9 +20,6 @@ alias pls="please" if [ $TERM = "xterm-kitty" ] alias icat="kitten icat" alias s="kitten ssh" -else - alias icat="wezterm imgcat" - alias s="ssh" end # NixOS diff --git a/restore.sh b/restore.sh index ead604f..20001d6 100755 --- a/restore.sh +++ b/restore.sh @@ -113,8 +113,6 @@ done # WezTerm wezterm shell-completion --shell fish > ~/.config/fish/completions/wezterm.fish -cp $GIT_DIR/wezterm.lua ~/.wezterm.lua -gsettings set org.cinnamon.desktop.default-applications.terminal exec wezterm-gui # VS code mkdir -p $HOME/.config/Code/User/ diff --git a/sway/config b/sway/config index 1f176e1..1856dc5 100644 --- a/sway/config +++ b/sway/config @@ -14,7 +14,7 @@ set $down j set $up k set $right l # Your preferred terminal emulator -set $term wezterm-gui +set $term kitty # Your preferred application launcher # Note: pass the final command to swaymsg so that the resulting window can be opened # on the original workspace that the command was run on. diff --git a/vscode/extensions.txt b/vscode/extensions.txt index 09f72b0..44127e7 100644 --- a/vscode/extensions.txt +++ b/vscode/extensions.txt @@ -16,6 +16,7 @@ ctenbrinke.vscode-tsv danielpinto8zz6.c-cpp-compile-run davidanson.vscode-markdownlint diegomolina.css-minify +donjayamanne.githistory dustypomerleau.rust-syntax dzhavat.git-cheatsheet equinusocio.vsc-material-theme-icons @@ -36,14 +37,15 @@ harryhopkinson.vim-theme hoovercj.vscode-settings-cycler icrawl.discord-vscode itzselenux.lm-theme +jinxdash.prettier-rust jnoortheen.nix-ide joelcrosby.one-dark-darker jscearcy.rust-doc-viewer kisstkondoros.vscode-gutter-preview kokoscript.loopytheme +l13rary.l13-diff lacroixdavid1.vscode-format-context-menu laurenclark.sappho -lorettadevs.loretta-lua manuth.markdown-converter marlinfirmware.auto-build marvhen.reflow-markdown @@ -53,6 +55,7 @@ mechatroner.rainbow-csv mhutchie.git-graph mohd-akram.vscode-html-format ms-azuretools.vscode-docker +ms-dotnettools.vscode-dotnet-runtime ms-mssql.data-workspace-vscode ms-mssql.mssql ms-mssql.sql-bindings-vscode @@ -82,6 +85,7 @@ ms-vscode.makefile-tools ms-vscode.remote-explorer ms-vscode.remote-server ms-vscode.vscode-serial-monitor +ms-vsliveshare.vsliveshare nicscott.gitkraken-dark nord.nord novy.vsc-gcode @@ -96,6 +100,7 @@ redhat.vscode-yaml robbowen.synthwave-vscode rokoroku.vscode-theme-darcula rust-lang.rust-analyzer +sanaajani.taskrunnercode shahilkumar.docxreader slevesque.vscode-zipexplorer st0pien.min-darker @@ -112,7 +117,6 @@ vinaykumar.vice visualstudioexptteam.intellicode-api-usage-examples visualstudioexptteam.vscodeintellicode vsciot-vscode.vscode-arduino -vscjava.vscode-gradle vscjava.vscode-java-debug vscjava.vscode-java-dependency vscjava.vscode-java-pack @@ -121,7 +125,6 @@ vscjava.vscode-maven vscodevim.vim wayou.vscode-todo-highlight xaver.clang-format -yinfei.luahelper yzhang.markdown-all-in-one zamerick.vscode-caddyfile-syntax zhuangtongfa.material-theme diff --git a/wezterm.lua b/wezterm.lua deleted file mode 100644 index 344cac0..0000000 --- a/wezterm.lua +++ /dev/null @@ -1,57 +0,0 @@ -local wezterm = require 'wezterm' -local config = wezterm.config_builder() - ------ actual config ----- - -config.font = wezterm.font('FiraCode Nerd Font') -config.font_size = 11.0 - --- enable scrollbar -config.enable_scroll_bar = true - --- clone of my catppuccin mocha kitty theme (not the same as the default catppuccin mocha color scheme -config.color_scheme = 'Catppuccin Mocha' - -config.window_padding = { - left = 0, - right = 0, - top = 0, - bottom = 0 -} - -config.colors = { - foreground = '#CAD3F5', - background = '#24273A', - cursor_fg = '#24273A', - cursor_bg = '#F4DBD6', - cursor_border = '#F4DBD6', - selection_fg = '#24273A', - selection_bg = '#F4DBD6', - scrollbar_thumb = '#F4DBD6', - split = '#1E1E2E', - - ansi = { - '#494D64', -- black - '#ED8796', -- red - '#A6DA95', -- green - '#EED49F', -- yellow - '#8AADF4', -- blue - '#F5BDE6', -- magenta - '#8BD5CA', -- cyan - '#B8C0E0' -- white - }, - brights = { - '#5B6078', -- black - '#ED8796', -- red - '#A6DA95', -- green - '#EED49F', -- yellow - '#8AADF4', -- blue - '#F5BDE6', -- magenta - '#8BD5CA', -- cyan - '#A5ADCB' -- white - } -} - -config.default_cursor_style = 'SteadyBar' - -return config