diff --git a/config/.bashrc b/config/.bashrc index 751d496..b4e644f 100644 --- a/config/.bashrc +++ b/config/.bashrc @@ -15,6 +15,7 @@ PATH=$PATH:~/go/bin/ PATH=$PATH:~/.nimble/bin/ PATH=$PATH:~/Documents/suckless/dylan/opendylan-2024.1/bin PATH=$PATH:~/.config/emacs/bin/ +PATH=$PATH:~/.mint/bin/ # don't put duplicate lines or lines starting with space in the history. # See bash(1) for more options HISTCONTROL=ignoreboth @@ -130,9 +131,9 @@ alias zf='z $(flirt)' # You may want to put all your additions into a separate file like # ~/.bash_aliases, instead of adding them here directly. # See /usr/share/doc/bash-doc/examples in the bash-doc package. -if [ -z "$EDITOR" ]; then - export EDITOR='nvim' -fi +# if [ -z "$EDITOR" ]; then +export EDITOR='nvim' +# fi if [ -f ~/.bash_aliases ]; then . ~/.bash_aliases @@ -181,7 +182,7 @@ if [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ] && [ -z "$TMUX" ]; elif [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ]; then SESH="$(tmux display-message -p '#S')" # alias kak='kak -c $SESH 2>/dev/null || kak -s $SESH' - alias kak=run_kak + # alias kak=run_kak # alias vidir='EDITOR="kak -c $SESH 2/dev/null || kak -s $SESH" vidir' # alias vipe='EDITOR="kak -c $SESH 2>/dev/null|| kak -s $SESH" vipe' fi diff --git a/config/.config/bspwm/bspwmrc b/config/.config/bspwm/bspwmrc index dc780d2..348efae 100755 --- a/config/.config/bspwm/bspwmrc +++ b/config/.config/bspwm/bspwmrc @@ -12,6 +12,7 @@ if [ $(pgrep polybar) ]; then else sleep .5 && polybar mainbar & fi +pipewire-launch || pipewire-launch restart & #MONITOR=DP-5 polybar example & ~/.fehbg picom & diff --git a/config/.config/dconf/user.txt b/config/.config/dconf/user.txt index 2352966..67b5aa0 100644 --- a/config/.config/dconf/user.txt +++ b/config/.config/dconf/user.txt @@ -893,16 +893,16 @@ xkb-options=['lv3:ralt_switch'] clock-format='12h' color-scheme='prefer-dark' cursor-size=24 -cursor-theme='Chicago95_Animated_Hourglass_Cursors_HiDPI' +cursor-theme='Adwaita' document-font-name='Cantarell 11' enable-animations=true enable-hot-corners=true font-antialiasing='rgba' font-hinting='slight' font-name='Ubuntu 10' -gtk-theme='rose-pine-gtk' -icon-theme='rose-pine-icons' monospace-font-name='Iosevka Term SS12 14' +gtk-theme='Adwaita-dark' +icon-theme='Adwaita' show-battery-percentage=true toolbar-style='text' clock-show-seconds=true diff --git a/config/.config/kak-tree-sitter/config.toml b/config/.config/kak-tree-sitter/config.toml index 24a5b6f..9ecbe69 100644 --- a/config/.config/kak-tree-sitter/config.toml +++ b/config/.config/kak-tree-sitter/config.toml @@ -42,3 +42,27 @@ pin = "46cf4ded12ee974a70bf8457263b67ad7ee0379d" [language.typst.queries] path = "queries/typst" + +# swift +[language.swift.grammar.source.git] +url = "https://github.com/alex-pinkus/tree-sitter-swift" +pin = "57c1c6d6ffa1c44b330182d41717e6fe37430704" + +[language.swift.grammar] +path = "src" +compile = "cc" +compile_args = ["-c", "-fpic", "../scanner.c", "-I", ".."] +compile_flags = ["-O3"] +link = "cc" +link_args = ["-shared", "-fpic", "scanner.o", "-o", "swift.so"] +link_flags = ["-O3"] + +[language.swift.queries.source.git] +url = "https://github.com/helix-editor/helix" +pin = "6bedca80646ce7350fb73029adf802ce7d9e241d" + +# url = "https://github.com/alex-pinkus/tree-sitter-swift" +# pin = "57c1c6d6ffa1c44b330182d41717e6fe37430704" + +[language.swift.queries] +path = "runtime/queries/swift" diff --git a/config/.config/kak/kakrc b/config/.config/kak/kakrc index 5987f61..a2727ab 100644 --- a/config/.config/kak/kakrc +++ b/config/.config/kak/kakrc @@ -51,7 +51,6 @@ set-option global luar_interpreter luajit #eval %sh{ kak-tree-sitter -dks --with-text-objects --session $kak_session } #eval %sh{ kak-tree-sitter -dks --with-highlighting --session $kak_session } eval %sh{ kak-tree-sitter -dksvvv --init $kak_session } - # evaluate-commands %sh{ # echo "colorscheme base16-$BASE16_THEME" # } @@ -227,6 +226,12 @@ face global InfoDiagnosticHint Information face global InfoDiagnosticInformation Information face global InfoDiagnosticWarning Information +hook -group lsp-filetype-swift global BufSetOption filetype=swift %{ + set-option buffer lsp_servers %{ + [sourcekit-lsp] + root_globs = [".git", ".hg"] + } +} set-option global lsp_config %{ } diff --git a/config/.config/nvim/after/plugin/lsp.lua b/config/.config/nvim/after/plugin/lsp.lua index ebeb313..c39922b 100755 --- a/config/.config/nvim/after/plugin/lsp.lua +++ b/config/.config/nvim/after/plugin/lsp.lua @@ -31,6 +31,8 @@ lsp_config.hls.setup{} lsp_config.clojure_lsp.setup{} +lsp_config.sourcekit.setup{} + local cmp = require("cmp") local cmp_select = {behavior = cmp.SelectBehavior.Select} local cmp_mappings = lsp.defaults.cmp_mappings({ diff --git a/config/.config/nvim/lua/config/packer.lua b/config/.config/nvim/lua/config/packer.lua index 004be5c..c84e762 100755 --- a/config/.config/nvim/lua/config/packer.lua +++ b/config/.config/nvim/lua/config/packer.lua @@ -7,6 +7,32 @@ return require('packer').startup(function(use) -- Packer can manage itself use 'wbthomason/packer.nvim' + use { + 'jake-stewart/multicursor.nvim', + config = function() + local mc = require'multicursor-nvim' + mc.setup{} + local set = vim.keymap.set + set("n", "s", mc.searchAllAddCursors) + mc.addKeymapLayer(function(layerSet) + -- Select a different cursor as the main one. + layerSet({"n", "x"}, "", mc.prevCursor) + layerSet({"n", "x"}, "", mc.nextCursor) + + -- Delete the main cursor. + layerSet({"n", "x"}, "x", mc.deleteCursor) + + -- Enable and clear cursors using escape. + layerSet("n", "", function() + if not mc.cursorsEnabled() then + mc.enableCursors() + else + mc.clearCursors() + end + end) + end) + end + } use { 'nvim-telescope/telescope.nvim', branch = '0.1.x', diff --git a/config/.config/nvim/lua/config/set.lua b/config/.config/nvim/lua/config/set.lua index 347d471..c6eff6b 100755 --- a/config/.config/nvim/lua/config/set.lua +++ b/config/.config/nvim/lua/config/set.lua @@ -53,7 +53,7 @@ vim.keymap.set("n", "", function() ChangeScaleFactor(1 / 1.25) end) -vim.opt.guifont = { "Fairfax", ":h12" } +vim.opt.guifont = { "Iosevka Term SS12", ":h12" } vim.opt.termguicolors = true vim.g.netrw_keepdir = 0 diff --git a/config/.icons/default/index.theme b/config/.icons/default/index.theme index 3fe07f3..eb495ee 100644 --- a/config/.icons/default/index.theme +++ b/config/.icons/default/index.theme @@ -2,4 +2,4 @@ [Icon Theme] Name=Default Comment=Default Cursor Theme -Inherits=BreezeX-RosePineDawn-Linux +Inherits=Adwaita diff --git a/config/.xinitrc b/config/.xinitrc index 1e66ec4..aa682bd 100755 --- a/config/.xinitrc +++ b/config/.xinitrc @@ -2,5 +2,5 @@ xrdb -merge ~/.Xresources # /home/mikec/.scripts/startup.sh # exec awesome # exec dwm -# exec bspwm -exec icewm +exec bspwm +# exec icewm