From 02029ed17d0e37e6628496148e27ffd5299d7cb3 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Sat, 8 May 2021 14:00:48 +0200 Subject: [PATCH 01/47] Update --- config/aliasrc | 6 ++++++ config/qutebrowser/config.py | 2 ++ config/zsh/.zshrc | 5 ----- gitconfig | 4 ++-- scripts/tools/wm_exit | 5 +++-- xprofile | 3 +-- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/config/aliasrc b/config/aliasrc index 7e7cbfa..631148c 100644 --- a/config/aliasrc +++ b/config/aliasrc @@ -76,6 +76,10 @@ alias \ fs='flameshot gui -r | tee ~/Pictures/Flameshot_$(date +%Y-%m-%d_%H-%M-%S).jpg | xcp' \ /="ack" \ +# indurad +alias \ + cD="(calvin --color -D -M ./build/monolith -n && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ + # This alias is important. It enables the `pauseallmpv` command. alias mpv="mpv --input-ipc-server=/tmp/mpvsoc$(date +%s)" @@ -102,6 +106,8 @@ function qe() { ,e() { du --exclude-from=$HOME/.config/du_excludes -a ~/.scripts/* ~/.config/* ~/.dotfiles/*(N) /var/lib/transmission/.config/*(N) | cut -d$'\t' -f2- | fzf | xargs -d '\n' -r $EDITOR ;} ,t() { fzf | xargs -d '\n' -r -I % $EDITOR % ;} +gp() { ([ -z "$1" ] && cd -- "$HOME/localstorage/workspace/$(cd ~/localstorage/workspace; /usr/bin/find P* -maxdepth 2 -type d | cut -d$'\t' -f2- | fzf)") || cd "$HOME/localstorage/workspace/$1" } + cdf() { cd -- "$(du | cut -d$'\t' -f2- | fzf)"} cdp() { cd -- "$(/usr/bin/ls -C -d ~/dev/git/*(N) ~/dev/projects/*(N) ~/localstorage/dev/*(N) | fzf;)"} diff --git a/config/qutebrowser/config.py b/config/qutebrowser/config.py index bf131e6..5d4d83f 100644 --- a/config/qutebrowser/config.py +++ b/config/qutebrowser/config.py @@ -127,6 +127,8 @@ "!sp": "https://www.startpage.com/do/dsearch?query={}", "!pirate": "https://www.pirate-bay.net/search?q={}", "!torrent": "https://www.pirate-bay.net/search?q={}", + "g" :"https://git.indurad.x/search?utf8=%E2%9C%93&search={}&group_id=&project_id=&snippets=false&repository_ref=&nav_source=navbar", + "w" :"https://wiki.indurad.x/foswiki/bin/view/Main/WebSearch?tab=search&search={}&scope=all", } if ENVMODE == 'indurad': c.url.searchengines.update({ diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index ec2ca34..ab51ee0 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -125,11 +125,6 @@ mcd() { ############################################################### # Software settings ############################################################### -#latex -#export PATH=/usr/local/texlive/2017/bin/x86_64-linux/:$PATH - -#java -#export PATH=/home/zzz/softwares/jdk1.8.0_162/bin:$PATH [ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh ] && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh compctl -W ~/localstorage/workspace/ -/ gp diff --git a/gitconfig b/gitconfig index 05c48eb..ddd20fe 100644 --- a/gitconfig +++ b/gitconfig @@ -1,6 +1,6 @@ [user] - email = zolboo.deb@gmail.com - name = Zolboo + email = zolboo.erdenebayar@indurad.com + name = Zolboo Erdenebayar [push] default = simple [core] diff --git a/scripts/tools/wm_exit b/scripts/tools/wm_exit index f638675..79ed645 100755 --- a/scripts/tools/wm_exit +++ b/scripts/tools/wm_exit @@ -1,8 +1,9 @@ #!/bin/sh lock() { - # i3lock -t -i ~/.config/wall.png + # i3lock -i ~/.config/wall.png + ~/dev/git/i3lock-multimonitor/lock -i ~/.config/wall.png # gnome-screensaver-command -l - loginctl lock-session + # loginctl lock-session # scrot /tmp/screen_locked.png # convert /tmp/screen_locked.png -scale 10% -scale 1000% /tmp/screen_locked2.png # i3lock -i /tmp/screen_locked2.png diff --git a/xprofile b/xprofile index 5f919e6..9b986af 100644 --- a/xprofile +++ b/xprofile @@ -16,8 +16,7 @@ autorandr -c & blueman-applet & compton --config ~/.config/compton/compton.conf & dunst & -gcalendar & -gmail & +feh --bg-fill .config/wall.jpg & calendar & mail & gnome-screensaver & From 06a3a3a67dc78f7d7a84f36c5838be34fb489701 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Sat, 8 May 2021 14:10:01 +0200 Subject: [PATCH 02/47] Update --- config/i3/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/i3/config b/config/i3/config index 29c2d87..2f444ad 100755 --- a/config/i3/config +++ b/config/i3/config @@ -106,6 +106,8 @@ for_window [title="mpvfloat"] sticky enable for_window [title="mpvfloat"] border pixel 0 no_focus [title="mpvfloat"] +for_window [class="^Ires20$"] floating disable + set $workspace2 "2: " set $workspace3 "3: " set $workspace4 "4: " From 59ce8dd97f5d5caa6ecd373fdbef8b929ad82e2d Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Mon, 21 Jun 2021 13:52:18 +0200 Subject: [PATCH 03/47] Update --- config/dirs.csv | 1 + config/files.csv | 2 ++ config/qutebrowser/config.py | 1 + 3 files changed, 4 insertions(+) diff --git a/config/dirs.csv b/config/dirs.csv index b0a5f5c..3257a7b 100644 --- a/config/dirs.csv +++ b/config/dirs.csv @@ -31,3 +31,4 @@ L ~/localstorage w ~/localstorage/workspace S ~/shares .t ~/.tools +pc ~/localstorage/workspace/P33617/repos/project/.ci_tools diff --git a/config/files.csv b/config/files.csv index 63ae19b..46e6616 100644 --- a/config/files.csv +++ b/config/files.csv @@ -15,3 +15,5 @@ x ~/.Xdefaults c ~/.dotfiles/meta/configs n ~/Dokumente/note.org t ~/Dokumente/today.org +m ~/Dokumente/bericht.org +b ~/Dokumente/bericht.org diff --git a/config/qutebrowser/config.py b/config/qutebrowser/config.py index 5d4d83f..6b1755a 100644 --- a/config/qutebrowser/config.py +++ b/config/qutebrowser/config.py @@ -135,6 +135,7 @@ "g": "https://git.indurad.x/search?utf8=%E2%9C%93&search={}&group_id=&project_id=&snippets=false&repository_ref=&nav_source=navbar", "w": "https://wiki.indurad.x/foswiki/bin/view/Main/WebSearch?search={}&scope=all&web=Main", "j": "https://jenkins.indurad.x/search/?q={}&Jenkins-Crumb=8bfe1ab4d1d762edca143d9a7be37aae752c17de126e62349d4a2d2604993772", + "r": "https://redmine.indurad.x/issues/{}" }) From 4f80a6f3fd1e2201b1ac62c8b7affc0798da2244 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Mon, 21 Jun 2021 13:58:33 +0200 Subject: [PATCH 04/47] Update --- config/aliasrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/aliasrc b/config/aliasrc index 631148c..d4aeea1 100644 --- a/config/aliasrc +++ b/config/aliasrc @@ -78,7 +78,7 @@ alias \ # indurad alias \ - cD="(calvin --color -D -M ./build/monolith -n && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ + cD="(calvin --color -D -M ../../monolith -n && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ # This alias is important. It enables the `pauseallmpv` command. From 755d8c07935d0aa2048c16d3f5c8be482ee8b52f Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Tue, 13 Jul 2021 13:18:07 +0200 Subject: [PATCH 05/47] Update fakevim --- config/fakevim/vimrc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/fakevim/vimrc b/config/fakevim/vimrc index 0de1387..92f9229 100644 --- a/config/fakevim/vimrc +++ b/config/fakevim/vimrc @@ -218,5 +218,7 @@ nnoremap ,eh :OpenHeaderSourceInNextSplit nnoremap :tag nnoremap ,ec :EditWithCode -nnoremap ,yp :CopyFullPath +nnoremap ,yp :CopyPath nnoremap ,yn :CopyFileName + +nnoremap ,fu :FindUsages From 9b7f2760778c1cd77570bcd4627f0d5256cce6d5 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Fri, 16 Jul 2021 12:16:30 +0200 Subject: [PATCH 06/47] Update --- config/aliasrc | 2 +- config/qutebrowser/config.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/aliasrc b/config/aliasrc index d4aeea1..d1c43da 100644 --- a/config/aliasrc +++ b/config/aliasrc @@ -78,7 +78,7 @@ alias \ # indurad alias \ - cD="(calvin --color -D -M ../../monolith -n && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ + cD="(calvin --color -D -M ../../monolith -n builds/calvin && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ # This alias is important. It enables the `pauseallmpv` command. diff --git a/config/qutebrowser/config.py b/config/qutebrowser/config.py index 6b1755a..724c0f9 100644 --- a/config/qutebrowser/config.py +++ b/config/qutebrowser/config.py @@ -195,6 +195,9 @@ c.hints.selectors["ad"] = [ "a.pull-right > span.glyphicons-remove", ] +c.hints.selectors["issuesubject"] = [ + 'span[data-name="issue[subject]"]' +] if DIRMODUS == 'jkl;': config.bind('', 'back') @@ -242,6 +245,8 @@ config.bind('hyy','hint links yank') config.bind('hyd','hint div userscript copy_selected.py') + config.bind('h,s','hint --first issuesubject userscript copy_selected.py') + config.source('custom_config.py') From 704f1f62a2bf686e142bca85c114da0f55b1ba3c Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Fri, 16 Jul 2021 12:25:17 +0200 Subject: [PATCH 07/47] Update --- config/aliasrc | 3 ++- profile | 2 +- tipps/qutebrowser.org | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 tipps/qutebrowser.org diff --git a/config/aliasrc b/config/aliasrc index d1c43da..da997fa 100644 --- a/config/aliasrc +++ b/config/aliasrc @@ -78,7 +78,8 @@ alias \ # indurad alias \ - cD="(calvin --color -D -M ../../monolith -n builds/calvin && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ + cD="(calvin --color -D -M ../../monolith -n && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ + main="export LD_LIBRARY_PATH=$PWD/lib && ./main -c ./config/main.ini" \ # This alias is important. It enables the `pauseallmpv` command. diff --git a/profile b/profile index d3485b2..a63cd66 100644 --- a/profile +++ b/profile @@ -26,7 +26,7 @@ export FILE="ranger" export SUDO_ASKPASS="$HOME/.scripts/tools/dmenupass" export DMENU="rofi -dmenu -i" export CALENDAR="gcalendar" -export EMAIL="gmail" +export EMAIL="thunderbird" # ~/ Clean-up: # export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # This line will break some DMs. diff --git a/tipps/qutebrowser.org b/tipps/qutebrowser.org new file mode 100644 index 0000000..794ff55 --- /dev/null +++ b/tipps/qutebrowser.org @@ -0,0 +1,3 @@ +pip install pyqtwebengine==5.13 +pip install pyqt5==12.3 +pip install qutebrowser==1.14.1 From 8171cd90964cc20342a710cf7b1a1213939d8cb2 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Mon, 16 Aug 2021 15:15:45 +0200 Subject: [PATCH 08/47] update --- config/aliasrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/aliasrc b/config/aliasrc index da997fa..aa5a303 100644 --- a/config/aliasrc +++ b/config/aliasrc @@ -78,7 +78,7 @@ alias \ # indurad alias \ - cD="(calvin --color -D -M ../../monolith -n && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ + cD="(calvin --color -D -M ../../monolith -n builds/calvin && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ main="export LD_LIBRARY_PATH=$PWD/lib && ./main -c ./config/main.ini" \ From cb6c6e75d55db2e636181ed4842f2b8927bdd91a Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Sat, 8 May 2021 14:00:48 +0200 Subject: [PATCH 09/47] Update --- config/aliasrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/aliasrc b/config/aliasrc index aa5a303..4a96ecb 100644 --- a/config/aliasrc +++ b/config/aliasrc @@ -79,7 +79,7 @@ alias \ # indurad alias \ cD="(calvin --color -D -M ../../monolith -n builds/calvin && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ - main="export LD_LIBRARY_PATH=$PWD/lib && ./main -c ./config/main.ini" \ + main="export LD_LIBRARY_PATH=$PWD/lib && ./main" \ # This alias is important. It enables the `pauseallmpv` command. From 7ecdb13550d9c55cb6d0cae0dfe2303af6f87ada Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Sat, 9 Oct 2021 10:36:39 +0200 Subject: [PATCH 10/47] Update master --- xprofile | 1 - 1 file changed, 1 deletion(-) diff --git a/xprofile b/xprofile index 9b986af..a8db5fc 100644 --- a/xprofile +++ b/xprofile @@ -16,7 +16,6 @@ autorandr -c & blueman-applet & compton --config ~/.config/compton/compton.conf & dunst & -feh --bg-fill .config/wall.jpg & calendar & mail & gnome-screensaver & From 02a889a3d299a8a3e8e36ac0027461f1d5b7e295 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Sat, 9 Oct 2021 10:38:52 +0200 Subject: [PATCH 11/47] Update --- config/aliasrc | 3 ++- config/i3/config | 20 +++++++++++++++----- scripts/tools/wm_exit | 2 +- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/config/aliasrc b/config/aliasrc index 4a96ecb..eb89ad9 100644 --- a/config/aliasrc +++ b/config/aliasrc @@ -78,7 +78,8 @@ alias \ # indurad alias \ - cD="(calvin --color -D -M ../../monolith -n builds/calvin && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ + cDf="(calvin --color -D -M ../../monolith -n builds/calvin && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ + cD="(calvin -O --skip-project-version-validation --skip-python-validation --color -M ../../monolith -n builds/calvin && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ main="export LD_LIBRARY_PATH=$PWD/lib && ./main" \ diff --git a/config/i3/config b/config/i3/config index 2f444ad..df92836 100755 --- a/config/i3/config +++ b/config/i3/config @@ -162,12 +162,22 @@ bar { # #---Basic Bindings---# # bindsym button3 --border kill bindsym $mod+button1 --whole-window floating toggle +bindsym $mod+s mode "indurad" -set $wsBuK "S: BuK" -set $wsNumRe "S: NumRe" -set $wsST "S: ST" -set $wsCC "S: CC" -set $wsAS "S: AS" +set $devops "devops" +set $33617 "33617" +set $33020 "33020" + +mode "indurad" { + bindsym d workspace $devops ; mode "default" + bindsym z exec --no-startup-id i3zen switch; mode "default" + + + bindsym Shift+d move container to workspace $devops + # back to normal: Enter or Escape + bindsym Return mode "default" + bindsym Escape mode "default" +} # assign [class="Chromium-browser"] 7 # assign [class="Firefox"] $workspace2 diff --git a/scripts/tools/wm_exit b/scripts/tools/wm_exit index 79ed645..59ddfad 100755 --- a/scripts/tools/wm_exit +++ b/scripts/tools/wm_exit @@ -1,7 +1,7 @@ #!/bin/sh lock() { # i3lock -i ~/.config/wall.png - ~/dev/git/i3lock-multimonitor/lock -i ~/.config/wall.png + ~/localstorage/dev/i3lock-multimonitor/lock -i ~/.config/wall.png # gnome-screensaver-command -l # loginctl lock-session # scrot /tmp/screen_locked.png From 831928c32299e934de0babf288bc42b5608b584e Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Fri, 12 Nov 2021 14:58:11 +0100 Subject: [PATCH 12/47] update --- config/aliasrc | 2 +- config/files.csv | 1 - config/keyboard/xmodmaprc | 6 +++--- config/nvim/init.vim | 2 +- config/sxhkd/sxhkdrc | 10 ++++++++++ 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/config/aliasrc b/config/aliasrc index eb89ad9..2b49eb0 100644 --- a/config/aliasrc +++ b/config/aliasrc @@ -106,7 +106,7 @@ function qe() { v ~/.local/share/qutebrowser_$1/config/custom_config.py } -,e() { du --exclude-from=$HOME/.config/du_excludes -a ~/.scripts/* ~/.config/* ~/.dotfiles/*(N) /var/lib/transmission/.config/*(N) | cut -d$'\t' -f2- | fzf | xargs -d '\n' -r $EDITOR ;} +,e() { du --exclude-from=$HOME/.config/du_excludes -a ~/.scripts/* ~/scripts/*(N) ~/.config/* ~/.dotfiles/*(N) /var/lib/transmission/.config/*(N) | cut -d$'\t' -f2- | fzf | xargs -d '\n' -r $EDITOR ;} ,t() { fzf | xargs -d '\n' -r -I % $EDITOR % ;} gp() { ([ -z "$1" ] && cd -- "$HOME/localstorage/workspace/$(cd ~/localstorage/workspace; /usr/bin/find P* -maxdepth 2 -type d | cut -d$'\t' -f2- | fzf)") || cd "$HOME/localstorage/workspace/$1" } diff --git a/config/files.csv b/config/files.csv index 46e6616..6f7779c 100644 --- a/config/files.csv +++ b/config/files.csv @@ -15,5 +15,4 @@ x ~/.Xdefaults c ~/.dotfiles/meta/configs n ~/Dokumente/note.org t ~/Dokumente/today.org -m ~/Dokumente/bericht.org b ~/Dokumente/bericht.org diff --git a/config/keyboard/xmodmaprc b/config/keyboard/xmodmaprc index d051a59..5e6f785 100644 --- a/config/keyboard/xmodmaprc +++ b/config/keyboard/xmodmaprc @@ -11,8 +11,8 @@ add control = Control_R clear shift add shift = Shift_L -add mod3 = Shift_R +! add mod3 = Shift_R -! add shift = Shift_R +add shift = Shift_R -pointer = 3 2 1 +!pointer = 3 2 1 diff --git a/config/nvim/init.vim b/config/nvim/init.vim index 6bf76bd..780a4a8 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -1114,9 +1114,9 @@ let g:coc_global_extensions = [ \ 'coc-ultisnips', \ 'coc-highlight', \ 'coc-texlab', - \ 'coc-spell-checker', \ 'coc-python', \ ] + " \ 'coc-spell-checker', " grep word under cursor command! -nargs=+ -complete=custom,s:GrepArgs Rg exe 'CocList grep '. diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc index 95f5617..253b7b5 100644 --- a/config/sxhkd/sxhkdrc +++ b/config/sxhkd/sxhkdrc @@ -158,6 +158,16 @@ super+{_,shift+}{w,e,r,y,u,i,p} mode="{ ,move container to}";\ wsnumber="$WORKSPACE{2,3,4,6,7,8,0}";\ i3-msg "$mode workspace $wsnumber" +Print + xdotool getmouselocation --shell; \ + scrot -a 482,272,1074,767 # cw + # scrot -a 440,281,1266,755 # under 23100 + # scrot -a 5,349,1902,709 # rhs 23100 + # scrot -a 50,280,1852,750 # lhs 23100 + # scrot -a 10,273,1899,794 # lhs + # scrot -a 318,324,1420,696 # rhs + # scrot -a 258,289,1140,750 + # flameshot gui -r > ~/Bilder/Flameshot_$(date +%Y-%m-%d_%H-%M-%S).jpg super+z pass generate -c From 16d0aa5ba245ed5451a78ffc42d81e11cbc075b3 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Tue, 30 Nov 2021 17:03:38 +0100 Subject: [PATCH 13/47] iweb calls indurad as url --- local/share/qutebrowser/userscripts/qute-pass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/local/share/qutebrowser/userscripts/qute-pass b/local/share/qutebrowser/userscripts/qute-pass index 71646eb..8356e99 100755 --- a/local/share/qutebrowser/userscripts/qute-pass +++ b/local/share/qutebrowser/userscripts/qute-pass @@ -68,9 +68,16 @@ def expanded_path(path): # Add trailing slash if not present return os.path.join(expanded, '') +def get_url(): + iweb_regex = re.compile('.*iWEB2') + title = os.getenv('QUTE_TITLE') + if iweb_regex.match(title): + return 'indurad' + return os.getenv('QUTE_URL') + argument_parser = argparse.ArgumentParser(description=__doc__, usage=USAGE, epilog=EPILOG) -argument_parser.add_argument('url', nargs='?', default=os.getenv('QUTE_URL')) +argument_parser.add_argument('url', nargs='?', default=get_url()) argument_parser.add_argument('--password-store', '-p', default=expanded_path(os.getenv('PASSWORD_STORE_DIR', default='~/.password-store')), help='Path to your pass password-store (only used in pass-mode)', type=expanded_path) From 3dffd77010b7607adda992bad0661cbbb99c96a2 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Tue, 26 Apr 2022 14:45:50 +0200 Subject: [PATCH 14/47] update --- config/dirs.csv | 1 + config/files.csv | 1 + gitignore_global | 2 ++ profile | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/dirs.csv b/config/dirs.csv index 3257a7b..8e8ff04 100644 --- a/config/dirs.csv +++ b/config/dirs.csv @@ -32,3 +32,4 @@ w ~/localstorage/workspace S ~/shares .t ~/.tools pc ~/localstorage/workspace/P33617/repos/project/.ci_tools +qp ~/shares/data/02_Software/2.1_Admin_Software/2.1.1_Team_Orga/QuarterlyPlanning/2021-Q4 diff --git a/config/files.csv b/config/files.csv index 6f7779c..675dba4 100644 --- a/config/files.csv +++ b/config/files.csv @@ -16,3 +16,4 @@ c ~/.dotfiles/meta/configs n ~/Dokumente/note.org t ~/Dokumente/today.org b ~/Dokumente/bericht.org +qp ~/shares/data/02_Software/2.1_Admin_Software/2.1.1_Team_Orga/QuarterlyPlanning/2021-Q4/2021-Q4_ZolbooErdenebayar.jpg diff --git a/gitignore_global b/gitignore_global index e69de29..0d1b22c 100644 --- a/gitignore_global +++ b/gitignore_global @@ -0,0 +1,2 @@ +__pycache__/* +CMakeLists_idat.txt diff --git a/profile b/profile index a63cd66..18139c3 100644 --- a/profile +++ b/profile @@ -15,7 +15,7 @@ export ENVMODE='indurad' # set PATH so it includes user's private bin if it exists [ -d "$HOME/.local/bin" ] && PATH="$HOME/.local/bin:$PATH" -export PATH="$PATH:$(du "$HOME/.scripts/" | cut -f2 | tr '\n' ':' | sed 's/:*$//')" +export PATH="$PATH:$(du "$HOME/.scripts/" "$HOME/localstorage/homebrew/bin/*(N)" | cut -f2 | tr '\n' ':' | sed 's/:*$//')" # Default programs: export EDITOR="nvim" From 62f2f1698b2be687d863915efe819a3d014c9f32 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Thu, 5 May 2022 12:47:17 +0200 Subject: [PATCH 15/47] fix --- local/share/qutebrowser/userscripts/qute-pass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local/share/qutebrowser/userscripts/qute-pass b/local/share/qutebrowser/userscripts/qute-pass index 8356e99..b1f9fc8 100755 --- a/local/share/qutebrowser/userscripts/qute-pass +++ b/local/share/qutebrowser/userscripts/qute-pass @@ -72,7 +72,7 @@ def get_url(): iweb_regex = re.compile('.*iWEB2') title = os.getenv('QUTE_TITLE') if iweb_regex.match(title): - return 'indurad' + return 'iweb2' return os.getenv('QUTE_URL') From e201f8cf22558b776ccdd2f54fba759113e143c2 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Tue, 24 Oct 2023 14:41:10 +0200 Subject: [PATCH 16/47] update --- meta/after_backup/ubuntu18/ubuntu | 10 +++++----- scripts/tools/mark | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/after_backup/ubuntu18/ubuntu b/meta/after_backup/ubuntu18/ubuntu index 3c50b11..e743cf0 100644 --- a/meta/after_backup/ubuntu18/ubuntu +++ b/meta/after_backup/ubuntu18/ubuntu @@ -1,9 +1,9 @@ # softwares -apt install vim qjoypad firefox chromium-browser sshfs gimp xfce4-terminal git zsh curl variety redshift-gtk synaptic keynav mpv htop classicmenu-indicator pdfgrep udevil -snap install telegram-desktop +apt install vim qjoypad firefox chromium-browser sshfs gimp xfce4-terminal git zsh curl variety redshift-gtk synaptic keynav mpv htop classicmenu-indicator pdfgrep udevil libx11-xcb-dev libxft-dev sxhkd bat qtwebengine5-dev python3-pip xclip flameshot pass compton sxiv +snap install telegram-desktop # ranger -apt install xsel #for copy path - python-pip - gnome-screensaver +apt install xsel \ + python3-pip \ + gnome-screensaver \ diff --git a/scripts/tools/mark b/scripts/tools/mark index be0b369..3617ec0 100755 --- a/scripts/tools/mark +++ b/scripts/tools/mark @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys import os import pandas as pd From 9e5308ff470bbe521eb660991e2111457364e45e Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Mon, 15 Jan 2024 15:29:51 +0100 Subject: [PATCH 17/47] no more aptget dotbot --- .gitmodules | 3 --- meta/dotbot_plugins/aptget | 1 - 2 files changed, 4 deletions(-) delete mode 160000 meta/dotbot_plugins/aptget diff --git a/.gitmodules b/.gitmodules index b5b5e77..64d85cb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,9 +10,6 @@ [submodule "fzf"] path = fzf url = https://github.com/junegunn/fzf.git -[submodule "meta/dotbot_plugins/aptget"] - path = meta/dotbot_plugins/aptget - url = https://github.com/dein0s/dotbot_plugin_aptget [submodule "meta/dotbot_plugins/pip"] path = meta/dotbot_plugins/pip url = https://github.com/sobolevn/dotbot-pip diff --git a/meta/dotbot_plugins/aptget b/meta/dotbot_plugins/aptget deleted file mode 160000 index f871117..0000000 --- a/meta/dotbot_plugins/aptget +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f871117ed7a2e60811c70d8425fcd2599d43eb50 From 7162e85486ade1eb56b36f1b032ea3ad3b97ecbe Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Tue, 28 May 2024 12:16:10 +0200 Subject: [PATCH 18/47] update --- gitignore_global | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitignore_global b/gitignore_global index 0d1b22c..a5021fc 100644 --- a/gitignore_global +++ b/gitignore_global @@ -1,2 +1,4 @@ __pycache__/* CMakeLists_idat.txt +**/build +**/cmake-build-debug*/ From 1158c3279b2c45d74084215dc1c0edc8e72761c4 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Fri, 28 Jun 2024 09:30:55 +0200 Subject: [PATCH 19/47] update --- .../conf.d/10-powerline-symbols.conf | 105 ------------------ profile | 3 +- xprofile | 4 +- 3 files changed, 4 insertions(+), 108 deletions(-) delete mode 100644 config/fontconfig/conf.d/10-powerline-symbols.conf diff --git a/config/fontconfig/conf.d/10-powerline-symbols.conf b/config/fontconfig/conf.d/10-powerline-symbols.conf deleted file mode 100644 index 7e34a12..0000000 --- a/config/fontconfig/conf.d/10-powerline-symbols.conf +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - monospace - PowerlineSymbols - - - Droid Sans Mono - PowerlineSymbols - - - Droid Sans Mono Slashed - PowerlineSymbols - - - Droid Sans Mono Dotted - PowerlineSymbols - - - DejaVu Sans Mono - PowerlineSymbols - - - DejaVu Sans Mono - PowerlineSymbols - - - Envy Code R - PowerlineSymbols - - - Inconsolata - PowerlineSymbols - - - Lucida Console - PowerlineSymbols - - - Monaco - PowerlineSymbols - - - Pragmata - PowerlineSymbols - - - PragmataPro - PowerlineSymbols - - - Menlo - PowerlineSymbols - - - Source Code Pro - PowerlineSymbols - - - Consolas - PowerlineSymbols - - - Anonymous pro - PowerlineSymbols - - - Bitstream Vera Sans Mono - PowerlineSymbols - - - Liberation Mono - PowerlineSymbols - - - Ubuntu Mono - PowerlineSymbols - - - Meslo LG L - PowerlineSymbols - - - Meslo LG L DZ - PowerlineSymbols - - - Meslo LG M - PowerlineSymbols - - - Meslo LG M DZ - PowerlineSymbols - - - Meslo LG S - PowerlineSymbols - - - Meslo LG S DZ - PowerlineSymbols - - diff --git a/profile b/profile index 18139c3..ec52645 100644 --- a/profile +++ b/profile @@ -15,7 +15,8 @@ export ENVMODE='indurad' # set PATH so it includes user's private bin if it exists [ -d "$HOME/.local/bin" ] && PATH="$HOME/.local/bin:$PATH" -export PATH="$PATH:$(du "$HOME/.scripts/" "$HOME/localstorage/homebrew/bin/*(N)" | cut -f2 | tr '\n' ':' | sed 's/:*$//')" +export PATH="$PATH:$(du "$HOME/.scripts/" | cut -f2 | tr '\n' ':' | sed 's/:*$//')" +export PATH="$PATH:$(du "$HOME/scripts/" | cut -f2 | tr '\n' ':' | sed 's/:*$//')" # Default programs: export EDITOR="nvim" diff --git a/xprofile b/xprofile index a8db5fc..40710a7 100644 --- a/xprofile +++ b/xprofile @@ -32,8 +32,8 @@ unclutter & # mouse invinsible variety & xfce4-power-manager & xset r rate 300 50 & # Speed xrate up -([[ $(cat /etc/hostname) =~ kellerberg|heidenpeters|manjaro ]] || xmodmap -e "pointer = 3 2 1") & -([[ $(cat /etc/hostname) =~ kellerberg|heidenpeters|manjaro ]] && feh --bg-fill .config/wall.jpg ) & +([[ $(cat /etc/hostname) =~ kellerberg|heidenpeters|manjaro|mythos ]] || xmodmap -e "pointer = 3 2 1") & +([[ $(cat /etc/hostname) =~ kellerberg|heidenpeters|manjaro|mythos ]] && feh --bg-fill .config/wall.jpg ) & # podentr & From b9cd20eb57f5ae90e1d0121ffb6fe3716aabd1c2 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Fri, 28 Jun 2024 09:32:30 +0200 Subject: [PATCH 20/47] update --- gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitconfig b/gitconfig index ddd20fe..50749e2 100644 --- a/gitconfig +++ b/gitconfig @@ -61,3 +61,5 @@ templateDir = /home/zerdenebayar/.git-template [credential] helper = cache --timeout=720000 +[checkout] + defaultRemote = origin From 801e4ae1ad0b9c470aa9907fe1a2f3dd76b5c39a Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Wed, 17 Jul 2024 14:40:54 +0200 Subject: [PATCH 21/47] update --- gitignore_global | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitignore_global b/gitignore_global index a5021fc..55abe19 100644 --- a/gitignore_global +++ b/gitignore_global @@ -2,3 +2,5 @@ __pycache__/* CMakeLists_idat.txt **/build **/cmake-build-debug*/ +**/.idea/ +__pycache__ From 7d27629555e26803aa3316fe23e8e04dea278a7d Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Wed, 17 Jul 2024 14:41:53 +0200 Subject: [PATCH 22/47] update --- config/aliasrc | 14 ++++++++++--- ideavimrc | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ xinitrc | 3 +++ xprofile | 2 +- 4 files changed, 69 insertions(+), 4 deletions(-) diff --git a/config/aliasrc b/config/aliasrc index 2b49eb0..cf8ac08 100644 --- a/config/aliasrc +++ b/config/aliasrc @@ -64,7 +64,7 @@ alias \ ,gd="git diff" \ ,gds="git diff --staged" \ ,gcan="git commit --amend --no-edit" \ - ,gpsf="git push --force" \ + ,gpsf="git push --force-with-lease" \ ,gr="git rebase" \ ,grc="git rebase --continue" \ lt="tree -L 2" \ @@ -78,9 +78,17 @@ alias \ # indurad alias \ + cDc="calvin -D" \ cDf="(calvin --color -D -M ../../monolith -n builds/calvin && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ - cD="(calvin -O --skip-project-version-validation --skip-python-validation --color -M ../../monolith -n builds/calvin && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ - main="export LD_LIBRARY_PATH=$PWD/lib && ./main" \ + clm="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith -m="-j16" build/calvin_lm && notify-send 'cD done. Success;') || notify-send 'clm done. Error'" \ + clmld="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith --target localdev -m="-j16" --platform local build/calvin_local_lm && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ + main_old="export LD_LIBRARY_PATH=$PWD/lib && ./main -v 5" \ + main="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-v 5 -m replay'" \ + mainh="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-v 5 -m replay' --hermes-proxy" \ + mainl="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-m live -v 5'" \ + mainlh="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-m live -v 5' --hermes-proxy" \ + cidat="build/_ARTIFACT/SOFT/bin/indurad-launcher --idat" \ + # This alias is important. It enables the `pauseallmpv` command. diff --git a/ideavimrc b/ideavimrc index 417559a..48aecc4 100644 --- a/ideavimrc +++ b/ideavimrc @@ -1,3 +1,56 @@ +set nowrap +set linebreak " when wrapping, wrap at word boundaries (vs last char) +set breakindent " preserves the indent level of wrapped lines +set showbreak=↪ " illustrate wrapped lines +set wrap " wrapping with breakindent is tolerable +set clipboard^=unnamed " This sets the clipboard as the default register. Useful for copy paste from tmux +set backspace=indent,eol,start +" when scrolling, keep cursor 3 lines away from screen border +set scrolloff=3 +set sidescrolloff=5 +set sidescroll=1 +set display+=lastline " show the last line that fits in window (vs '@@@@') + +" Show linenumbers +set number +set relativenumber +set ruler +"search +set hlsearch +set incsearch +set ignorecase +set smartcase + +" Set Proper Tabs +set tabstop=2 +set softtabstop=2 +set shiftwidth=2 +set smarttab +set expandtab + +" Always display the status line +set laststatus=2 +set showcmd +set showtabline=1 + +set wildmenu +set virtualedit=block,insert,all,onemore +" set digraph +" +set report=0 + +set winminheight=0 +set wildmode=list:longest,full +set wildignore+=*swp,*.class,*.pyc,*.png,*.jpg,*.gif,*.zip +set wildignore+=*/tmp/*,*.o,*.obj,*.so " Unix +set wildignore+=*\\tmp\\*,*.exe " Windows +set autoread + +set history=10000 + +set sessionoptions-=options " exclude options from the :mksession command + + noremap j h noremap k j noremap l k @@ -6,4 +59,5 @@ noremap ; l nnoremap h nnoremap l nnoremap vv v +nnoremap Q q nnoremap q :wq diff --git a/xinitrc b/xinitrc index 79b0d54..1ea1718 100755 --- a/xinitrc +++ b/xinitrc @@ -11,12 +11,15 @@ [ -f ~/.zshenv ] && . ~/.zshenv export $(dbus-launch) export XDG_CURRENT_DESKTOP=i3 +export WORKSPACE1="1" export WORKSPACE2="2: " export WORKSPACE3="3: " export WORKSPACE4="4: " +export WORKSPACE5="5" export WORKSPACE6="6: " export WORKSPACE7="7: " export WORKSPACE8="8: " +export WORKSPACE9="9" export WORKSPACE0="10: " [ -f ~/.xprofile ] && . ~/.xprofile exec i3 diff --git a/xprofile b/xprofile index 40710a7..05f7049 100644 --- a/xprofile +++ b/xprofile @@ -6,6 +6,7 @@ # Fix Gnome Apps Slow Start due to failing services # Add this when you include flatpak in your system dbus-update-activation-environment --systemd DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY +dbus-update-activation-environment --all [[ -f ~/.zshenv ]] && source ~/.zshenv @@ -29,7 +30,6 @@ sxhkd & telegram-desktop & udiskie -t & # automount unclutter & # mouse invinsible -variety & xfce4-power-manager & xset r rate 300 50 & # Speed xrate up ([[ $(cat /etc/hostname) =~ kellerberg|heidenpeters|manjaro|mythos ]] || xmodmap -e "pointer = 3 2 1") & From a6b272942b19a0aaa75b04391e3cd24632552ba0 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Sat, 20 Jul 2024 08:24:38 +0200 Subject: [PATCH 23/47] update --- config/aliasrc | 1 + gitconfig | 1 + gitignore_global | 1 + profile | 2 ++ 4 files changed, 5 insertions(+) diff --git a/config/aliasrc b/config/aliasrc index cf8ac08..0ec3c42 100644 --- a/config/aliasrc +++ b/config/aliasrc @@ -82,6 +82,7 @@ alias \ cDf="(calvin --color -D -M ../../monolith -n builds/calvin && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ clm="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith -m="-j16" build/calvin_lm && notify-send 'cD done. Success;') || notify-send 'clm done. Error'" \ clmld="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith --target localdev -m="-j16" --platform local build/calvin_local_lm && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ + cld="(calvin -D -n --target localdev -m="-j16" --platform local build/calvin_local_lm && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ main_old="export LD_LIBRARY_PATH=$PWD/lib && ./main -v 5" \ main="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-v 5 -m replay'" \ mainh="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-v 5 -m replay' --hermes-proxy" \ diff --git a/gitconfig b/gitconfig index 50749e2..1b83a70 100644 --- a/gitconfig +++ b/gitconfig @@ -6,6 +6,7 @@ [core] pager = diff-so-fancy | less --tabs=4 -RFX autolf = true + excludesFile = ~/.gitignore_global [merge] tool = nvim [mergetool] diff --git a/gitignore_global b/gitignore_global index 55abe19..718f475 100644 --- a/gitignore_global +++ b/gitignore_global @@ -4,3 +4,4 @@ CMakeLists_idat.txt **/cmake-build-debug*/ **/.idea/ __pycache__ +cmake-build-* diff --git a/profile b/profile index ec52645..02894c8 100644 --- a/profile +++ b/profile @@ -10,6 +10,8 @@ [ -d "$HOME/.Xdefaults" ] && xrdb $HOME/.Xdefaults +eval $(keychain --eval main) + export DIRMODUS='jkl;' export ENVMODE='indurad' From e3449eac199223cf12d2e8961728918eb9ea6dd8 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Sat, 20 Jul 2024 08:26:58 +0200 Subject: [PATCH 24/47] update --- gitconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gitconfig b/gitconfig index 1b83a70..32900d8 100644 --- a/gitconfig +++ b/gitconfig @@ -1,6 +1,7 @@ [user] email = zolboo.erdenebayar@indurad.com name = Zolboo Erdenebayar + signingkey = B4CA3E0AADBDBC45 [push] default = simple [core] @@ -53,7 +54,7 @@ next = rebase --continue find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'" show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'" - fixup = "!sh -c 'rev=$(git rev-parse ${0}) && git commit --no-verify --fixup ${rev} && git rebase -i --autostash --autosquash ${rev}^ && echo --------git status---------- && git status'" + fixup = "!sh -c 'rev=$(git rev-parse ${0}) && git commit --fixup ${rev} && git rebase -i --autostash --autosquash ${rev}^ && echo --------git status---------- && git status'" [cola] spellcheck = false [pull] @@ -62,5 +63,7 @@ templateDir = /home/zerdenebayar/.git-template [credential] helper = cache --timeout=720000 +[commit] + gpgsign = true [checkout] defaultRemote = origin From 29ac00da042a607c3022dc8cdb0e4439f72faa1d Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Tue, 17 Sep 2024 12:34:44 +0200 Subject: [PATCH 25/47] ccache --- config/ccache/ccache.conf | 1 + meta/configs/install.conf.yaml | 1 + 2 files changed, 2 insertions(+) create mode 100644 config/ccache/ccache.conf diff --git a/config/ccache/ccache.conf b/config/ccache/ccache.conf new file mode 100644 index 0000000..b124ebb --- /dev/null +++ b/config/ccache/ccache.conf @@ -0,0 +1 @@ +max_size = 100.0G diff --git a/meta/configs/install.conf.yaml b/meta/configs/install.conf.yaml index 613ef72..366dce7 100644 --- a/meta/configs/install.conf.yaml +++ b/meta/configs/install.conf.yaml @@ -30,6 +30,7 @@ ~/.config/fontconfig : config/fontconfig ~/.config/networkmanager-dmenu/config.ini : config/networkmanager-dmenu/config.ini ~/.config/wget/wgetrc : config/wget/wgetrc + ~/.config/ccache : config/ccache # ~/.aria2/aria2.conf: # ~/.axelrc: From c5e616a6f1155a4b0af35178c6fb768c0ba54ee3 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Wed, 18 Sep 2024 18:40:29 +0200 Subject: [PATCH 26/47] update --- config/zsh/.zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index ab51ee0..4a7d377 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -128,4 +128,5 @@ mcd() { [ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh ] && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh compctl -W ~/localstorage/workspace/ -/ gp +export PATH=$PATH:${HOME}/localstorage/dev/project-cli export PATH="$(perl -e 'print join(":", grep { not $seen{$_}++ } split(/:/, $ENV{PATH}))')" From e0bb5d93dade901a1dc6406bda40b4ded31aab95 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Fri, 20 Sep 2024 08:34:56 +0200 Subject: [PATCH 27/47] induradzshrc --- config/zsh/.induradzshrc | 2 ++ config/zsh/.zshrc | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 config/zsh/.induradzshrc diff --git a/config/zsh/.induradzshrc b/config/zsh/.induradzshrc new file mode 100644 index 0000000..9e88afa --- /dev/null +++ b/config/zsh/.induradzshrc @@ -0,0 +1,2 @@ +compctl -W ~/localstorage/workspace/ -/ gp +export PATH=$PATH:${HOME}/localstorage/dev/project-cli diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 4a7d377..4f8f893 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -122,11 +122,11 @@ mcd() { } +source ~/.config/zsh/.induradzshrc + ############################################################### # Software settings ############################################################### [ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh ] && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh -compctl -W ~/localstorage/workspace/ -/ gp -export PATH=$PATH:${HOME}/localstorage/dev/project-cli export PATH="$(perl -e 'print join(":", grep { not $seen{$_}++ } split(/:/, $ENV{PATH}))')" From ff3a93e4535d98db486cda2a05eb9be59760e9ff Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Fri, 20 Sep 2024 08:42:10 +0200 Subject: [PATCH 28/47] induradzshrc --- config/aliasrc | 19 ------------------- config/ccache/ccache.conf | 2 +- config/zsh/.induradzshrc | 27 +++++++++++++++++++++++++++ meta/configs/zsh.yaml | 1 + profile | 2 +- 5 files changed, 30 insertions(+), 21 deletions(-) diff --git a/config/aliasrc b/config/aliasrc index 0ec3c42..3bf0d13 100644 --- a/config/aliasrc +++ b/config/aliasrc @@ -76,22 +76,6 @@ alias \ fs='flameshot gui -r | tee ~/Pictures/Flameshot_$(date +%Y-%m-%d_%H-%M-%S).jpg | xcp' \ /="ack" \ -# indurad -alias \ - cDc="calvin -D" \ - cDf="(calvin --color -D -M ../../monolith -n builds/calvin && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ - clm="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith -m="-j16" build/calvin_lm && notify-send 'cD done. Success;') || notify-send 'clm done. Error'" \ - clmld="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith --target localdev -m="-j16" --platform local build/calvin_local_lm && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ - cld="(calvin -D -n --target localdev -m="-j16" --platform local build/calvin_local_lm && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ - main_old="export LD_LIBRARY_PATH=$PWD/lib && ./main -v 5" \ - main="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-v 5 -m replay'" \ - mainh="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-v 5 -m replay' --hermes-proxy" \ - mainl="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-m live -v 5'" \ - mainlh="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-m live -v 5' --hermes-proxy" \ - cidat="build/_ARTIFACT/SOFT/bin/indurad-launcher --idat" \ - - - # This alias is important. It enables the `pauseallmpv` command. alias mpv="mpv --input-ipc-server=/tmp/mpvsoc$(date +%s)" @@ -117,9 +101,6 @@ function qe() { ,e() { du --exclude-from=$HOME/.config/du_excludes -a ~/.scripts/* ~/scripts/*(N) ~/.config/* ~/.dotfiles/*(N) /var/lib/transmission/.config/*(N) | cut -d$'\t' -f2- | fzf | xargs -d '\n' -r $EDITOR ;} ,t() { fzf | xargs -d '\n' -r -I % $EDITOR % ;} -gp() { ([ -z "$1" ] && cd -- "$HOME/localstorage/workspace/$(cd ~/localstorage/workspace; /usr/bin/find P* -maxdepth 2 -type d | cut -d$'\t' -f2- | fzf)") || cd "$HOME/localstorage/workspace/$1" } cdf() { cd -- "$(du | cut -d$'\t' -f2- | fzf)"} -cdp() { cd -- "$(/usr/bin/ls -C -d ~/dev/git/*(N) ~/dev/projects/*(N) ~/localstorage/dev/*(N) | fzf;)"} - cdt() { cd -- "$HOME/Downloads/Torrent/$(/usr/bin/ls -C --format=single-column ~/Downloads/Torrent | fzf;)"} diff --git a/config/ccache/ccache.conf b/config/ccache/ccache.conf index b124ebb..d1bd96f 100644 --- a/config/ccache/ccache.conf +++ b/config/ccache/ccache.conf @@ -1 +1 @@ -max_size = 100.0G +max_size = 200.0G diff --git a/config/zsh/.induradzshrc b/config/zsh/.induradzshrc index 9e88afa..5cdfc25 100644 --- a/config/zsh/.induradzshrc +++ b/config/zsh/.induradzshrc @@ -1,2 +1,29 @@ +# export GDK_SCALE=1.5 +# export GDK_DPI_SCALE=0.5 +# export QT_AUTO_SCREEN_SET_FACTOR=0 +export QT_SCALE_FACTOR=1.5 +export QT_FONT_DPI=96 + +export INDURAD_PRECOMMIT_AUTO_FIX=1 + compctl -W ~/localstorage/workspace/ -/ gp export PATH=$PATH:${HOME}/localstorage/dev/project-cli + +# indurad +alias \ + cDc="calvin -D" \ + cDf="(calvin --color -D -M ../../monolith -n builds/calvin && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ + clm="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith -m="-j16" build/calvin_lm && notify-send 'cD done. Success;') || notify-send 'clm done. Error'" \ + clmld="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith --target localdev -m="-j16" --platform local build/calvin_local_lm && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ + cld="(calvin -D -n --target localdev -m="-j16" --platform local build/calvin_local_lm && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ + main_old="export LD_LIBRARY_PATH=$PWD/lib && ./main -v 5" \ + main="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-v 5 -m replay'" \ + mainh="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-v 5 -m replay' --hermes-proxy" \ + mainl="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-m live -v 5'" \ + mainlh="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-m live -v 5' --hermes-proxy" \ + hermesp="build/_ARTIFACT/SOFT/bin/indurad-launcher --hermes-proxy" \ + cidat="build/_ARTIFACT/SOFT/bin/indurad-launcher --idat" \ + + +gp() { ([ -z "$1" ] && cd -- "$HOME/localstorage/workspace/$(cd ~/localstorage/workspace; /usr/bin/find P* -maxdepth 2 -type d | cut -d$'\t' -f2- | fzf)") || cd "$HOME/localstorage/workspace/$1" } +cdp() { cd -- "$(/usr/bin/ls -C -d ~/dev/git/*(N) ~/dev/projects/*(N) ~/localstorage/dev/*(N) | fzf;)"} diff --git a/meta/configs/zsh.yaml b/meta/configs/zsh.yaml index 59a9aa0..15a8b64 100644 --- a/meta/configs/zsh.yaml +++ b/meta/configs/zsh.yaml @@ -7,6 +7,7 @@ ~/.config/du_excludes: config/du_excludes ~/.scripts: ~/.config/zsh/.zshrc: config/zsh/.zshrc + ~/.config/zsh/.induradzshrc: config/zsh/.induradzshrc ~/.zshenv: profile ~/.config/inputrc: config/inputrc - shell: diff --git a/profile b/profile index 02894c8..89a202c 100644 --- a/profile +++ b/profile @@ -23,7 +23,7 @@ export PATH="$PATH:$(du "$HOME/scripts/" | cut -f2 | tr '\n' ':' | sed 's/:*$//' # Default programs: export EDITOR="nvim" export TERMINAL="st" -export BROWSER="qutebrowser" +export BROWSER="firefox-esr" export READER="zathura" export FILE="ranger" export SUDO_ASKPASS="$HOME/.scripts/tools/dmenupass" From 787480de39905025cd22541292f93a1b9265adf8 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Wed, 13 Nov 2024 19:09:57 +0100 Subject: [PATCH 29/47] eval --- config/zsh/.induradzshrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/zsh/.induradzshrc b/config/zsh/.induradzshrc index 5cdfc25..8fb6d80 100644 --- a/config/zsh/.induradzshrc +++ b/config/zsh/.induradzshrc @@ -1,3 +1,5 @@ +#!/usr/bin/zsh + # export GDK_SCALE=1.5 # export GDK_DPI_SCALE=0.5 # export QT_AUTO_SCREEN_SET_FACTOR=0 @@ -15,7 +17,7 @@ alias \ cDf="(calvin --color -D -M ../../monolith -n builds/calvin && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ clm="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith -m="-j16" build/calvin_lm && notify-send 'cD done. Success;') || notify-send 'clm done. Error'" \ clmld="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith --target localdev -m="-j16" --platform local build/calvin_local_lm && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ - cld="(calvin -D -n --target localdev -m="-j16" --platform local build/calvin_local_lm && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ + cld="(calvin -D -n -m="-j16" --platform local --target localdev build/calvin_local && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ main_old="export LD_LIBRARY_PATH=$PWD/lib && ./main -v 5" \ main="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-v 5 -m replay'" \ mainh="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-v 5 -m replay' --hermes-proxy" \ @@ -27,3 +29,5 @@ alias \ gp() { ([ -z "$1" ] && cd -- "$HOME/localstorage/workspace/$(cd ~/localstorage/workspace; /usr/bin/find P* -maxdepth 2 -type d | cut -d$'\t' -f2- | fzf)") || cd "$HOME/localstorage/workspace/$1" } cdp() { cd -- "$(/usr/bin/ls -C -d ~/dev/git/*(N) ~/dev/projects/*(N) ~/localstorage/dev/*(N) | fzf;)"} + +eval "$(register-python-argcomplete pcli)" From 181106647b8130b5eaa4a6cec9659fd414272104 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Thu, 19 Dec 2024 20:14:23 +0100 Subject: [PATCH 30/47] Update --- gitignore_global | 2 ++ local/share/gnupg/gpg-agent.conf | 1 + meta/configs/install.conf.yaml | 1 + scripts/tools/extract | 1 + 4 files changed, 5 insertions(+) create mode 100644 local/share/gnupg/gpg-agent.conf diff --git a/gitignore_global b/gitignore_global index 718f475..7251da0 100644 --- a/gitignore_global +++ b/gitignore_global @@ -5,3 +5,5 @@ CMakeLists_idat.txt **/.idea/ __pycache__ cmake-build-* +components/iweb4/node_modules +.venv diff --git a/local/share/gnupg/gpg-agent.conf b/local/share/gnupg/gpg-agent.conf new file mode 100644 index 0000000..94b9588 --- /dev/null +++ b/local/share/gnupg/gpg-agent.conf @@ -0,0 +1 @@ +pinentry-program /usr/bin/pinentry-qt diff --git a/meta/configs/install.conf.yaml b/meta/configs/install.conf.yaml index 366dce7..3270984 100644 --- a/meta/configs/install.conf.yaml +++ b/meta/configs/install.conf.yaml @@ -60,6 +60,7 @@ ~/.config/fontawesome: config/fontawesome ~/.icons: ~/.local/share/applications/custom: local/share/applications/custom + ~/.local/share/gnupg/gpg-agent.conf: local/share/gnupg/gpg-agent.conf ~/.config/mimeapps.list: config/mimeapps.list ~/.config/user-dirs.dirs: config/user-dirs.dirs diff --git a/scripts/tools/extract b/scripts/tools/extract index 6e58fb8..b1b5f42 100755 --- a/scripts/tools/extract +++ b/scripts/tools/extract @@ -35,6 +35,7 @@ if [ -f "$archive" ] ; then *.xz) unxz "$archive" ;; *.exe) cabextract "$archive" ;; *.jar) jar xf "$archive" ;; + *.ifus2) ifus2soft.py --extract-here "$archive" ;; *) printf "extract: '%s' - unknown archive method\\n" "$archive" ;; esac else From 433ed991d9f81ab2b9aaca22a693de5bba9a929a Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Thu, 19 Dec 2024 20:17:41 +0100 Subject: [PATCH 31/47] Update --- meta/help.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 meta/help.md diff --git a/meta/help.md b/meta/help.md new file mode 100644 index 0000000..d87366a --- /dev/null +++ b/meta/help.md @@ -0,0 +1,14 @@ +if: + + Git error - gpg failed to sign data + +then: + https://stackoverflow.com/questions/41052538/git-error-gpg-failed-to-sign-data + git config --global user.signingkey ${ssid} + + +if: + pass too slow +then: + local/share/gnupg/gnu-agent pinentry + remove ~/.gnupg From cf291eecb6cbaf5def4af314c6db5efb11d7fe1a Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Mon, 23 Dec 2024 10:58:55 +0100 Subject: [PATCH 32/47] Update --- config/aliasrc | 2 +- config/i3/config | 2 +- config/sxhkd/sxhkdrc | 4 ---- config/zsh/.induradzshrc | 1 + gitconfig | 1 + gitignore_global | 2 ++ meta/after_backup/ubuntu18/ubuntu | 2 +- meta/configs/{i3.build.yaml => i3.yaml} | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename meta/configs/{i3.build.yaml => i3.yaml} (100%) diff --git a/config/aliasrc b/config/aliasrc index 3bf0d13..962bbce 100644 --- a/config/aliasrc +++ b/config/aliasrc @@ -73,7 +73,7 @@ alias \ xc="xclip -sel clip" \ xcp="xclip -sel clip -target image/png -i" \ kx="killall xcape" \ - fs='flameshot gui -r | tee ~/Pictures/Flameshot_$(date +%Y-%m-%d_%H-%M-%S).jpg | xcp' \ + fs='env QT_SCREEN_SCALE_FACTORS="0.66667" flameshot gui -r | tee ~/Pictures/Flameshot_$(date +%Y-%m-%d_%H-%M-%S).jpg | xcp' \ /="ack" \ # This alias is important. It enables the `pauseallmpv` command. diff --git a/config/i3/config b/config/i3/config index df92836..bd8447e 100755 --- a/config/i3/config +++ b/config/i3/config @@ -5,7 +5,7 @@ # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. # new_window pixel -default_border pixel +default_border pixel 4 set_from_resource $fontsize fontsize 13 # font pango:DejaVu Sans Mono for Powerline, FontAwesome $fontsize diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc index 253b7b5..f875869 100644 --- a/config/sxhkd/sxhkdrc +++ b/config/sxhkd/sxhkdrc @@ -58,10 +58,6 @@ super + Q; {l, e, s, h, H, r, S, g} super + comma; {a,b, B, d, h, k, l, m, M, o, O, r, S, s, t, u, v, V, w, W, x, X, z, slash} {dmenurecord, rofi -show windowcd -lines 15,vertical_bar_pos.sh,i3 "bar mode toggle",help-shortcut,i3 'sticky toggle',extbacklight,i3-msg 'move workspace to output right',i3-msg 'move workspace to output up',i3order, i3order --split 3,sudo /usr/bin/systemctl restart NetworkManager,i3 'move scratchpad',i3 'scratchpad show',rofi -show window -lines 15,dmenuunicode,vpntoggle 'vpn-default',vpntoggle 'PIA - Switzerland',sxivw,i3 'floating enable;;exec 21_9_width',fixit.sh l,fixit.sh d,i3zen toggle,ducksearch} -# music -super + m; {a, j, o, p, l, n, t, q, space, N, r, semicolon, XF86AudioLowerVolume, XF86AudioRaiseVolume} - {mpd_controll -a, lmc backward, mpd_controll -o, mpd_controll -p, mpd_controll -l, lmc next, mpd_controll -t, mpc stop, lmc toggle, lmc prev, lmc replay, lmc forward, mpc volume -5, mpc volume +5} - # # Audiokeys XF86AudioMute lmc mute diff --git a/config/zsh/.induradzshrc b/config/zsh/.induradzshrc index 8fb6d80..3075535 100644 --- a/config/zsh/.induradzshrc +++ b/config/zsh/.induradzshrc @@ -10,6 +10,7 @@ export INDURAD_PRECOMMIT_AUTO_FIX=1 compctl -W ~/localstorage/workspace/ -/ gp export PATH=$PATH:${HOME}/localstorage/dev/project-cli +export PATH=$PATH:${HOME}/localstorage/dev/monolith/install/bin # indurad alias \ diff --git a/gitconfig b/gitconfig index 32900d8..8f28381 100644 --- a/gitconfig +++ b/gitconfig @@ -55,6 +55,7 @@ find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'" show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'" fixup = "!sh -c 'rev=$(git rev-parse ${0}) && git commit --fixup ${rev} && git rebase -i --autostash --autosquash ${rev}^ && echo --------git status---------- && git status'" + code = "!sh -c 'code $(git rev-parse --show-toplevel)'" [cola] spellcheck = false [pull] diff --git a/gitignore_global b/gitignore_global index 7251da0..4a9abef 100644 --- a/gitignore_global +++ b/gitignore_global @@ -7,3 +7,5 @@ __pycache__ cmake-build-* components/iweb4/node_modules .venv +components/iweb4/public +config-local.js diff --git a/meta/after_backup/ubuntu18/ubuntu b/meta/after_backup/ubuntu18/ubuntu index e743cf0..baf4a82 100644 --- a/meta/after_backup/ubuntu18/ubuntu +++ b/meta/after_backup/ubuntu18/ubuntu @@ -1,5 +1,5 @@ # softwares -apt install vim qjoypad firefox chromium-browser sshfs gimp xfce4-terminal git zsh curl variety redshift-gtk synaptic keynav mpv htop classicmenu-indicator pdfgrep udevil libx11-xcb-dev libxft-dev sxhkd bat qtwebengine5-dev python3-pip xclip flameshot pass compton sxiv +apt install vim qjoypad firefox chromium-browser sshfs gimp xfce4-terminal git zsh curl variety redshift-gtk synaptic keynav mpv htop classicmenu-indicator pdfgrep udevil libx11-xcb-dev libxft-dev sxhkd bat qtwebengine5-dev python3-pip xclip flameshot pass compton sxiv npm neovim bat snap install telegram-desktop diff --git a/meta/configs/i3.build.yaml b/meta/configs/i3.yaml similarity index 100% rename from meta/configs/i3.build.yaml rename to meta/configs/i3.yaml From dde3670b0e455ee39d688690654e582afdf36754 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Mon, 23 Dec 2024 11:16:37 +0100 Subject: [PATCH 33/47] Update --- local/share/gnupg/gpg-agent.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/local/share/gnupg/gpg-agent.conf b/local/share/gnupg/gpg-agent.conf index 94b9588..b1825c8 100644 --- a/local/share/gnupg/gpg-agent.conf +++ b/local/share/gnupg/gpg-agent.conf @@ -1 +1,3 @@ pinentry-program /usr/bin/pinentry-qt +default-cache-ttl 34560000 +max-cache-ttl 34560000 From 3a98d56be4e07a26ea940e5b5152b75eba34686a Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Wed, 8 Jan 2025 15:41:31 +0100 Subject: [PATCH 34/47] help --- meta/help.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/help.md b/meta/help.md index d87366a..06e0cb9 100644 --- a/meta/help.md +++ b/meta/help.md @@ -12,3 +12,9 @@ if: then: local/share/gnupg/gnu-agent pinentry remove ~/.gnupg + + +if: + vscode authentification does not work +then: + cancel 3 times until it shows code to use for other login From 317da1b9689a941af4289d3dd6e4c7b2e0c3872b Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Wed, 8 Jan 2025 16:32:08 +0100 Subject: [PATCH 35/47] Update --- config/zsh/.induradzshrc | 1 + config/zsh/.zshrc | 3 +- meta/after_backup/install_timew.txt | 10 + submodules/fzf | 2 +- submodules/fzf-git.sh | 331 ++++++++++++++++++++++++++++ 5 files changed, 345 insertions(+), 2 deletions(-) create mode 100644 meta/after_backup/install_timew.txt create mode 100644 submodules/fzf-git.sh diff --git a/config/zsh/.induradzshrc b/config/zsh/.induradzshrc index 3075535..45fe1f4 100644 --- a/config/zsh/.induradzshrc +++ b/config/zsh/.induradzshrc @@ -5,6 +5,7 @@ # export QT_AUTO_SCREEN_SET_FACTOR=0 export QT_SCALE_FACTOR=1.5 export QT_FONT_DPI=96 +export CMAKE_GENERATOR=Ninja export INDURAD_PRECOMMIT_AUTO_FIX=1 diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 4f8f893..0849e15 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -60,6 +60,7 @@ if ! zgen saved; then # zgen oh-my-zsh themes/arrow # zgen load bhilburn/powerlevel9k powerlevel9k zgen load romkatv/powerlevel10k powerlevel9k + zgen load svenXY/timewarrior # save all to init script zgen save @@ -128,5 +129,5 @@ source ~/.config/zsh/.induradzshrc # Software settings ############################################################### -[ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh ] && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh export PATH="$(perl -e 'print join(":", grep { not $seen{$_}++ } split(/:/, $ENV{PATH}))')" +source $HOME/.dotfiles/submodules/fzf-git.sh diff --git a/meta/after_backup/install_timew.txt b/meta/after_backup/install_timew.txt new file mode 100644 index 0000000..e4c2bfa --- /dev/null +++ b/meta/after_backup/install_timew.txt @@ -0,0 +1,10 @@ + +# Download https://timewarrior.net/releases/ + +# extract + +cmake .. +make -j12 +cmake --install . --prefix $HOME/.local/ + + diff --git a/submodules/fzf b/submodules/fzf index 18e3b38..0476a65 160000 --- a/submodules/fzf +++ b/submodules/fzf @@ -1 +1 @@ -Subproject commit 18e3b38c69da2828efac6adc2ea3a5e85f70e571 +Subproject commit 0476a65fca287a1cd17ae3cbdfd8155eb0fb40ad diff --git a/submodules/fzf-git.sh b/submodules/fzf-git.sh new file mode 100644 index 0000000..38e3930 --- /dev/null +++ b/submodules/fzf-git.sh @@ -0,0 +1,331 @@ +# The MIT License (MIT) +# +# Copyright (c) 2024 Junegunn Choi +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +# shellcheck disable=SC2039 +[[ $0 = - ]] && return + +__fzf_git_color() { + if [[ -n $NO_COLOR ]]; then + echo never + elif [[ $# -gt 0 ]] && [[ -n $FZF_GIT_PREVIEW_COLOR ]]; then + echo "$FZF_GIT_PREVIEW_COLOR" + else + echo "${FZF_GIT_COLOR:-always}" + fi +} + +__fzf_git_cat() { + if [[ -n $FZF_GIT_CAT ]]; then + echo "$FZF_GIT_CAT" + return + fi + + # Sometimes bat is installed as batcat + _fzf_git_bat_options="--style='${BAT_STYLE:-full}' --color=$(__fzf_git_color .) --pager=never" + if command -v batcat > /dev/null; then + echo "batcat $_fzf_git_bat_options" + elif command -v bat > /dev/null; then + echo "bat $_fzf_git_bat_options" + else + echo cat + fi +} + +__fzf_git_pager() { + local pager + pager="${FZF_GIT_PAGER:-${GIT_PAGER:-$(git config --get core.pager 2>/dev/null)}}" + echo "${pager:-cat}" +} + +if [[ $1 = --list ]]; then + shift + if [[ $# -eq 1 ]]; then + branches() { + git branch "$@" --sort=-committerdate --sort=-HEAD --format=$'%(HEAD) %(color:yellow)%(refname:short) %(color:green)(%(committerdate:relative))\t%(color:blue)%(subject)%(color:reset)' --color=$(__fzf_git_color) | column -ts$'\t' + } + refs() { + git for-each-ref "$@" --sort=-creatordate --sort=-HEAD --color=$(__fzf_git_color) --format=$'%(if:equals=refs/remotes)%(refname:rstrip=-2)%(then)%(color:magenta)remote-branch%(else)%(if:equals=refs/heads)%(refname:rstrip=-2)%(then)%(color:brightgreen)branch%(else)%(if:equals=refs/tags)%(refname:rstrip=-2)%(then)%(color:brightcyan)tag%(else)%(if:equals=refs/stash)%(refname:rstrip=-2)%(then)%(color:brightred)stash%(else)%(color:white)%(refname:rstrip=-2)%(end)%(end)%(end)%(end)\t%(color:yellow)%(refname:short) %(color:green)(%(creatordate:relative))\t%(color:blue)%(subject)%(color:reset)' | column -ts$'\t' + } + hashes() { + git log --date=short --format="%C(green)%C(bold)%cd %C(auto)%h%d %s (%an)" --graph --color=$(__fzf_git_color) "$@" + } + case "$1" in + branches) + echo $'CTRL-O (open in browser) ╱ ALT-A (show all branches)\n' + branches + ;; + all-branches) + echo $'CTRL-O (open in browser)\n' + branches -a + ;; + hashes) + echo $'CTRL-O (open in browser) ╱ CTRL-D (diff)\nCTRL-S (toggle sort) ╱ ALT-A (show all hashes)\n' + hashes + ;; + all-hashes) + echo $'CTRL-O (open in browser) ╱ CTRL-D (diff)\nCTRL-S (toggle sort)\n' + hashes --all + ;; + refs) + echo $'CTRL-O (open in browser) ╱ ALT-E (examine in editor) ╱ ALT-A (show all refs)\n' + refs --exclude='refs/remotes' + ;; + all-refs) + echo $'CTRL-O (open in browser) ╱ ALT-E (examine in editor)\n' + refs + ;; + *) exit 1 ;; + esac + elif [[ $# -gt 1 ]]; then + set -e + + branch=$(git rev-parse --abbrev-ref HEAD 2> /dev/null) + if [[ $branch = HEAD ]]; then + branch=$(git describe --exact-match --tags 2> /dev/null || git rev-parse --short HEAD) + fi + + # Only supports GitHub for now + case "$1" in + commit) + hash=$(grep -o "[a-f0-9]\{7,\}" <<< "$2") + path=/commit/$hash + ;; + branch|remote-branch) + branch=$(sed 's/^[* ]*//' <<< "$2" | cut -d' ' -f1) + remote=$(git config branch."${branch}".remote || echo 'origin') + branch=${branch#$remote/} + path=/tree/$branch + ;; + remote) + remote=$2 + path=/tree/$branch + ;; + file) path=/blob/$branch/$(git rev-parse --show-prefix)$2 ;; + tag) path=/releases/tag/$2 ;; + *) exit 1 ;; + esac + + remote=${remote:-$(git config branch."${branch}".remote || echo 'origin')} + remote_url=$(git remote get-url "$remote" 2> /dev/null || echo "$remote") + + if [[ $remote_url =~ ^git@ ]]; then + url=${remote_url%.git} + url=${url#git@} + url=https://${url/://} + elif [[ $remote_url =~ ^http ]]; then + url=${remote_url%.git} + fi + + case "$(uname -s)" in + Darwin) open "$url$path" ;; + *) xdg-open "$url$path" ;; + esac + exit 0 + fi +fi + +if [[ $- =~ i ]]; then +# ----------------------------------------------------------------------------- + +# Redefine this function to change the options +_fzf_git_fzf() { + fzf --height=50% --tmux 90%,70% \ + --layout=reverse --multi --min-height=20 --border \ + --border-label-pos=2 \ + --color='header:italic:underline,label:blue' \ + --preview-window='right,50%,border-left' \ + --bind='ctrl-/:change-preview-window(down,50%,border-top|hidden|)' "$@" +} + +_fzf_git_check() { + git rev-parse HEAD > /dev/null 2>&1 && return + + [[ -n $TMUX ]] && tmux display-message "Not in a git repository" + return 1 +} + +__fzf_git=${BASH_SOURCE[0]:-${(%):-%x}} +__fzf_git=$(readlink -f "$__fzf_git" 2> /dev/null || /usr/bin/ruby --disable-gems -e 'puts File.expand_path(ARGV.first)' "$__fzf_git" 2> /dev/null) + +_fzf_git_files() { + _fzf_git_check || return + local root query + root=$(git rev-parse --show-toplevel) + [[ $root != "$PWD" ]] && query='!../ ' + + (git -c color.status=$(__fzf_git_color) status --short --no-branch + git ls-files "$root" | grep -vxFf <(git status -s | grep '^[^?]' | cut -c4-; echo :) | sed 's/^/ /') | + _fzf_git_fzf -m --ansi --nth 2..,.. \ + --border-label '📁 Files ' \ + --header $'CTRL-O (open in browser) ╱ ALT-E (open in editor)\n\n' \ + --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list file {-1}" \ + --bind "alt-e:execute:${EDITOR:-vim} {-1} > /dev/tty" \ + --query "$query" \ + --preview "git diff --no-ext-diff --color=$(__fzf_git_color .) -- {-1} | $(__fzf_git_pager); $(__fzf_git_cat) {-1}" "$@" | + cut -c4- | sed 's/.* -> //' +} + +_fzf_git_branches() { + _fzf_git_check || return + bash "$__fzf_git" --list branches | + _fzf_git_fzf --ansi \ + --border-label '🌲 Branches ' \ + --header-lines 2 \ + --tiebreak begin \ + --preview-window down,border-top,40% \ + --color hl:underline,hl+:underline \ + --no-hscroll \ + --bind 'ctrl-/:change-preview-window(down,70%|hidden|)' \ + --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list branch {}" \ + --bind "alt-a:change-border-label(🌳 All branches)+reload:bash \"$__fzf_git\" --list all-branches" \ + --preview "git log --oneline --graph --date=short --color=$(__fzf_git_color .) --pretty='format:%C(auto)%cd %h%d %s' \$(sed s/^..// <<< {} | cut -d' ' -f1) --" "$@" | + sed 's/^..//' | cut -d' ' -f1 +} + +_fzf_git_tags() { + _fzf_git_check || return + git tag --sort -version:refname | + _fzf_git_fzf --preview-window right,70% \ + --border-label '📛 Tags ' \ + --header $'CTRL-O (open in browser)\n\n' \ + --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list tag {}" \ + --preview "git show --color=$(__fzf_git_color .) {} | $(__fzf_git_pager)" "$@" +} + +_fzf_git_hashes() { + _fzf_git_check || return + bash "$__fzf_git" --list hashes | + _fzf_git_fzf --ansi --no-sort --bind 'ctrl-s:toggle-sort' \ + --border-label '🍡 Hashes ' \ + --header-lines 3 \ + --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list commit {}" \ + --bind "ctrl-d:execute:grep -o '[a-f0-9]\{7,\}' <<< {} | head -n 1 | xargs git diff --color=$(__fzf_git_color) > /dev/tty" \ + --bind "alt-a:change-border-label(🍇 All hashes)+reload:bash \"$__fzf_git\" --list all-hashes" \ + --color hl:underline,hl+:underline \ + --preview "grep -o '[a-f0-9]\{7,\}' <<< {} | head -n 1 | xargs git show --color=$(__fzf_git_color .) | $(__fzf_git_pager)" "$@" | + awk 'match($0, /[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]*/) { print substr($0, RSTART, RLENGTH) }' +} + +_fzf_git_remotes() { + _fzf_git_check || return + git remote -v | awk '{print $1 "\t" $2}' | uniq | + _fzf_git_fzf --tac \ + --border-label '📡 Remotes ' \ + --header $'CTRL-O (open in browser)\n\n' \ + --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list remote {1}" \ + --preview-window right,70% \ + --preview "git log --oneline --graph --date=short --color=$(__fzf_git_color .) --pretty='format:%C(auto)%cd %h%d %s' '{1}/$(git rev-parse --abbrev-ref HEAD)' --" "$@" | + cut -d$'\t' -f1 +} + +_fzf_git_stashes() { + _fzf_git_check || return + git stash list | _fzf_git_fzf \ + --border-label '🥡 Stashes ' \ + --header $'CTRL-X (drop stash)\n\n' \ + --bind 'ctrl-x:reload(git stash drop -q {1}; git stash list)' \ + -d: --preview "git show --color=$(__fzf_git_color .) {1} | $(__fzf_git_pager)" "$@" | + cut -d: -f1 +} + +_fzf_git_lreflogs() { + _fzf_git_check || return + git reflog --color=$(__fzf_git_color) --format="%C(blue)%gD %C(yellow)%h%C(auto)%d %gs" | _fzf_git_fzf --ansi \ + --border-label '📒 Reflogs ' \ + --preview "git show --color=$(__fzf_git_color .) {1} | $(__fzf_git_pager)" "$@" | + awk '{print $1}' +} + +_fzf_git_each_ref() { + _fzf_git_check || return + bash "$__fzf_git" --list refs | _fzf_git_fzf --ansi \ + --nth 2,2.. \ + --tiebreak begin \ + --border-label '☘️ Each ref ' \ + --header-lines 2 \ + --preview-window down,border-top,40% \ + --color hl:underline,hl+:underline \ + --no-hscroll \ + --bind 'ctrl-/:change-preview-window(down,70%|hidden|)' \ + --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list {1} {2}" \ + --bind "alt-e:execute:${EDITOR:-vim} <(git show {2}) > /dev/tty" \ + --bind "alt-a:change-border-label(🍀 Every ref)+reload:bash \"$__fzf_git\" --list all-refs" \ + --preview "git log --oneline --graph --date=short --color=$(__fzf_git_color .) --pretty='format:%C(auto)%cd %h%d %s' {2} --" "$@" | + awk '{print $2}' +} + +_fzf_git_worktrees() { + _fzf_git_check || return + git worktree list | _fzf_git_fzf \ + --border-label '🌴 Worktrees ' \ + --header $'CTRL-X (remove worktree)\n\n' \ + --bind 'ctrl-x:reload(git worktree remove {1} > /dev/null; git worktree list)' \ + --preview " + git -c color.status=$(__fzf_git_color .) -C {1} status --short --branch + echo + git log --oneline --graph --date=short --color=$(__fzf_git_color .) --pretty='format:%C(auto)%cd %h%d %s' {2} -- + " "$@" | + awk '{print $1}' +} + +if [[ -n "${BASH_VERSION:-}" ]]; then + __fzf_git_init() { + bind -m emacs-standard '"\er": redraw-current-line' + bind -m emacs-standard '"\C-z": vi-editing-mode' + bind -m vi-command '"\C-z": emacs-editing-mode' + bind -m vi-insert '"\C-z": emacs-editing-mode' + + local o c + for o in "$@"; do + c=${o:0:1} + bind -m emacs-standard '"\C-g\C-'$c'": " \C-u \C-a\C-k`_fzf_git_'$o'`\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er \C-h"' + bind -m vi-command '"\C-g\C-'$c'": "\C-z\C-g\C-'$c'\C-z"' + bind -m vi-insert '"\C-g\C-'$c'": "\C-z\C-g\C-'$c'\C-z"' + bind -m emacs-standard '"\C-g'$c'": " \C-u \C-a\C-k`_fzf_git_'$o'`\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er \C-h"' + bind -m vi-command '"\C-g'$c'": "\C-z\C-g'$c'\C-z"' + bind -m vi-insert '"\C-g'$c'": "\C-z\C-g'$c'\C-z"' + done + } +elif [[ -n "${ZSH_VERSION:-}" ]]; then + __fzf_git_join() { + local item + while read item; do + echo -n "${(q)item} " + done + } + + __fzf_git_init() { + local m o + for o in "$@"; do + eval "fzf-git-$o-widget() { local result=\$(_fzf_git_$o | __fzf_git_join); zle reset-prompt; LBUFFER+=\$result }" + eval "zle -N fzf-git-$o-widget" + for m in emacs vicmd viins; do + eval "bindkey -M $m '^g^${o[1]}' fzf-git-$o-widget" + eval "bindkey -M $m '^g${o[1]}' fzf-git-$o-widget" + done + done + } +fi +__fzf_git_init files branches tags remotes hashes stashes lreflogs each_ref worktrees + +# ----------------------------------------------------------------------------- +fi From 4037fb09554683c44e2c3578f96293352c3432e4 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Sat, 25 Jan 2025 11:12:03 +0100 Subject: [PATCH 36/47] Suspend --- config/i3blocks/config | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/i3blocks/config b/config/i3blocks/config index 328a5b3..b537254 100644 --- a/config/i3blocks/config +++ b/config/i3blocks/config @@ -71,8 +71,10 @@ interval=30 label=🕓 interval=1 -#[internet] -#interval=10 +[shutdown] +interval=0 +command=wm_exit suspend +full_text=😪 [vpn] interval=10 From 743baf8404e88a1d96d0c875b509ac4d6029323e Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Wed, 29 Jan 2025 16:13:33 +0100 Subject: [PATCH 37/47] calvin core --- config/zsh/.induradzshrc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config/zsh/.induradzshrc b/config/zsh/.induradzshrc index 45fe1f4..dfb2076 100644 --- a/config/zsh/.induradzshrc +++ b/config/zsh/.induradzshrc @@ -13,13 +13,15 @@ compctl -W ~/localstorage/workspace/ -/ gp export PATH=$PATH:${HOME}/localstorage/dev/project-cli export PATH=$PATH:${HOME}/localstorage/dev/monolith/install/bin +export CALVIN_CORE=4 + # indurad alias \ cDc="calvin -D" \ cDf="(calvin --color -D -M ../../monolith -n builds/calvin && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ - clm="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith -m="-j16" build/calvin_lm && notify-send 'cD done. Success;') || notify-send 'clm done. Error'" \ - clmld="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith --target localdev -m="-j16" --platform local build/calvin_local_lm && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ - cld="(calvin -D -n -m="-j16" --platform local --target localdev build/calvin_local && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ + clm="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith -m='-j${CALVIN_CORE}' build/calvin_lm && notify-send 'cD done. Success;') || notify-send 'clm done. Error'" \ + clmld="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith --target localdev -m='-j${CALVIN_CORE}' --platform local build/calvin_local_lm && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ + cld="(calvin -D -n -m='-j${CALVIN_CORE}' --platform local --target localdev build/calvin_local && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ main_old="export LD_LIBRARY_PATH=$PWD/lib && ./main -v 5" \ main="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-v 5 -m replay'" \ mainh="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-v 5 -m replay' --hermes-proxy" \ @@ -27,6 +29,7 @@ alias \ mainlh="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-m live -v 5' --hermes-proxy" \ hermesp="build/_ARTIFACT/SOFT/bin/indurad-launcher --hermes-proxy" \ cidat="build/_ARTIFACT/SOFT/bin/indurad-launcher --idat" \ + il="build/_ARTIFACT/SOFT/bin/indurad-launcher" \ gp() { ([ -z "$1" ] && cd -- "$HOME/localstorage/workspace/$(cd ~/localstorage/workspace; /usr/bin/find P* -maxdepth 2 -type d | cut -d$'\t' -f2- | fzf)") || cd "$HOME/localstorage/workspace/$1" } From e2cbd3bcb60544f5ba6647788af3b4866d9c82a2 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Fri, 31 Jan 2025 14:43:05 +0100 Subject: [PATCH 38/47] update --- scripts/tools/extract | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tools/extract b/scripts/tools/extract index b1b5f42..3871fed 100755 --- a/scripts/tools/extract +++ b/scripts/tools/extract @@ -35,7 +35,7 @@ if [ -f "$archive" ] ; then *.xz) unxz "$archive" ;; *.exe) cabextract "$archive" ;; *.jar) jar xf "$archive" ;; - *.ifus2) ifus2soft.py --extract-here "$archive" ;; + *.ifus2) ifus2soft.py --extract-path "." "$archive" ;; *) printf "extract: '%s' - unknown archive method\\n" "$archive" ;; esac else From a037714c2d8c59ec1bb60b0e0c76868a4187fdb3 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Fri, 31 Jan 2025 14:45:16 +0100 Subject: [PATCH 39/47] Update --- config/aliasrc | 1 - config/zsh/.induradzshrc | 5 +++++ gitignore_global | 1 + meta/configs/install.conf.yaml | 1 + scripts/tools/extract | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/config/aliasrc b/config/aliasrc index 962bbce..7e0cb33 100644 --- a/config/aliasrc +++ b/config/aliasrc @@ -6,7 +6,6 @@ command -v nvim >/dev/null && alias vim="nvim" vimdiff="nvim -d" alias \ cat="bat" \ diff="diff-so-fancy" \ - find="fd" \ fzf="fzf --preview=\"bat {} --color=always\"" \ # Verbosity and settings that you pretty much just always are going to want. diff --git a/config/zsh/.induradzshrc b/config/zsh/.induradzshrc index dfb2076..d151822 100644 --- a/config/zsh/.induradzshrc +++ b/config/zsh/.induradzshrc @@ -31,6 +31,11 @@ alias \ cidat="build/_ARTIFACT/SOFT/bin/indurad-launcher --idat" \ il="build/_ARTIFACT/SOFT/bin/indurad-launcher" \ +function twdone() { + local id="$1" + tw tag ${id} x && tw untag ${id} o + twsi o +} gp() { ([ -z "$1" ] && cd -- "$HOME/localstorage/workspace/$(cd ~/localstorage/workspace; /usr/bin/find P* -maxdepth 2 -type d | cut -d$'\t' -f2- | fzf)") || cd "$HOME/localstorage/workspace/$1" } cdp() { cd -- "$(/usr/bin/ls -C -d ~/dev/git/*(N) ~/dev/projects/*(N) ~/localstorage/dev/*(N) | fzf;)"} diff --git a/gitignore_global b/gitignore_global index 4a9abef..65edd35 100644 --- a/gitignore_global +++ b/gitignore_global @@ -9,3 +9,4 @@ components/iweb4/node_modules .venv components/iweb4/public config-local.js +*.egg-info diff --git a/meta/configs/install.conf.yaml b/meta/configs/install.conf.yaml index 3270984..25d6271 100644 --- a/meta/configs/install.conf.yaml +++ b/meta/configs/install.conf.yaml @@ -31,6 +31,7 @@ ~/.config/networkmanager-dmenu/config.ini : config/networkmanager-dmenu/config.ini ~/.config/wget/wgetrc : config/wget/wgetrc ~/.config/ccache : config/ccache + ~/.config/timewarrior : config/timewarrior # ~/.aria2/aria2.conf: # ~/.axelrc: diff --git a/scripts/tools/extract b/scripts/tools/extract index 3871fed..cf40972 100755 --- a/scripts/tools/extract +++ b/scripts/tools/extract @@ -36,6 +36,7 @@ if [ -f "$archive" ] ; then *.exe) cabextract "$archive" ;; *.jar) jar xf "$archive" ;; *.ifus2) ifus2soft.py --extract-path "." "$archive" ;; + *.zst) zstd -d --output-dir-flat . "$archive" ;; *) printf "extract: '%s' - unknown archive method\\n" "$archive" ;; esac else From 2ac80bd2f3f34978600a44ce3ed5a17cc4d44434 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Fri, 21 Feb 2025 12:54:10 +0100 Subject: [PATCH 40/47] Update --- config/aliasrc | 13 ++++++++++++- gitignore_global | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/config/aliasrc b/config/aliasrc index 7e0cb33..4efee40 100644 --- a/config/aliasrc +++ b/config/aliasrc @@ -53,7 +53,7 @@ alias \ y="yay" \ ,gs="git status" \ ,gc="git commit" \ - ,gch="git checkout" \ + ,gck="git checkout" \ ,gcm="git commit -m" \ ,gfa="git fetch --all" \ ,gpl="git pull" \ @@ -103,3 +103,14 @@ function qe() { cdf() { cd -- "$(du | cut -d$'\t' -f2- | fzf)"} cdt() { cd -- "$HOME/Downloads/Torrent/$(/usr/bin/ls -C --format=single-column ~/Downloads/Torrent | fzf;)"} + +gfixup() { + rev=$(_fzf_git_hashes) + [[ $rev == "" ]] && return + git commit --fixup ${rev} && git rebase -i --autostash --autosquash ${rev}^ && echo --------git status---------- && git status +} +gdrop() { + rev=$(_fzf_git_hashes) + [[ $rev == "" ]] && return + git rebase -i --autostash --autosquash ${rev}^ && echo --------git status---------- && git status +} diff --git a/gitignore_global b/gitignore_global index 65edd35..c74d307 100644 --- a/gitignore_global +++ b/gitignore_global @@ -3,6 +3,7 @@ CMakeLists_idat.txt **/build **/cmake-build-debug*/ **/.idea/ +**/iWEB2/config-local.js __pycache__ cmake-build-* components/iweb4/node_modules @@ -10,3 +11,4 @@ components/iweb4/node_modules components/iweb4/public config-local.js *.egg-info +.artifacts From aeb44a1d813611a403a7a3330d96c399aaacc2a6 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Sun, 16 Mar 2025 11:55:52 +0100 Subject: [PATCH 41/47] update fzf --- submodules/fzf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/fzf b/submodules/fzf index 0476a65..3f3d1ef 160000 --- a/submodules/fzf +++ b/submodules/fzf @@ -1 +1 @@ -Subproject commit 0476a65fca287a1cd17ae3cbdfd8155eb0fb40ad +Subproject commit 3f3d1ef8f57b11b244c73d7f3d70f7233ec02776 From 7536572ea64565328ce4c1dfc97eb48ab77b487e Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Wed, 5 Nov 2025 17:59:17 +0100 Subject: [PATCH 42/47] Update --- config/aliasrc | 2 +- config/sxhkd/sxhkdrc | 2 +- config/zsh/.zshrc | 2 ++ gitconfig | 2 ++ gitignore_global | 2 ++ scripts/tools/extract | 1 + scripts/tools/remaps | 4 ++-- 7 files changed, 11 insertions(+), 4 deletions(-) diff --git a/config/aliasrc b/config/aliasrc index 4efee40..5998ff6 100644 --- a/config/aliasrc +++ b/config/aliasrc @@ -72,7 +72,7 @@ alias \ xc="xclip -sel clip" \ xcp="xclip -sel clip -target image/png -i" \ kx="killall xcape" \ - fs='env QT_SCREEN_SCALE_FACTORS="0.66667" flameshot gui -r | tee ~/Pictures/Flameshot_$(date +%Y-%m-%d_%H-%M-%S).jpg | xcp' \ + fs='env QT_SCREEN_SCALE_FACTORS="$REVERSE_SCALE" flameshot gui -r | tee ~/Pictures/Flameshot_$(date +%Y-%m-%d_%H-%M-%S).jpg | xcp' \ /="ack" \ # This alias is important. It enables the `pauseallmpv` command. diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc index f875869..32f8b87 100644 --- a/config/sxhkd/sxhkdrc +++ b/config/sxhkd/sxhkdrc @@ -99,7 +99,7 @@ super + XF86MonBrightness{Up,Down} xbacklight.py HDMI-1 {+,-}0.1 Print - flameshot gui -r | tee ~/Pictures/Flameshot_$(date +%Y-%m-%d_%H-%M-%S).jpg | xcp + flameshot gui -c -p ~/Pictures/Flameshot_$(date +%Y-%m-%d_%H-%M-%S).jpg super + Print maim Pictures/screenshot-"$(date '+%y%m%d-%H%M-%S').png" super + shift+Print diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 0849e15..d3a0716 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -131,3 +131,5 @@ source ~/.config/zsh/.induradzshrc export PATH="$(perl -e 'print join(":", grep { not $seen{$_}++ } split(/:/, $ENV{PATH}))')" source $HOME/.dotfiles/submodules/fzf-git.sh + +eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" diff --git a/gitconfig b/gitconfig index 8f28381..585d1cb 100644 --- a/gitconfig +++ b/gitconfig @@ -68,3 +68,5 @@ gpgsign = true [checkout] defaultRemote = origin +[diff] + submodule = log diff --git a/gitignore_global b/gitignore_global index c74d307..c991407 100644 --- a/gitignore_global +++ b/gitignore_global @@ -12,3 +12,5 @@ components/iweb4/public config-local.js *.egg-info .artifacts +_ARTIFACT +.vscode diff --git a/scripts/tools/extract b/scripts/tools/extract index cf40972..c679bf0 100755 --- a/scripts/tools/extract +++ b/scripts/tools/extract @@ -37,6 +37,7 @@ if [ -f "$archive" ] ; then *.jar) jar xf "$archive" ;; *.ifus2) ifus2soft.py --extract-path "." "$archive" ;; *.zst) zstd -d --output-dir-flat . "$archive" ;; + *.tar.gz.bin) ifus2soft.py --extract-path "." "$archive" ;; *) printf "extract: '%s' - unknown archive method\\n" "$archive" ;; esac else diff --git a/scripts/tools/remaps b/scripts/tools/remaps index 8e0bf6a..4eaee7a 100755 --- a/scripts/tools/remaps +++ b/scripts/tools/remaps @@ -11,14 +11,14 @@ cd ${HOME} # setxkbmap de xset r rate 300 50 # Map the caps lock key to super... -# setxkbmap -option caps:super +setxkbmap -option caps:super xkbcomp -w 0 ~/.config/keyboard/xkbmap${post} $DISPLAY; xmodmap ~/.config/keyboard/xmodmaprc # But when it is pressed only once, treat it as escape. killall xcape 2>/dev/null; if [[ ! $post == "_def" ]]; then xcape -e 'Super_L=Escape;Control_L=ISO_Level3_Shift|Shift_L|p;ISO_Level3_Shift=space' fi -#setxkbmap -layout u s,mn -variant altgr-intl, -option grp:rctrl_rshift_toggle +setxkbmap -layout us,mn -variant altgr-intl, -option grp:rctrl_rshift_toggle i3 'reload' restart sxhkd # xinput set-prop $(xinput | grep SynPS | awk '{print $6}' | awk -F '=' '{print $2}') "libinput Tapping Enabled" 1 From e2609b260ef851006f5b5d74739b68748238383e Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Wed, 5 Nov 2025 19:01:19 +0100 Subject: [PATCH 43/47] setup script --- meta/setup.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 meta/setup.sh diff --git a/meta/setup.sh b/meta/setup.sh new file mode 100755 index 0000000..ac5c72e --- /dev/null +++ b/meta/setup.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +sudo apt install python3-virtualenvwrapper ranger python3-pip sxhkd mutt urlview i3 i3blocks arandr rofi pcmanfm shutter pavucontrol feh xfce4-power-manager bat fonts-font-awesome fonts-dejavu fonts-noto pipx npm keychain From dc0d25bf28e943704b792449703ced74b485e385 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Wed, 5 Nov 2025 19:09:53 +0100 Subject: [PATCH 44/47] update --- docs/pcs.txt | 2 ++ {tipps => docs}/qutebrowser.org | 0 2 files changed, 2 insertions(+) create mode 100644 docs/pcs.txt rename {tipps => docs}/qutebrowser.org (100%) diff --git a/docs/pcs.txt b/docs/pcs.txt new file mode 100644 index 0000000..0d420a7 --- /dev/null +++ b/docs/pcs.txt @@ -0,0 +1,2 @@ +brackie +belgoo diff --git a/tipps/qutebrowser.org b/docs/qutebrowser.org similarity index 100% rename from tipps/qutebrowser.org rename to docs/qutebrowser.org From a6cd54ad0cda12331d9e879401249f1585594db8 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Tue, 23 Dec 2025 12:34:48 +0100 Subject: [PATCH 45/47] Update st --- submodules/st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/st b/submodules/st index 88062b5..cd27df2 160000 --- a/submodules/st +++ b/submodules/st @@ -1 +1 @@ -Subproject commit 88062b59df4916c89d88849714f14f4a18eaa6c5 +Subproject commit cd27df23d33aba0b51407d2cd926a53818a204f8 From a54c20738bd6b48198e9412afa5271bcc84f8f57 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Tue, 23 Dec 2025 12:34:48 +0100 Subject: [PATCH 46/47] Update st --- config/aliasrc | 1 - config/dirs.csv | 1 + config/i3blocks/config | 6 +++++- config/keyboard/xkbmap_def | 1 + config/zsh/.induradzshrc | 44 +++++++++++++++++++++++++++++--------- config/zsh/.zshrc | 9 ++++++++ gitconfig | 2 -- profile | 1 + xinitrc | 14 ++++++------ xprofile | 2 +- 10 files changed, 59 insertions(+), 22 deletions(-) diff --git a/config/aliasrc b/config/aliasrc index 5998ff6..8f4fe2f 100644 --- a/config/aliasrc +++ b/config/aliasrc @@ -4,7 +4,6 @@ command -v nvim >/dev/null && alias vim="nvim" vimdiff="nvim -d" # Uses non default software alias \ - cat="bat" \ diff="diff-so-fancy" \ fzf="fzf --preview=\"bat {} --color=always\"" \ diff --git a/config/dirs.csv b/config/dirs.csv index 8e8ff04..a70340b 100644 --- a/config/dirs.csv +++ b/config/dirs.csv @@ -33,3 +33,4 @@ S ~/shares .t ~/.tools pc ~/localstorage/workspace/P33617/repos/project/.ci_tools qp ~/shares/data/02_Software/2.1_Admin_Software/2.1.1_Team_Orga/QuarterlyPlanning/2021-Q4 +pcli ~/localstorage/dev/project-cli diff --git a/config/i3blocks/config b/config/i3blocks/config index b537254..a9299a4 100644 --- a/config/i3blocks/config +++ b/config/i3blocks/config @@ -53,7 +53,11 @@ command=disk /  [disk] interval=60 -command=disk /home +command=disk /home/ilocalstorage-sata il + +[disk] +interval=60 +command=disk /home/zerdenebayar/shares_cached 💻 [battery] command=battery BAT0 diff --git a/config/keyboard/xkbmap_def b/config/keyboard/xkbmap_def index 6ddf1a6..bf701fb 100644 --- a/config/keyboard/xkbmap_def +++ b/config/keyboard/xkbmap_def @@ -1,6 +1,7 @@ xkb_keymap { xkb_keycodes { include "evdev+aliases(qwerty)" + = 66; }; xkb_types { include "complete" }; diff --git a/config/zsh/.induradzshrc b/config/zsh/.induradzshrc index d151822..a2a82ea 100644 --- a/config/zsh/.induradzshrc +++ b/config/zsh/.induradzshrc @@ -12,24 +12,35 @@ export INDURAD_PRECOMMIT_AUTO_FIX=1 compctl -W ~/localstorage/workspace/ -/ gp export PATH=$PATH:${HOME}/localstorage/dev/project-cli export PATH=$PATH:${HOME}/localstorage/dev/monolith/install/bin +export PATH=$PATH:${HOME}/localstorage/dev/indurad-ci/staging/scripts/ -export CALVIN_CORE=4 +export CALVIN_CORE=$(($(nproc) - 2)) + +function _get_irpu_root() { + if [[ -d "./_ARTIFACT" ]]; then + echo "./_ARTIFACT" + else + echo "build/_ARTIFACT" + fi +} # indurad alias \ - cDc="calvin -D" \ - cDf="(calvin --color -D -M ../../monolith -n builds/calvin && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ + clD="calvin -D" \ + cald="(calvin -D -n -m='-j${CALVIN_CORE}' build/calvin && notify-send 'cald done. Success;') || notify-send 'clmld done. Error'" \ clm="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith -m='-j${CALVIN_CORE}' build/calvin_lm && notify-send 'cD done. Success;') || notify-send 'clm done. Error'" \ clmld="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith --target localdev -m='-j${CALVIN_CORE}' --platform local build/calvin_local_lm && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ cld="(calvin -D -n -m='-j${CALVIN_CORE}' --platform local --target localdev build/calvin_local && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ main_old="export LD_LIBRARY_PATH=$PWD/lib && ./main -v 5" \ - main="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-v 5 -m replay'" \ - mainh="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-v 5 -m replay' --hermes-proxy" \ - mainl="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-m live -v 5'" \ - mainlh="build/_ARTIFACT/SOFT/bin/indurad-launcher --main='-m live -v 5' --hermes-proxy" \ - hermesp="build/_ARTIFACT/SOFT/bin/indurad-launcher --hermes-proxy" \ - cidat="build/_ARTIFACT/SOFT/bin/indurad-launcher --idat" \ - il="build/_ARTIFACT/SOFT/bin/indurad-launcher" \ + main="$(_get_irpu_root)/SOFT/bin/indurad-launcher --main='-v 5 -m replay'" \ + mainh="$(_get_irpu_root)/SOFT/bin/indurad-launcher --main='-v 5 -m replay' --hermes-proxy" \ + mainl="$(_get_irpu_root)/SOFT/bin/indurad-launcher --main='-m live -v 5'" \ + mainlh="$(_get_irpu_root)/SOFT/bin/indurad-launcher --main='-m live -v 5' --hermes-proxy" \ + hermesp="$(_get_irpu_root)/SOFT/bin/indurad-launcher --hermes-proxy" \ + cidat="$(_get_irpu_root)/SOFT/bin/indurad-launcher --idat" \ + il="$(_get_irpu_root)/SOFT/bin/indurad-launcher" \ + clc="calvin -C build/calvin_checkout" \ + function twdone() { local id="$1" @@ -41,3 +52,16 @@ gp() { ([ -z "$1" ] && cd -- "$HOME/localstorage/workspace/$(cd ~/localstorage/w cdp() { cd -- "$(/usr/bin/ls -C -d ~/dev/git/*(N) ~/dev/projects/*(N) ~/localstorage/dev/*(N) | fzf;)"} eval "$(register-python-argcomplete pcli)" +eval "$(register-python-argcomplete gli)" + +function fix_node_modules() { + local git_root="$(git rev-parse --show-toplevel)" + local node_modules_path="components/iweb4/node_modules" + local monolith_root="${git_root}/../monolith" + local monolith_node_modules="${monolith_root}/${node_modules_path}" + local build_node_modules="$(find . -type d -iname "iweb4" | head -n 1)/node_modules" + rm $monolith_node_modules + ln -s ${build_node_modules} ${monolith_node_modules} +} + +[ -d "$HOME/.local/bin" ] && PATH="$HOME/node_modules/.bin:$PATH" diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index d3a0716..45210c2 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -133,3 +133,12 @@ export PATH="$(perl -e 'print join(":", grep { not $seen{$_}++ } split(/:/, $ENV source $HOME/.dotfiles/submodules/fzf-git.sh eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" +eval "$(register-python-argcomplete pipx)" + +# discover_other_daemon: 1GNOME_KEYRING_CONTROL=/run/user/5470/keyring +# export SSH_AUTH_SOCK=/run/user/5470/keyring/ssh + +export NVM_DIR="$HOME/.config/nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion +[ -d "$HOME/node_modules/.bin" ] && export PATH="$HOME/node_modules/.bin:$PATH" diff --git a/gitconfig b/gitconfig index 585d1cb..ad16829 100644 --- a/gitconfig +++ b/gitconfig @@ -64,8 +64,6 @@ templateDir = /home/zerdenebayar/.git-template [credential] helper = cache --timeout=720000 -[commit] - gpgsign = true [checkout] defaultRemote = origin [diff] diff --git a/profile b/profile index 89a202c..a05c73e 100644 --- a/profile +++ b/profile @@ -50,6 +50,7 @@ export MPLAYER_HOME="$XDG_CONFIG_HOME"/mplayer export NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc export GEM_HOME="$XDG_DATA_HOME"/gem export GEM_SPEC_CACHE="$XDG_CACHE_HOME"/gem +export NPM_PACKAGES="${XDG_DATA_HOME}/npm-packages" # Other program settings: # less/man colors diff --git a/xinitrc b/xinitrc index 1ea1718..0c5488f 100755 --- a/xinitrc +++ b/xinitrc @@ -12,14 +12,14 @@ export $(dbus-launch) export XDG_CURRENT_DESKTOP=i3 export WORKSPACE1="1" -export WORKSPACE2="2: " -export WORKSPACE3="3: " -export WORKSPACE4="4: " +export WORKSPACE2="2" +export WORKSPACE3="3" +export WORKSPACE4="4" export WORKSPACE5="5" -export WORKSPACE6="6: " -export WORKSPACE7="7: " -export WORKSPACE8="8: " +export WORKSPACE6="6" +export WORKSPACE7="7" +export WORKSPACE8="8" export WORKSPACE9="9" -export WORKSPACE0="10: " +export WORKSPACE0="10" [ -f ~/.xprofile ] && . ~/.xprofile exec i3 diff --git a/xprofile b/xprofile index 05f7049..eac3459 100644 --- a/xprofile +++ b/xprofile @@ -32,7 +32,7 @@ udiskie -t & # automount unclutter & # mouse invinsible xfce4-power-manager & xset r rate 300 50 & # Speed xrate up -([[ $(cat /etc/hostname) =~ kellerberg|heidenpeters|manjaro|mythos ]] || xmodmap -e "pointer = 3 2 1") & +([[ $(cat /etc/hostname) =~ kellerberg|heidenpeters|manjaro|mythos|frankfurter ]] || xmodmap -e "pointer = 3 2 1") & ([[ $(cat /etc/hostname) =~ kellerberg|heidenpeters|manjaro|mythos ]] && feh --bg-fill .config/wall.jpg ) & # podentr & From f1087e59bf327ca45ccb63070be040dd6eeec5e1 Mon Sep 17 00:00:00 2001 From: Zolboo Erdenebayar Date: Mon, 19 Jan 2026 12:14:39 +0100 Subject: [PATCH 47/47] Update --- config/zsh/.induradzshrc | 9 +++++---- config/zsh/.zshrc | 2 +- gitconfig | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/config/zsh/.induradzshrc b/config/zsh/.induradzshrc index a2a82ea..d189591 100644 --- a/config/zsh/.induradzshrc +++ b/config/zsh/.induradzshrc @@ -3,10 +3,10 @@ # export GDK_SCALE=1.5 # export GDK_DPI_SCALE=0.5 # export QT_AUTO_SCREEN_SET_FACTOR=0 -export QT_SCALE_FACTOR=1.5 -export QT_FONT_DPI=96 -export CMAKE_GENERATOR=Ninja +[[ $(cat /etc/hostname) =~ kellerberg ]] && export QT_SCALE_FACTOR=1.5 && export REVERSE_SCALE=0.66 +[[ $(cat /etc/hostname) =~ kellerberg ]] && export QT_FONT_DPI=96 +export CMAKE_GENERATOR=Ninja export INDURAD_PRECOMMIT_AUTO_FIX=1 compctl -W ~/localstorage/workspace/ -/ gp @@ -28,6 +28,8 @@ function _get_irpu_root() { alias \ clD="calvin -D" \ cald="(calvin -D -n -m='-j${CALVIN_CORE}' build/calvin && notify-send 'cald done. Success;') || notify-send 'clmld done. Error'" \ + cC="calvin -C build/calvin_checkout" \ + cDf="(calvin --color -D -M ../../monolith -n build/calvin && notify-send 'cD done. Success;') || notify-send 'cD done. Error'" \ clm="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith -m='-j${CALVIN_CORE}' build/calvin_lm && notify-send 'cD done. Success;') || notify-send 'clm done. Error'" \ clmld="(calvin -D -n -M \`git rev-parse --show-toplevel\`/../monolith --target localdev -m='-j${CALVIN_CORE}' --platform local build/calvin_local_lm && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ cld="(calvin -D -n -m='-j${CALVIN_CORE}' --platform local --target localdev build/calvin_local && notify-send 'clmld done. Success;') || notify-send 'clmld done. Error'" \ @@ -64,4 +66,3 @@ function fix_node_modules() { ln -s ${build_node_modules} ${monolith_node_modules} } -[ -d "$HOME/.local/bin" ] && PATH="$HOME/node_modules/.bin:$PATH" diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 45210c2..3b64179 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -141,4 +141,4 @@ eval "$(register-python-argcomplete pipx)" export NVM_DIR="$HOME/.config/nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion -[ -d "$HOME/node_modules/.bin" ] && export PATH="$HOME/node_modules/.bin:$PATH" +[ -d "${HOME}/node_modules/.bin" ] && export PATH="$HOME/node_modules/.bin:$PATH" \ No newline at end of file diff --git a/gitconfig b/gitconfig index ad16829..1899528 100644 --- a/gitconfig +++ b/gitconfig @@ -54,7 +54,8 @@ next = rebase --continue find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'" show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'" - fixup = "!sh -c 'rev=$(git rev-parse ${0}) && git commit --fixup ${rev} && git rebase -i --autostash --autosquash ${rev}^ && echo --------git status---------- && git status'" + ; fixup = "!sh -c 'rev=$(git rev-parse ${0}) && git commit --fixup ${rev} && git rebase -i --autostash --autosquash ${rev}^ && echo --------git status---------- && git status'" + fixup = "!zsh -c 'gfixup'" code = "!sh -c 'code $(git rev-parse --show-toplevel)'" [cola] spellcheck = false