1
0
mirror of https://github.com/aquatix/dotfiles.git synced 2025-12-07 00:05:10 +01:00

21 Commits

Author SHA1 Message Date
bbf4df0206 Use unique tmpdir 2025-11-18 10:30:46 +01:00
48f981edce 20251008: marksman Markdown organising 2025-10-13 21:02:54 +02:00
a39cd6de00 Word, a bad one 2025-10-12 22:19:48 +02:00
680bf0196b Italics are neat 2025-09-29 15:04:23 +02:00
796ffd9e34 Toggle casing 2025-09-29 14:56:19 +02:00
38751d075b Modified Argonaut theme with black background 2025-09-25 20:20:23 +02:00
034cbcfa90 New font, based on IBM Plex Mono 2025-09-22 20:29:50 +02:00
4da67fcef8 Zed editor/IDE configs 2025-09-21 21:07:57 +02:00
03ccf57b6e Starship prompt has a TOML config file, not yaml 2025-09-19 11:44:13 +02:00
c2c06a46e4 Typofix 2025-09-18 22:19:31 +02:00
331fc82c1a Words 2025-09-06 11:49:13 +02:00
5ad43aa897 20250425: use vimdiff with merge conflicts; default git branch is 'main' 2025-05-13 13:39:24 +02:00
0f04e1831a Discord updating 2025-04-23 20:41:49 +02:00
b129c79a37 Merge branch 'master' of github.com:aquatix/dotfiles 2025-04-21 12:04:54 +02:00
8f0eac7701 20250107: Pratchett! 2025-04-21 12:04:35 +02:00
938119d6ea Merge branch 'master' of github.com:aquatix/dotfiles 2025-04-02 17:20:57 +02:00
c394e8be26 20250214: Argonaut terminal theme from Gogh 2025-04-02 17:20:53 +02:00
75666f9add Automatically install starship config when wanted 2025-04-01 16:13:08 +02:00
cd550ea3fe direnv is used by the fish configuration 2025-04-01 16:12:54 +02:00
7837b80d3b Merge branch 'master' of github.com:aquatix/dotfiles 2025-03-20 13:25:37 +01:00
3c9b12b400 20250304: word 2025-03-20 13:25:14 +01:00
11 changed files with 115 additions and 6 deletions

25
.config/zed/settings.json Normal file
View File

@@ -0,0 +1,25 @@
// Zed settings
//
// For information on how to configure Zed, see the Zed
// documentation: https://zed.dev/docs/configuring-zed
//
// To see all of Zed's default settings without changing your
// custom settings, run `zed: open default settings` from the
// command palette (cmd-shift-p / ctrl-shift-p)
{
"vim_mode": true,
"icon_theme": "Material Icon Theme",
"base_keymap": "JetBrains",
"ui_font_size": 16,
"buffer_font_size": 15,
"terminal": {
"font_family": "MonaspiceNe Nerd Font Mono",
"font_size": 15,
"line_height": "standard"
},
"theme": {
"mode": "dark",
"light": "One Light",
"dark": "Zedokai Darker"
}
}

View File

@@ -78,3 +78,7 @@
# postBuffer = 1048576000 # postBuffer = 1048576000
# lowSpeedLimit = 0 # lowSpeedLimit = 0
# lowSpeedTime = 999999 # lowSpeedTime = 999999
[init]
defaultBranch = main
[merge]
tool = vimdiff

View File

@@ -0,0 +1,25 @@
[Palette]
Name=Diginaut
Background=#000000
Foreground=#FFFAF4
Cursor=#FFFAF4
Color0=#232323
Color1=#FF000F
Color2=#8CE10B
Color3=#FFB900
Color4=#008DF8
Color5=#6D43A6
Color6=#00D8EB
Color7=#FFFFFF
Color8=#444444
Color9=#FF2740
Color10=#ABE15B
Color11=#FFD242
Color12=#0092FF
Color13=#9A5FEB
Color14=#67FFF0
Color15=#FFFFFF
# This file was generated from https://github.com/Gogh-Co/Gogh/tree/master/themes/Argonaut.yml
# Modified by aquatix/diginaut

View File

