Merge branch 'master' into arch-laptop
This commit is contained in:
commit
70ff268d4a
35
.gitignore
vendored
35
.gitignore
vendored
@ -1,15 +1,32 @@
|
|||||||
config/.config/dconf/
|
|
||||||
config/.config/kak/al/rc/org.kak
|
config/.config/kak/al/rc/org.kak
|
||||||
config/.config/kak/colors/
|
|
||||||
config/.config/kak/mru_files.txt
|
config/.config/kak/mru_files.txt
|
||||||
config/.config/kak/plugins/
|
|
||||||
config/.config/mutt/chalupmc
|
|
||||||
config/.config/mutt/mikecchalupiak
|
|
||||||
config/.config/mutt/spamreciver1
|
|
||||||
config/.config/qutebrowser/rosepine/
|
|
||||||
config/.config/zathura/colors
|
|
||||||
config/.icons/
|
|
||||||
config/.scripts/baraction.sh
|
config/.scripts/baraction.sh
|
||||||
config/.scripts/brave.sh
|
config/.scripts/brave.sh
|
||||||
config/.scripts/tmux-change-dir.sh
|
config/.scripts/tmux-change-dir.sh
|
||||||
|
config/.config/dconf/
|
||||||
config/.themes/
|
config/.themes/
|
||||||
|
config/**/*.uuid
|
||||||
|
config/.icons/
|
||||||
|
config/.config/KDE/
|
||||||
|
config/.config/falkon/
|
||||||
|
config/.config/ghostty/iTerm2-Color-Schemes/
|
||||||
|
config/.config/ghostty/themes/
|
||||||
|
config/.config/helix/runtime/
|
||||||
|
config/.config/kak/colors/
|
||||||
|
config/.config/kak/plugins/
|
||||||
|
config/.config/mutt/chalupmc@rose-hulman
|
||||||
|
config/.config/mutt/mikecchalupiak@outlook
|
||||||
|
config/.config/mutt/spamreciver1@outlook
|
||||||
|
config/.config/qt5ct/colors/
|
||||||
|
config/.config/qutebrowser/autoconfig.yml
|
||||||
|
config/.config/qutebrowser/rosepine/
|
||||||
|
config/.config/zathura/colors
|
||||||
|
config/.doom.d/flycheck_config.el
|
||||||
|
config/.scripts/kkse
|
||||||
|
config/.scripts/mlvwm-alert
|
||||||
|
config/.scripts/mlvwm-confirm
|
||||||
|
config/.scripts/mlvwm-message
|
||||||
|
config/.scripts/mlvwm-powerdown
|
||||||
|
config/.scripts/mlvwm-restart
|
||||||
|
config/.scripts/mlvwm-screenshot
|
||||||
|
config/.scripts/pipewire-launch
|
||||||
|
|||||||
@ -139,10 +139,10 @@ alias zf='z $(flirt)'
|
|||||||
# You may want to put all your additions into a separate file like
|
# You may want to put all your additions into a separate file like
|
||||||
# ~/.bash_aliases, instead of adding them here directly.
|
# ~/.bash_aliases, instead of adding them here directly.
|
||||||
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
|
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
|
||||||
# if [ -z "$EDITOR" ]; then
|
if [ -z "$EDITOR" ]; then
|
||||||
# export EDITOR='kak'
|
export EDITOR=kak
|
||||||
export EDITOR='nvim'
|
# export EDITOR='nvim'
|
||||||
# fi
|
fi
|
||||||
|
|
||||||
if [ -f ~/.bash_aliases ]; then
|
if [ -f ~/.bash_aliases ]; then
|
||||||
. ~/.bash_aliases
|
. ~/.bash_aliases
|
||||||
|
|||||||
@ -18,5 +18,6 @@ font-thicken = true
|
|||||||
theme = light:Dawnfox,dark:Carbonfox
|
theme = light:Dawnfox,dark:Carbonfox
|
||||||
# theme = Monokai Classic
|
# theme = Monokai Classic
|
||||||
# window-decoration = false
|
# window-decoration = false
|
||||||
# gtk-adwaita = false
|
# gtk-adwaita = true
|
||||||
window-decoration = true
|
window-decoration = true
|
||||||
|
shell-integration-features = true
|
||||||
|
|||||||
@ -111,6 +111,10 @@ add-highlighter global/ wrap -word -indent
|
|||||||
# format
|
# format
|
||||||
# }
|
# }
|
||||||
# }
|
# }
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
|
||||||
|
>>>>>>> master
|
||||||
# hook global -group autofmt BufSetOption filetype=(javascript) %{
|
# hook global -group autofmt BufSetOption filetype=(javascript) %{
|
||||||
# set-option buffer formatcmd 'prettier --tab-width 4 --parser typescript'
|
# set-option buffer formatcmd 'prettier --tab-width 4 --parser typescript'
|
||||||
#
|
#
|
||||||
@ -143,6 +147,10 @@ add-highlighter global/ wrap -word -indent
|
|||||||
# enable-autofmt
|
# enable-autofmt
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#
|
||||||
|
>>>>>>> master
|
||||||
## Indentation ##
|
## Indentation ##
|
||||||
set global tabstop 4
|
set global tabstop 4
|
||||||
set global indentwidth 4
|
set global indentwidth 4
|
||||||
@ -515,4 +523,10 @@ map -docstring 'next spell check' global spell n ':spell-next<ret>'
|
|||||||
map -docstring 'spell check replacements' global spell r ':spell-replace<ret>'
|
map -docstring 'spell check replacements' global spell r ':spell-replace<ret>'
|
||||||
|
|
||||||
map -docstring 'quit kakoune' global user q ':q!<ret>'
|
map -docstring 'quit kakoune' global user q ':q!<ret>'
|
||||||
|
try %{
|
||||||
|
colorscheme %sh{
|
||||||
|
ruby -e "time = Time.new; if time.hour < 20 and time.hour > 6 then puts 'dawnfox' else puts 'carbonfox' end"
|
||||||
|
}
|
||||||
|
} catch %{
|
||||||
colorscheme carbonfox
|
colorscheme carbonfox
|
||||||
|
}
|
||||||
|
|||||||
@ -51,12 +51,11 @@
|
|||||||
"oceanic-next": { "branch": "master", "commit": "09833f72d5ba23de2e8bcae18f479f326f5f677a" },
|
"oceanic-next": { "branch": "master", "commit": "09833f72d5ba23de2e8bcae18f479f326f5f677a" },
|
||||||
"oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" },
|
"oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" },
|
||||||
"one-nvim": { "branch": "main", "commit": "faf6fb3f98fccbe009c3466f657a8fff84a5f956" },
|
"one-nvim": { "branch": "main", "commit": "faf6fb3f98fccbe009c3466f657a8fff84a5f956" },
|
||||||
"onedark.nvim": { "branch": "master", "commit": "de495fabe171d48aed5525f002d14414efcecbb2" },
|
"onedark.nvim": { "branch": "master", "commit": "6c10964f91321c6a0f09bcc41dd64e7a6602bc4f" },
|
||||||
"pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" },
|
|
||||||
"plantuml-syntax": { "branch": "master", "commit": "9d4900aa16674bf5bb8296a72b975317d573b547" },
|
"plantuml-syntax": { "branch": "master", "commit": "9d4900aa16674bf5bb8296a72b975317d573b547" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||||
"range-highlight.nvim": { "branch": "master", "commit": "f54aec737f138e52c187a8bea77b41347fd86f12" },
|
"range-highlight.nvim": { "branch": "master", "commit": "f54aec737f138e52c187a8bea77b41347fd86f12" },
|
||||||
"rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" },
|
"rose-pine": { "branch": "main", "commit": "eb3ff49a4f2b4e8b06d27de529e44fa52a60ab8a" },
|
||||||
"sherbet.nvim": { "branch": "master", "commit": "5c4166eff70ec551ae0023edfb89141b25cc18c6" },
|
"sherbet.nvim": { "branch": "master", "commit": "5c4166eff70ec551ae0023edfb89141b25cc18c6" },
|
||||||
"snacks.nvim": { "branch": "main", "commit": "59c5545e91878c1f6218b032a881832bc98a46f3" },
|
"snacks.nvim": { "branch": "main", "commit": "59c5545e91878c1f6218b032a881832bc98a46f3" },
|
||||||
"telescope-tabs": { "branch": "vim_ui_select", "commit": "f01bc722582fdcaa58ea37492b382ff109893d95" },
|
"telescope-tabs": { "branch": "vim_ui_select", "commit": "f01bc722582fdcaa58ea37492b382ff109893d95" },
|
||||||
|
|||||||
@ -10,8 +10,8 @@
|
|||||||
## qute://help/configuring.html
|
## qute://help/configuring.html
|
||||||
## qute://help/settings.htm
|
## qute://help/settings.htm
|
||||||
##
|
##
|
||||||
import rosepine
|
# import rosepine
|
||||||
rosepine.setup(c, 'rose-pine-moon', True)
|
# rosepine.setup(c, 'rose-pine-moon', True)
|
||||||
|
|
||||||
## This is here so configs done via the GUI are still loaded.
|
## This is here so configs done via the GUI are still loaded.
|
||||||
## Remove it to not load settings done via the GUI.
|
## Remove it to not load settings done via the GUI.
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
process = git-lfs filter-process
|
process = git-lfs filter-process
|
||||||
required = true
|
required = true
|
||||||
[core]
|
[core]
|
||||||
editor = nvim
|
editor = kak
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = master
|
defaultBranch = master
|
||||||
[sendemail]
|
[sendemail]
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user