Merge branch 'master' into arch-laptop
This commit is contained in:
		
						commit
						3493a2287b
					
				| @ -10,6 +10,7 @@ esac | |||||||
| 
 | 
 | ||||||
| export PATH=~/.local/bin:/snap/bin:/usr/sandbox/:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/share/games:/usr/local/sbin:/usr/sbin:/sbin:$PATH | export PATH=~/.local/bin:/snap/bin:/usr/sandbox/:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/share/games:/usr/local/sbin:/usr/sbin:/sbin:$PATH | ||||||
| PATH=$PATH:~/.local/share/gem/ruby/3.0.0/bin/:~/.scripts | PATH=$PATH:~/.local/share/gem/ruby/3.0.0/bin/:~/.scripts | ||||||
|  | PATH=$PATH:~/.local/share/gem/ruby/3.4.0/bin/ | ||||||
| PATH=$PATH:~/.cargo/bin | PATH=$PATH:~/.cargo/bin | ||||||
| PATH=$PATH:~/go/bin/ | PATH=$PATH:~/go/bin/ | ||||||
| PATH=$PATH:~/.nimble/bin/ | PATH=$PATH:~/.nimble/bin/ | ||||||
|  | |||||||
| @ -1,27 +1,69 @@ | |||||||
| # lua | # lua | ||||||
| # [language.lua.grammar.source.git] | [language.lua.grammar.source.git] | ||||||
| # url = "https://github.com/tree-sitter-grammars/tree-sitter-lua" | url = "https://github.com/tree-sitter-grammars/tree-sitter-lua" | ||||||
| # pin = "88e446476a1e97a8724dff7a23e2d709855077f2" | pin = "88e446476a1e97a8724dff7a23e2d709855077f2" | ||||||
| 
 | 
 | ||||||
| # [language.lua.grammar] | [language.lua.grammar] | ||||||
| # path = "src" | path = "src" | ||||||
| # compile = "cc" | compile = "cc" | ||||||
| # compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."] | compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."] | ||||||
| # compile_flags = ["-O3"] | compile_flags = ["-O3"] | ||||||
| # link = "cc" | link = "cc" | ||||||
| # link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "lua.so"] | link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "lua.so"] | ||||||
| # link_flags = ["-O3"] | link_flags = ["-O3"] | ||||||
| 
 | 
 | ||||||
| # [language.lua.queries.source.git] | [language.lua.queries.source.git] | ||||||
| # # url = "https://github.com/helix-editor/helix" | url = "https://github.com/helix-editor/helix" | ||||||
| # # pin = "6bedca80646ce7350fb73029adf802ce7d9e241d" | pin = "6bedca80646ce7350fb73029adf802ce7d9e241d" | ||||||
| # url = "https://github.com/nvim-treesitter/nvim-treesitter" | # url = "https://github.com/nvim-treesitter/nvim-treesitter" | ||||||
| # pin = "5f38dffb6a07669a678f073bfe0f62b1a020dffc" | # pin = "5f38dffb6a07669a678f073bfe0f62b1a020dffc" | ||||||
| 
 | 
 | ||||||
| # [language.lua.queries] | [language.lua.queries] | ||||||
| # # path = "runtime/queries/lua" | path = "runtime/queries/lua" | ||||||
| # path = "queries/lua" | # path = "queries/lua" | ||||||
| 
 | 
 | ||||||
|  | # clojure | ||||||
|  | # [language.clojure.grammar.source.git] | ||||||
|  | # url = "https://github.com/sogaiu/tree-sitter-clojure" | ||||||
|  | # pin = "f4236d4da8aa92bc105d9c118746474c608e6af7" | ||||||
|  | 
 | ||||||
|  | # [language.clojure.grammar] | ||||||
|  | # path = "src" | ||||||
|  | # compile = "cc" | ||||||
|  | # compile_args = ["-c", "-fpic", "../parser.c", "-I", ".."] | ||||||
|  | # compile_flags = ["-O3"] | ||||||
|  | # link = "cc" | ||||||
|  | # link_args = ["-shared", "-fpic", "parser.o", "-o", "clojure.so"] | ||||||
|  | # link_flags = ["-O3"] | ||||||
|  | 
 | ||||||
|  | # [language.clojure.queries.source.git] | ||||||
|  | # url = "https://github.com/helix-editor/helix" | ||||||
|  | # pin = "6bedca80646ce7350fb73029adf802ce7d9e241d" | ||||||
|  | 
 | ||||||
|  | # [language.clojure.queries] | ||||||
|  | # path = "runtime/queries/clojure" | ||||||
|  | 
 | ||||||