@@ -15,5 +15,8 @@ backend
dammIT dammIT
isso isso
diginaut diginaut
Pratchett
jailbreaking
plugin plugin
Readeck Readeck
enshittification

View File

@@ -252,3 +252,6 @@ computerwerk
labwerk labwerk
PowerPoint PowerPoint
Kubuntu Kubuntu
Ichthus
Castor
JungleTrain

View File

@@ -51,16 +51,16 @@ highlight scratchThis ctermfg=Grey guifg=#666666
" Task statuses " Task statuses
syntax match todoNote "\v^\s{-}n .*$" nextgroup=todoNote syntax match todoNote "\v^\s{-}n .*$" nextgroup=todoNote
syntax match todoNote "\v^ .*$" nextgroup=todoNote syntax match todoNote "\v^ .*$" nextgroup=todoNote
highlight todoNote ctermfg=Grey guifg=#666666 highlight todoNote ctermfg=Grey guifg=#666666 cterm=italic
syntax match todoStatusDone "\v^\s{-}v " nextgroup=todoItem skipwhite syntax match todoStatusDone "\v^\s{-}v " nextgroup=todoItem skipwhite
highlight todoStatusDone ctermfg=green guifg=#00ff00 highlight todoStatusDone ctermfg=green guifg=#00ff00
syntax match todoStatusCancelled "\v^\s{-}x .*$" nextgroup=todoItem skipwhite syntax match todoStatusCancelled "\v^\s{-}x .*$" nextgroup=todoItem skipwhite
highlight todoStatusCancelled ctermfg=DarkGreen guifg=#005f00 highlight todoStatusCancelled ctermfg=DarkGreen guifg=#005f00 cterm=italic
syntax match todoStatusDoing "\v^\s{-}d .*$" nextgroup=todoItem skipwhite syntax match todoStatusDoing "\v^\s{-}d .*$" nextgroup=todoItem skipwhite
highlight todoStatusDoing ctermfg=223 guifg=#f0dfaf highlight todoStatusDoing ctermfg=223 guifg=#f0dfaf cterm=italic
syntax match todoStatusTest "\v^\s{-}t " nextgroup=todoItem skipwhite syntax match todoStatusTest "\v^\s{-}t " nextgroup=todoItem skipwhite
highlight todoStatusTest ctermfg=darkcyan guifg=#6666ff highlight todoStatusTest ctermfg=darkcyan guifg=#6666ff
@@ -70,7 +70,7 @@ highlight todoStatusTodo ctermfg=red guifg=#ff0000
syntax match todoStatusImportant "\v^\s{-}\> .*$" nextgroup=todoItem skipwhite syntax match todoStatusImportant "\v^\s{-}\> .*$" nextgroup=todoItem skipwhite
syntax match todoStatusImportant "\v^\s{-}! .*$" nextgroup=todoItem skipwhite syntax match todoStatusImportant "\v^\s{-}! .*$" nextgroup=todoItem skipwhite
highlight todoStatusImportant ctermfg=167 guifg=#d75f5f highlight todoStatusImportant ctermfg=167 guifg=#d75f5f cterm=italic
syntax match todoStatusQuestion "\v^\s{-}\? " nextgroup=todoItem skipwhite syntax match todoStatusQuestion "\v^\s{-}\? " nextgroup=todoItem skipwhite
highlight todoStatusQuestion ctermfg=darkcyan guifg=#6666ff highlight todoStatusQuestion ctermfg=darkcyan guifg=#6666ff

18
.vimrc
View File