|  | #ocaml | ||||||
|  | [language.ocaml.grammar.source.git] | ||||||
|  | url = "https://github.com/tree-sitter/tree-sitter-ocaml" | ||||||
|  | pin = "ef6ed4a773a260545f0b03c43d2ca78235e9a488" | ||||||
|  | 
 | ||||||
|  | [language.ocaml.grammar] | ||||||
|  | path = "grammars/ocaml/src" | ||||||
|  | compile = "cc" | ||||||
|  | compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."] | ||||||
|  | compile_flags = ["-O3"] | ||||||
|  | link = "cc" | ||||||
|  | link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "ocaml.so"] | ||||||
|  | link_flags = ["-O3"] | ||||||
|  | 
 | ||||||
|  | [language.ocaml.queries.source.git] | ||||||
|  | url = "https://github.com/helix-editor/helix" | ||||||
|  | pin = "6bedca80646ce7350fb73029adf802ce7d9e241d" | ||||||
|  | 
 | ||||||
|  | [language.ocaml.queries] | ||||||
|  | path = "runtime/queries/ocaml" | ||||||
|  | 
 | ||||||
| # typst | # typst | ||||||
| [language.typst.grammar.source.git] | [language.typst.grammar.source.git] | ||||||
| url = "https://github.com/uben0/tree-sitter-typst" | url = "https://github.com/uben0/tree-sitter-typst" | ||||||
|  | |||||||
| @ -25,6 +25,8 @@ plug "gustavo-hms/luar" %{ | |||||||
|     } |     } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | plug "h-youhei/kakoune-surround" | ||||||
|  | 
 | ||||||