@@ -449,6 +449,9 @@ let g:mdnav#Extensions = '.md, .MD, .markdown, .todo, .txt, .rst'
Plug 'lervag/wiki.vim' Plug 'lervag/wiki.vim'
" Config below, after plug#end() " Config below, after plug#end()
" marksman LSP integration (ALE) for advanced Markdown organising
Plug 'artempyanykh/marksman'
if $USER != 'root' if $USER != 'root'
" notational velocity with fzf: quickly search and open notes " notational velocity with fzf: quickly search and open notes
@@ -586,6 +589,21 @@ fun! TrimWhitespace()
endfun endfun
command! TrimWhitespace call TrimWhitespace() command! TrimWhitespace call TrimWhitespace()
" Visually select text then press ~ to convert the text to UPPER CASE, then to lower case, then to Title Case.
" Keep pressing ~ until you get the case you want.
" https://vim.fandom.com/wiki/Switching_case_of_characters
function! TwiddleCase(str)
if a:str ==# toupper(a:str)
let result = tolower(a:str)
elseif a:str ==# tolower(a:str)
let result = substitute(a:str,'\(\<\w\+\>\)', '\u\1', 'g')
else
let result = toupper(a:str)
endif
return result
endfunction
vnoremap ~ y:call setreg('', TwiddleCase(@"), getregtype(''))<CR>gv""Pgv
" enable words completion " enable words completion
set dictionary+=/usr/share/dict/words set dictionary+=/usr/share/dict/words
" use ctrl-n ctrl-n instead of ctrl-x ctrl-k " use ctrl-n ctrl-n instead of ctrl-x ctrl-k

View File

@@ -44,13 +44,15 @@ ln -s ../.dot/dotfiles/.config/starship.toml
To have the full experience, install all of these: To have the full experience, install all of these:
```bash ```bash
sudo apt install git curl vim-nox fzf ripgrep exuberant-ctags fish grc tmux htop sudo apt install git curl vim-nox fzf ripgrep exuberant-ctags fish grc tmux htop direnv
# needed for building vim plugins: # needed for building vim plugins:
sudo apt install cmake build-essentials sudo apt install cmake build-essential
# also, this classic: # also, this classic:
sudo apt install mc sudo apt install mc
``` ```
and maybe install a nice colour theme for your terminal from https://gogh-co.github.io/Gogh/ - I use argonaut with a black background myself.
## vim config ## vim config

View File

@@ -50,6 +50,16 @@ JetBrainsMonoNerdFontMono-SemiBoldItalic.ttf
JetBrainsMonoNerdFontMono-SemiBold.ttf JetBrainsMonoNerdFontMono-SemiBold.ttf
JetBrainsMonoNerdFontMono-ThinItalic.ttf JetBrainsMonoNerdFontMono-ThinItalic.ttf
JetBrainsMonoNerdFontMono-Thin.ttf JetBrainsMonoNerdFontMono-Thin.ttf
LilexNerdFont-BoldItalic.ttf
LilexNerdFont-Bold.ttf
LilexNerdFont-ExtraLightItalic.ttf
LilexNerdFont-ExtraLight.ttf
LilexNerdFont-Italic.ttf
LilexNerdFont-MediumItalic.ttf
LilexNerdFont-Medium.ttf
LilexNerdFont-Regular.ttf
LilexNerdFont-ThinItalic.ttf
LilexNerdFont-Thin.ttf
MonaspiceNeNerdFontMono-BoldItalic.otf MonaspiceNeNerdFontMono-BoldItalic.otf
MonaspiceNeNerdFontMono-Bold.otf MonaspiceNeNerdFontMono-Bold.otf
MonaspiceNeNerdFontMono-Italic.otf MonaspiceNeNerdFontMono-Italic.otf

10
bin/update_discord Executable file
View File

@@ -0,0 +1,10 @@
#!/bin/bash
# Use a uniquely named, temporary directory to download to
TMPDIR=$(mktemp -d)
wget "https://discord.com/api/download?platform=linux&format=deb" -O "${TMPDIR}/discord.deb"
sudo dpkg -i "${TMPDIR}/discord.deb"
# Clean up
rm "${TMPDIR}/discord.deb"

View File

@@ -128,6 +128,15 @@ elif [ ! -e ~/.dot/.dot_no_fish ]; then
done done
fi fi
echo
echo "Do you wish to install the starship prompt?"
select yn in "Yes" "No"; do
case $yn in
Yes ) make_link $DIR ".config/starship.toml"; curl -sS https://starship.rs/install.sh | sh; break;;
No ) break;;
esac
done
if [ ! -e ~/.dot_is_server ] && [ ! -e ~/.dot_no_server ]; then if [ ! -e ~/.dot_is_server ] && [ ! -e ~/.dot_no_server ]; then
echo echo
echo "Is this machine a server?" echo "Is this machine a server?"