| plug "your-tools/kak-subvert" do %{ | plug "your-tools/kak-subvert" do %{ | ||||||
|     cargo install --locked --force --path . |     cargo install --locked --force --path . | ||||||
| } | } | ||||||
| @ -232,13 +234,14 @@ hook -group lsp-filetype-swift global BufSetOption filetype=swift %{ | |||||||
|         root_globs = [".git", ".hg"] |         root_globs = [".git", ".hg"] | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | 
 | ||||||
| set-option global lsp_config %{ | set-option global lsp_config %{ | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| define-command fzf-buffer -docstring 'Invoke fzf to select a buffer' %{ | define-command fzf-buffer -docstring 'Invoke fzf to select a buffer' %{ | ||||||
|     evaluate-commands %sh{ |     evaluate-commands %sh{ | ||||||
|         tmux split-window -l 30% "(echo $kak_buflist | tr ' ' '\n' | fzf --bind 'focus:execute-silent(echo \"eval -client $kak_client %{ e {} }\" | kak -p $kak_session)' || echo \"$kak_buffile\") | xargs -I{} echo \"eval -client $kak_client %{ e {} }\" | /usr/bin/kak -p $kak_session" |         tmux split-window -l 30% "(printf \"%s\n\" $kak_quoted_buflist | fzf --bind 'focus:execute-silent(echo \"eval -client $kak_client %{ e {} }\" | kak -p $kak_session)' || echo \"$kak_buffile\") | xargs -I{} echo \"eval -client $kak_client %{ e '{}' }\" | /usr/bin/kak -p $kak_session" | ||||||
| } |     } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| define-command -docstring 'Invoke fzf to select a buffer' prev-fzf-buff %{ | define-command -docstring 'Invoke fzf to select a buffer' prev-fzf-buff %{ | ||||||
|  | |||||||
| @ -23,7 +23,7 @@ | |||||||
|        :completion |        :completion | ||||||
|        company           ; the ultimate code completion backend |        company           ; the ultimate code completion backend | ||||||
|        ;;helm              ; the *other* search engine for love and life |        ;;helm              ; the *other* search engine for love and life | ||||||
|        n       ;;ido               ; the other *other* search engine... |        ;;ido               ; the other *other* search engine... | ||||||
|        ;;ivy               ; a search engine for love and life |        ;;ivy               ; a search engine for love and life | ||||||
|        vertico           ; the search engine of the future |        vertico           ; the search engine of the future | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -2,4 +2,4 @@ | |||||||
| [Icon Theme] | [Icon Theme] | ||||||
| Name=Default | Name=Default | ||||||
| Comment=Default Cursor Theme | Comment=Default Cursor Theme | ||||||
| Inherits=Adwaita | Inherits=BreezeX-RosePineDawn-Linux | ||||||
|  | |||||||
| @ -1,3 +1,3 @@ | |||||||
| #!/bin/sh | #!/bin/sh | ||||||
| GAMES=$(find /home/mikec/Documents/Games/ROMS/GB -iname "*.zip" | bemenu -i --fn "Cascadia Code 12") | GAMES=$(find /home/mikec/Documents/Games/ROMS/GB -iname "*.zip" | bemenu -i --fn "Iosevka Term SS12 12") | ||||||
| [ -z "$GAMES" ] || mgba "$GAMES" | [ -z "$GAMES" ] || mgba "$GAMES" | ||||||
|  | |||||||
| @ -1,3 +1,3 @@ | |||||||
| #!/bin/sh | #!/bin/sh | ||||||
| GAMES=$(find /home/mikec/Documents/Games/ROMS/GBA -iname "*.zip" | bemenu -i --fn "Cascadia Code 12") | GAMES=$(find /home/mikec/Documents/Games/ROMS/GBA -iname "*.zip" | bemenu -i --fn "Iosevka Term SS12 12") | ||||||
| [ -z "$GAMES" ] || mgba "$GAMES" | [ -z "$GAMES" ] || mgba "$GAMES" | ||||||
|  | |||||||
| @ -1,3 +1,3 @@ | |||||||
| #!/bin/sh | #!/bin/sh | ||||||
| GAMES=$(find /home/mikec/Documents/Games/ROMS/GBC -iname "*.zip" | bemenu -i --fn "Cascadia Code 12") | GAMES=$(find /home/mikec/Documents/Games/ROMS/GBC -iname "*.zip" | bemenu -i --fn "Iosevka Term SS12 12") | ||||||
| [ -z "$GAMES" ] || mgba "$GAMES" | [ -z "$GAMES" ] || mgba "$GAMES" | ||||||
|  | |||||||
| @ -1,3 +1,3 @@ | |||||||
| #!/bin/sh | #!/bin/sh | ||||||
| GAMES=$(find /home/mikec/Documents/Games/ROMS/Genesis -iname "*.zip" | bemenu -i --fn "Cascadia Code 12") | GAMES=$(find /home/mikec/Documents/Games/ROMS/Genesis -iname "*.zip" | bemenu -i --fn "Iosevka Term SS12 12") | ||||||
| [ -z "$GAMES" ] || blastem "$GAMES" | [ -z "$GAMES" ] || blastem "$GAMES" | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| #!/bin/sh | #!/bin/sh | ||||||
| # MON=$(xrandr | grep ' connected' | cut -d' ' -f1 | dmenu -i) | # MON=$(xrandr | grep ' connected' | cut -d' ' -f1 | dmenu -i) | ||||||
| GAMES=$(find /home/mikec/Documents/Games/ROMS/N64 -iname "*.zip" | dmenu -i -l 10) | GAMES=$(find /home/mikec/Documents/Games/ROMS/N64 -iname "*.zip" | bemenu -i -l 10 --fn "Iosevka Term SS12 12") | ||||||
| [ -z "$GAMES" ] && exit | [ -z "$GAMES" ] && exit | ||||||
| # GAME=$(mktemp) | # GAME=$(mktemp) | ||||||
| # RES=$(xrandr | grep "$MON" | sed -E 's/.*connected (primary )?([0-9]*x[0-9]*).*/\2/') | # RES=$(xrandr | grep "$MON" | sed -E 's/.*connected (primary )?([0-9]*x[0-9]*).*/\2/') | ||||||
|  | |||||||
| @ -1,3 +1,3 @@ | |||||||
| #!/bin/sh | #!/bin/sh | ||||||
| GAMES=$(find /home/mikec/Documents/Games/ROMS/NES/USA -iname "*.nes" | dmenu -i) | GAMES=$(find /home/mikec/Documents/Games/ROMS/NES/USA -iname "*.nes" | bemenu -i --fn "Iosevka Term SS12 12") | ||||||
| [ -z "$GAMES" ] || fceux "$GAMES" | [ -z "$GAMES" ] || fceux "$GAMES" | ||||||
|  | |||||||
| @ -1,3 +1,3 @@ | |||||||
| #!/bin/sh | #!/bin/sh | ||||||
| GAMES=$(find /home/mikec/Documents/Games/ROMS/SNES/USA -iname "*.zip" | bemenu -i --fn "Cascadia Code 12") | GAMES=$(find /home/mikec/Documents/Games/ROMS/SNES/USA -iname "*.zip" | bemenu -i --fn "Iosevka Term SS12 12") | ||||||
| [ -z "$GAMES" ] || snes9x-gtk "$GAMES" | [ -z "$GAMES" ] || snes9x-gtk "$GAMES" | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Michael Chalupiak
						Michael Chalupiak