From e944ce8222e560a6f9d1bb4447b361b7306397c0 Mon Sep 17 00:00:00 2001 From: utzuro Date: Sun, 2 Jul 2023 19:07:56 +0900 Subject: [PATCH 01/18] update --- packages/win.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/win.sh b/packages/win.sh index 5671fa4..80e470e 100644 --- a/packages/win.sh +++ b/packages/win.sh @@ -1,13 +1,10 @@ -# WIP -# sh <(curl -L https://nixos.org/nix/install) --no-daemon - # Install scoop as package manager (powershell req) # Set-ExecutionPolicy RemoteSigned -Scope CurrentUser # irm get.scoop.sh | iex scoop bucket add extras # tools -scoop install ffmpeg vim 7zip curl wget sudo openssh coreutils yt-dlp +scoop install ffmpeg vim 7zip curl wget openssh coreutils yt-dlp # utils scoop install autohotkey powertoys # apps -- GitLab From f88775a35cd030ca16fa3eddefdf3f8395289907 Mon Sep 17 00:00:00 2001 From: utzuro Date: Wed, 19 Jul 2023 07:17:57 +0900 Subject: [PATCH 02/18] update --- config/skhd/.skhdrc | 1 + config/vim/.vim/custom.vim | 4 ++-- config/vim/.vim/plugins.vim | 1 + config/zsh/.zshrc | 5 +---- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/config/skhd/.skhdrc b/config/skhd/.skhdrc index 77db860..045c2fe 100644 --- a/config/skhd/.skhdrc +++ b/config/skhd/.skhdrc @@ -1 +1,2 @@ ctrl - return : /Applications/kitty.app/Contents/MacOS/kitty --single-instance -d ~ +cmd - h : : diff --git a/config/vim/.vim/custom.vim b/config/vim/.vim/custom.vim index 85ca89d..dc6cb7b 100644 --- a/config/vim/.vim/custom.vim +++ b/config/vim/.vim/custom.vim @@ -6,5 +6,5 @@ let @k='y:!fk "' " Lookup kanji meaning let @f='y:vimgrep " ./**/*' " Lookup for the current word in near files " Ledger macrosses -let @e="oo2023.03.x [Budget:Exp] [Exp:Exp]\t\t\t\t\t" -let @r="oo2023.03.x [Budget:Food] [Exp:Food]\t\t\t\t\t" +let @e="oo2023.06.x [Budget:Exp] [Exp:Exp]\t\t\t\t\t" +let @r="oo2023.06.x [Budget:Food] [Exp:Food]\t\t\t\t\t" diff --git a/config/vim/.vim/plugins.vim b/config/vim/.vim/plugins.vim index 7d51c9f..b02c4a4 100644 --- a/config/vim/.vim/plugins.vim +++ b/config/vim/.vim/plugins.vim @@ -54,6 +54,7 @@ "Plugin 'SirVer/ultisnips' | Plugin 'honza/vim-snippets' Plugin 'vim-scripts/AutoComplPop' Plugin 'fatih/vim-go' + Plugin 'rust-lang/rust.vim' " Languages and file types. Plugin 'cakebaker/scss-syntax.vim' Plugin 'chr4/nginx.vim' diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 5f025a2..6298242 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -51,10 +51,6 @@ export STARDICT_DATA_DIR=$manuscripts/ingredients/dicts/dic export PATH="$PATH:$(du "$alchemy/scripts" | cut -f2 | sed '/.git/d' | tr '\n' ':' | sed 's/%*$//')" export PATH=$PATH:$HOME/bin export GOPATH=$HOME/go -export GOENV_DISABLE_GOPATH=1 -export GOENV_ROOT="$HOME/.goenv" -export PATH="$GOENV_ROOT/bin:$PATH" -eval "$(goenv init -)" export PATH="$GOROOT/bin:$PATH" export PATH="$PATH:$GOPATH/bin" export PATH="$PATH:$npm_config_prefix" @@ -69,6 +65,7 @@ fi # Aliases alias c="clear" +alias vim="nvim" alias upd='git commit -am "update"' alias push='git push' alias pull='git pull --ff-only' -- GitLab From 030004b7456a2378bb2dc772d299bcd9c5688ca4 Mon Sep 17 00:00:00 2001 From: utzuro Date: Wed, 19 Jul 2023 09:26:02 +0900 Subject: [PATCH 03/18] update --- config/zsh/.zshrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 6298242..7649823 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -85,5 +85,9 @@ alias real="ledger -f $LEDGER bal Assets --real" alias budgets="ledger -f $LEDGER bal Budget" export PAGER=nvimpager +export MANPAGER="nvimpager" +alias less="nvimpager" +alias cat="nvimpager" + if [ -e /home/ssm-user/.nix-profile/etc/profile.d/nix.sh ]; then . /home/ssm-user/.nix-profile/etc/profile.d/nix.sh; fi -- GitLab From 0e77006d729c8676517b1c2c775c67ea994c3ffb Mon Sep 17 00:00:00 2001 From: utzuro Date: Thu, 20 Jul 2023 08:17:12 +0900 Subject: [PATCH 04/18] Refactor and add new tools in mac.sh script --- config/zsh/.zshrc | 1 + packages/mac.sh | 30 ++++++++++++------------------ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 7649823..89d44dd 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -54,6 +54,7 @@ export GOPATH=$HOME/go export PATH="$GOROOT/bin:$PATH" export PATH="$PATH:$GOPATH/bin" export PATH="$PATH:$npm_config_prefix" +export PATH="$PATH:$HOME/.deno/bin" # Import system specific configurations source ~/.profile diff --git a/packages/mac.sh b/packages/mac.sh index 5833336..e773382 100755 --- a/packages/mac.sh +++ b/packages/mac.sh @@ -8,27 +8,18 @@ xcode-select --install > /dev/null brew update # shell tools -brew install curl wget zsh git tmux vim docker jq peco ranger zplug node +brew install curl wget zsh zsh-autosuggestions ack git tig tmux vim neovim nvimpager bat jq peco ranger zplug fzf imagemagick ffmpeg tree vhs neofetch scdoc sdcv pandoc -# pdf -brew tap zegervdv/zathura -brew install zathura zathura-pdf-mupdf +# dev +brew install go tinygo python docker node deno yarn postgresql visual-studio-code +deno completions zsh > ~/.zsh/_deno -# Extra: can be skipped safely. -brew tap versent/homebrew-taps -brew install tfenv goenv saml2aws jq -brew install ledger -brew install obsidian -brew install scdoc -brew install graphviz -brew install ffmpeg - -git clone https://github.com/lucc/nvimpager "${alchemy:?}"/summons -cd "${alchemy:?}"/summons/nvimpager || exit -make install -cd -1 || exit +# tools +brew install graphviz ledger obsidian kitty -sh <(curl -L https://nixos.org/nix/install) +# extra tools +brew tap versent/homebrew-taps +brew install tfenv saml2aws # Configure macOS # Disable auto-capitalization @@ -48,3 +39,6 @@ for app in "Dock" \ "SystemUIServer"; do killall "${app}" &> /dev/null done + +brew install koekeishiya/formulae/skhd +skhd --start-service -- GitLab From a63f534c9954773c1d3f4ab62f082e692b369717 Mon Sep 17 00:00:00 2001 From: utzuro Date: Thu, 20 Jul 2023 19:16:23 +0900 Subject: [PATCH 05/18] Create osagnostic.sh to install the latest version of goread package --- packages/osagnostic.sh | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 packages/osagnostic.sh diff --git a/packages/osagnostic.sh b/packages/osagnostic.sh new file mode 100644 index 0000000..d2bd331 --- /dev/null +++ b/packages/osagnostic.sh @@ -0,0 +1,2 @@ +# rss +go install github.com/TypicalAM/goread@latest -- GitLab From 3b865e105ae751cdc6d4eae0062ae5c48e58bfc3 Mon Sep 17 00:00:00 2001 From: utzuro Date: Sat, 22 Jul 2023 06:47:22 +0900 Subject: [PATCH 06/18] update instructions --- config/i3/config | 6 +++--- install.sh | 3 ++- packages/archinstall.sh | 12 +++++++++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/config/i3/config b/config/i3/config index ce437c6..99c4549 100644 --- a/config/i3/config +++ b/config/i3/config @@ -3,9 +3,9 @@ # AUTOSTART exec xrdb ~/.Xresources exec --no-startup-id picom -b -exec_always feh --no-aehbg --bg-fill --randomize ~/m/mysticism/i/wallpapers/* & -exec --no-startup-id telegram-desktop & -exec --no-startup-id firefox & +exec_always feh --no-aehbg --bg-fill --randomize ~/m/mysticism/i/back/wallpapers/* & +# exec --no-startup-id telegram-desktop & +# exec --no-startup-id firefox & exec --no-startup-id xsettingsd & exec --no-startup-id pasystray exec --no-startup-id copyq diff --git a/install.sh b/install.sh index 3d38780..96472b9 100755 --- a/install.sh +++ b/install.sh @@ -78,11 +78,12 @@ cp -n "$DIR"/config/ssh/config "$HOME"/.ssh/ if xhost >& /dev/null ; then printf "šŸ§æ Detected Xorg, configuring...\n" ln -sfv "$DIR"/config/xorg/.xinitrc "$HOME"/ - mkdir -p "$HOME"/.config/{dunst,rofi,mpd} + mkdir -p "$HOME"/.config/{dunst,rofi,mpd,ncmpcpp,waybar} ln -sfv "$DIR"/config/dunst/* "$HOME"/.config/dunst/ ln -sfv "$DIR"/config/rofi/* "$HOME"/.config/rofi/ ln -sfv "$DIR"/config/mpd/* "$HOME"/.config/mpd/ ln -sfv "$DIR"/config/ncmpcpp/* "$HOME"/.config/ncmpcpp/ + ln -sfv "$DIR"/config/waybar/* "$HOME"/.config/waybar/ cp -n "$DIR"/config/xorg/.Xresources "$HOME"/ # Remove 4K configs if no 4K monitor is found UHD="$(xrandr | awk '/3840x/ {print $1}')" diff --git a/packages/archinstall.sh b/packages/archinstall.sh index 1f0379b..46451d5 100755 --- a/packages/archinstall.sh +++ b/packages/archinstall.sh @@ -47,6 +47,7 @@ dunst rofi gvim neovim redshift viewnior feh xfce4-terminal konsole kitty --noco # GUI Apps sudo pacman -S thunar firefox chromium vlc gedit nautilus --noconfirm +# Note on chromium add this flag "ozone-platform-hint=auto" to /etc/chromium-flags.conf # Dev tools pacman -S docker docker-compose go goenv php node python @@ -143,7 +144,16 @@ read -rp "šŸ‘¾ Is this gaming PC? (y/N) šŸ‘€ " yn if [ "$yn" == "y" ]; then ## Get emulators: - paru -S steam wine-staging winetricks wine-gecko wine-mono --noconfirm + paru -S gamescope steam wine-staging winetricks wine-gecko wine-mono --noconfirm + + ## How to use GameScope: on any X11 or Wayland desktop, set the Steam launch arguments of game: + ### Upscale a 720p game to 1440p with integer scaling + # gamescope -h 720 -H 1440 -i -- %command% + ### Limit a vsynced game to 30 FPS + # gamescope -r 30 -- %command% + ### Run the game at 1080p, but scale output to a fullscreen 3440Ɨ1440 pillarboxed ultrawide window + # gamescope -w 1920 -h 1080 -W 3440 -H 1440 -b -- %command% + ## Libraries for the wine to work properly paru -S giflib lib32-giflib libpng lib32-libpng libldap lib32-libldap gnutls lib32-gnutls mpg123 lib32-mpg123 openal lib32-openal v4l-utils lib32-v4l-utils libpulse lib32-libpulse alsa-plugins lib32-alsa-plugins alsa-lib lib32-alsa-lib libjpeg-turbo lib32-libjpeg-turbo libxcomposite lib32-libxcomposite libxinerama lib32-libxinerama ncurses lib32-ncurses opencl-icd-loader lib32-opencl-icd-loader libxslt lib32-libxslt libva lib32-libva gtk3 lib32-gtk3 gst-plugins-base-libs lib32-gst-plugins-base-libs vulkan-icd-loader lib32-vulkan-icd-loader cups samba --noconfirm ## Dosbox -- GitLab From 51e881922b77cbe7415c55064f36d33aada51a0b Mon Sep 17 00:00:00 2001 From: utzuro Date: Sat, 22 Jul 2023 08:14:36 +0900 Subject: [PATCH 07/18] add waybar default configs --- config/waybar/config | 166 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 config/waybar/config diff --git a/config/waybar/config b/config/waybar/config new file mode 100644 index 0000000..22886b9 --- /dev/null +++ b/config/waybar/config @@ -0,0 +1,166 @@ + +{ + "layer": "top", // Waybar at top layer + // "position": "bottom", // Waybar position (top|bottom|left|right) + "height": 30, // Waybar height (to be removed for auto height) + // "width": 1280, // Waybar width + "spacing": 4, // Gaps between modules (4px) + // Choose the order of the modules + "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad", "custom/media"], + "modules-center": ["sway/window"], + "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "clock", "tray"], + // Modules configuration + "sway/workspaces": { + "disable-scroll": false, + "all-outputs": true, + "format": "{name}: {icon}", + "format-icons": { + "1": "ļ„ ", + "2": "ļ‰Ø", + "3": "ļ„”", + "4": "ļ†¼", + "5": "ļµ", + "urgent": "ļŖ", + "focused": "ļ†’", + "default": "ļ„‘" + } + }, + "keyboard-state": { + "numlock": true, + "capslock": true, + "format": "{name} {icon}", + "format-icons": { + "locked": "ļ€£", + "unlocked": "ļ‚œ" + } + }, + "sway/mode": { + "format": "{}" + }, + "sway/scratchpad": { + "format": "{icon} {count}", + "show-empty": false, + "format-icons": ["", "ļ‹’"], + "tooltip": true, + "tooltip-format": "{app}: {title}" + }, + "mpd": { + "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) āøØ{songPosition}|{queueLength}āø© {volume}% ļ€", + "format-disconnected": "Disconnected ļ€", + "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ļ€", + "unknown-tag": "N/A", + "interval": 2, + "consume-icons": { + "on": "ļƒ„ " + }, + "random-icons": { + "off": "ļ“ ", + "on": "ļ“ " + }, + "repeat-icons": { + "on": "ļ€ž " + }, + "single-icons": { + "on": "ļ€ž1 " + }, + "state-icons": { + "paused": "ļŒ", + "playing": "ļ‹" + }, + "tooltip-format": "MPD (connected)", + "tooltip-format-disconnected": "MPD (disconnected)" + }, + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "ļ®", + "deactivated": "ļ°" + } + }, + "tray": { + // "icon-size": 21, + "spacing": 10 + }, + "clock": { + // "timezone": "America/New_York", + "tooltip-format": "{:%Y %B}\n{calendar}", + "format-alt": "{:%Y-%m-%d}" + }, + "cpu": { + "format": "{usage}% ļ‹›", + "tooltip": false + }, + "memory": { + "format": "{}% ļƒ‰" + }, + "temperature": { + // "thermal-zone": 2, + // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", + "critical-threshold": 80, + // "format-critical": "{temperatureC}Ā°C {icon}", + "format": "{temperatureC}Ā°C {icon}", + "format-icons": ["ļ«", "ļ‹‰", "ļ©"] + }, + "backlight": { + // "device": "acpi_video1", + "format": "{percent}% {icon}", + "format-icons": ["īŽ", "ī“", "ī‘", "ī", "īŽ", "ī", "īŠ", "īˆ", "īŽ›"] + }, + "battery": { + "states": { + // "good": 95, + "warning": 30, + "critical": 15 + }, + "format": "{capacity}% {icon}", + "format-charging": "{capacity}% ļ—§", + "format-plugged": "{capacity}% ļ‡¦", + "format-alt": "{time} {icon}", + // "format-good": "", // An empty format will hide the module + // "format-full": "", + "format-icons": ["ļ‰„", "ļ‰ƒ", "ļ‰‚", "ļ‰", "ļ‰€"] + }, + "battery#bat2": { + "bat": "BAT2" + }, + "network": { + // "interface": "wlp2*", // (Optional) To force the use of this interface + "format-wifi": "{essid} ({signalStrength}%) ļ‡«", + "format-ethernet": "{ipaddr}/{cidr} ļž–", + "tooltip-format": "{ifname} via {gwaddr} ļž–", + "format-linked": "{ifname} (No IP) ļž–", + "format-disconnected": "Disconnected āš ", + "format-alt": "{ifname}: {ipaddr}/{cidr}" + }, + "pulseaudio": { + // "scroll-step": 1, // %, can be a float + "format": "{volume}% {icon} {format_source}", + "format-bluetooth": "{volume}% {icon}ļŠ” {format_source}", + "format-bluetooth-muted": "ļš© {icon}ļŠ” {format_source}", + "format-muted": "ļš© {format_source}", + "format-source": "{volume}% ļ„°", + "format-source-muted": "ļ„±", + "format-icons": { + "headphone": "ļ€„", + "hands-free": "ļ–", + "headset": "ļ–", + "phone": "ļ‚•", + "portable": "ļ‚•", + "car": "ļ†¹", + "default": ["ļ€¦", "ļ€§", "ļ€Ø"] + }, + "on-click": "pavucontrol" + }, + "custom/media": { + "format": "{icon} {}", + "return-type": "json", + "max-length": 40, + "format-icons": { + "spotify": "ļ†¼", + "default": "šŸŽœ" + }, + "escape": true, + "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder + // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name + } +} -- GitLab From 715713929cbef5ed9dab4a0ecd865345ca9dec4c Mon Sep 17 00:00:00 2001 From: utzuro Date: Fri, 28 Jul 2023 17:35:21 +0900 Subject: [PATCH 08/18] update --- config/goread/colorscheme.json | 13 +++++++++++++ config/goread/urls.yml | 10 ++++++++++ config/zsh/.zshrc | 5 +---- install.sh | 3 ++- 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 config/goread/colorscheme.json create mode 100644 config/goread/urls.yml diff --git a/config/goread/colorscheme.json b/config/goread/colorscheme.json new file mode 100644 index 0000000..bb326f4 --- /dev/null +++ b/config/goread/colorscheme.json @@ -0,0 +1,13 @@ +{ + "bg_dark": "#161622", + "bg_darker": "#11111a", + "text": "#FFFFFF", + "text_dark": "#47485b", + "color1": "#c29fec", + "color2": "#ddbec0", + "color3": "#89b4fa", + "color4": "#e06c75", + "color5": "#98c379", + "color6": "#fab387", + "color7": "#f1c1e4" +} diff --git a/config/goread/urls.yml b/config/goread/urls.yml new file mode 100644 index 0000000..fba4fac --- /dev/null +++ b/config/goread/urls.yml @@ -0,0 +1,10 @@ +categories: + - name: Tech + desc: Tech news + subscriptions: + - name: Wired + desc: News from the wired team + url: https://www.wired.com/feed/rss + - name: Chris Titus Tech (virtualization) + desc: Chris Titus Tech on virtualization + url: https://christitus.com/categories/virtualization/index.xml diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 89d44dd..bb3c8bb 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -17,7 +17,6 @@ source ~/.zplug/init.zsh zplug "zsh-users/zsh-autosuggestions" zplug "zsh-users/zsh-syntax-highlighting" zplug "zsh-users/zsh-history-substring-search" -zplug "unixorn/fzf-zsh-plugin" zplug romkatv/powerlevel10k, as:theme, depth:1 zplug load @@ -58,6 +57,7 @@ export PATH="$PATH:$HOME/.deno/bin" # Import system specific configurations source ~/.profile +source ~/.secrets # Other if [ -f ~/.awsrc ]; then @@ -89,6 +89,3 @@ export PAGER=nvimpager export MANPAGER="nvimpager" alias less="nvimpager" alias cat="nvimpager" - - -if [ -e /home/ssm-user/.nix-profile/etc/profile.d/nix.sh ]; then . /home/ssm-user/.nix-profile/etc/profile.d/nix.sh; fi diff --git a/install.sh b/install.sh index 96472b9..5a4cf5b 100755 --- a/install.sh +++ b/install.sh @@ -78,8 +78,9 @@ cp -n "$DIR"/config/ssh/config "$HOME"/.ssh/ if xhost >& /dev/null ; then printf "šŸ§æ Detected Xorg, configuring...\n" ln -sfv "$DIR"/config/xorg/.xinitrc "$HOME"/ - mkdir -p "$HOME"/.config/{dunst,rofi,mpd,ncmpcpp,waybar} + mkdir -p "$HOME"/.config/{dunst,rofi,mpd,ncmpcpp,waybar,goread} ln -sfv "$DIR"/config/dunst/* "$HOME"/.config/dunst/ + ln -sfv "$DIR"/config/goread/* "$HOME"/.config/goread/ ln -sfv "$DIR"/config/rofi/* "$HOME"/.config/rofi/ ln -sfv "$DIR"/config/mpd/* "$HOME"/.config/mpd/ ln -sfv "$DIR"/config/ncmpcpp/* "$HOME"/.config/ncmpcpp/ -- GitLab From 007c6261542a7ba128f59ee4328bb0e485b965e9 Mon Sep 17 00:00:00 2001 From: utzuro Date: Fri, 28 Jul 2023 17:38:27 +0900 Subject: [PATCH 09/18] add kitty configs --- config/kitty/kitty.conf | 42 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 config/kitty/kitty.conf diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf new file mode 100644 index 0000000..202c2cb --- /dev/null +++ b/config/kitty/kitty.conf @@ -0,0 +1,42 @@ +# vim:fileencoding=utf-8:foldmethod=marker + +# appearance +background_opacity 0.8 +font_size 18.0 + +# configs +enable_audio_bell no +macos_option_as_alt yes +macos_quit_when_last_window_closed yes +macos_custom_beam_cursor yes +focus_follows_mouse yes + +# mappings +#clear_all_shortcuts yes +map cmd+t discard +map cmd+w discard +# clipboard +copy_on_select clipboard +strip_trailing_spaces smart +select_by_word_characters @-./_~?&=%+# +map cmd+c copy_or_interrupt +map cmd+v paste_from_clipboard +map cmd+c copy_or_interrupt +map cmd+v paste_from_clipboard +map kitty_mod+s paste_from_selection +map shift+insert paste_from_selection +# scroll +map cmd+k scroll_line_up +map cmd+j scroll_line_down +map cmd+page_up scroll_page_up +map cmd+page_down scroll_page_down +map cmd+home scroll_home +map cmd+end scroll_end +map alt+h show_scrollback +scrollback_pager less --chop-long-lines --RAW-CONTROL-CHARS +INPUT_LINE_NUMBER +scrollback_lines 2000 +scrollback_pager_history_size 0 +wheel_scroll_multiplier 5.0 +touch_scroll_multiplier 1.0 +# other +map cmd+shift+u unicode_input -- GitLab From 0624a7cd99578cd2e0fe8efa8cafc5fd8854fd5e Mon Sep 17 00:00:00 2001 From: utzuro Date: Fri, 28 Jul 2023 17:38:59 +0900 Subject: [PATCH 10/18] update --- config/waybar/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/waybar/config b/config/waybar/config index 22886b9..ada51d8 100644 --- a/config/waybar/config +++ b/config/waybar/config @@ -1,7 +1,7 @@ { "layer": "top", // Waybar at top layer - // "position": "bottom", // Waybar position (top|bottom|left|right) + "positikn": "bottom", // Waybar position (top|bottom|left|right) "height": 30, // Waybar height (to be removed for auto height) // "width": 1280, // Waybar width "spacing": 4, // Gaps between modules (4px) -- GitLab From 9bfefa1ea24e803c6d775c01fe01bd44427b1806 Mon Sep 17 00:00:00 2001 From: utzuro Date: Fri, 28 Jul 2023 18:04:19 +0900 Subject: [PATCH 11/18] update --- packages/shell_install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/shell_install.sh b/packages/shell_install.sh index ee49bca..1391b12 100755 --- a/packages/shell_install.sh +++ b/packages/shell_install.sh @@ -7,6 +7,7 @@ printf "\nāŒ›... Installing shell tools... šŸ› \n" touch "${HOME:?}"/.profile +touch "${HOME:?}"/.secrets if ! [ -d "$HOME/.oh-my-zsh" ]; then sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" else printf "šŸ“ Oh My Zsh seems to be already installed! Remove ~/.oh-my-zsh to reinstall. šŸš€\n" -- GitLab From 6fd443284b9f7f899eeccf2055ef83a78ad10666 Mon Sep 17 00:00:00 2001 From: utzuro Date: Thu, 3 Aug 2023 14:32:20 +0900 Subject: [PATCH 12/18] clean out rss feeds --- config/goread/urls.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config/goread/urls.yml b/config/goread/urls.yml index fba4fac..9796900 100644 --- a/config/goread/urls.yml +++ b/config/goread/urls.yml @@ -1,10 +1,10 @@ categories: - name: Tech - desc: Tech news + desc: Tech subscriptions: - - name: Wired - desc: News from the wired team - url: https://www.wired.com/feed/rss - - name: Chris Titus Tech (virtualization) - desc: Chris Titus Tech on virtualization - url: https://christitus.com/categories/virtualization/index.xml + - name: go + desc: Go Weekly + url: https://cprss.s3.amazonaws.com/golangweekly.com.xml + - name: rust + desc: "" + url: https://blog.rust-lang.org/feed.xml -- GitLab From 239edae4b3a2a820ebd87b732235395a13788450 Mon Sep 17 00:00:00 2001 From: utzuro Date: Thu, 3 Aug 2023 14:57:04 +0900 Subject: [PATCH 13/18] add feeds --- config/goread/urls.yml | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/config/goread/urls.yml b/config/goread/urls.yml index 9796900..4e9180e 100644 --- a/config/goread/urls.yml +++ b/config/goread/urls.yml @@ -1,10 +1,43 @@ categories: - name: Tech - desc: Tech + desc: Tech News etc subscriptions: - name: go desc: Go Weekly url: https://cprss.s3.amazonaws.com/golangweekly.com.xml - name: rust - desc: "" + desc: rust blog url: https://blog.rust-lang.org/feed.xml + - name: Ars Technica + desc: "" + url: http://feeds.arstechnica.com/arstechnica/technology-lab + - name: Hackday + desc: "" + url: https://hackaday.com/feed/ + - name: ACM Queue + desc: "" + url: http://queue.acm.org/rss/feeds/queuecontent.xml + - name: The Morning Paper + desc: "" + url: https://blog.acolyer.org/feed/ + - name: Academia + desc: Research, Articles + subscriptions: + - name: arXiv CS + desc: Computer Science Articles + url: https://arxiv.org/rss/cs + - name: 3 Quakrs Daily + desc: Articles + url: https://www.3quarksdaily.com/feed + - name: Philosophy Now + desc: "" + url: https://philosophynow.org/rss + - name: Fantasy + desc: Sci-fi, Fantasy, etc... + subscriptions: + - name: Tor.com + desc: "" + url: http://feeds.feedburner.com/Torcom/Frontpage_Partial + - name: Lightspeed Magazine + desc: "" + url: http://www.lightspeedmagazine.com/feed/ -- GitLab From bc7a8120a211353cbd8f77794f9e563ff8b0ea37 Mon Sep 17 00:00:00 2001 From: utzuro Date: Thu, 3 Aug 2023 17:51:23 +0900 Subject: [PATCH 14/18] use exa instead of ls --- config/zsh/.zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index bb3c8bb..7b6c41e 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -89,3 +89,4 @@ export PAGER=nvimpager export MANPAGER="nvimpager" alias less="nvimpager" alias cat="nvimpager" +alias ls="exa" -- GitLab From 38806a6957a1f976a8f5d0682afc4f3ec11544f0 Mon Sep 17 00:00:00 2001 From: utzuro Date: Thu, 24 Aug 2023 07:03:54 +0900 Subject: [PATCH 15/18] update windows configs --- config/win/ahk/config.ahk | 1 + packages/win.sh | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/win/ahk/config.ahk b/config/win/ahk/config.ahk index ca8ac56..fe4b1cb 100644 --- a/config/win/ahk/config.ahk +++ b/config/win/ahk/config.ahk @@ -18,6 +18,7 @@ ; Keyboard Layout CapsLock::Send "{Shift down}{Alt}{Shift up}" F2::Send "{Alt down}{``}{Alt up}" +F1::Send "{Alt down}{``}{Alt up}" ; Media keys #m::Send "{Media_Play_Pause}" diff --git a/packages/win.sh b/packages/win.sh index 80e470e..567de08 100644 --- a/packages/win.sh +++ b/packages/win.sh @@ -2,14 +2,15 @@ # Set-ExecutionPolicy RemoteSigned -Scope CurrentUser # irm get.scoop.sh | iex +# note: chats don't work well when installed with scoop so install manually + scoop bucket add extras # tools scoop install ffmpeg vim 7zip curl wget openssh coreutils yt-dlp # utils -scoop install autohotkey powertoys +scoop install autohotkey powertoys ueli wiztree openssh-connect # apps scoop install firefox libreoffice qbittorrent vlc sumatrapdf anki eartrumpet -scoop install discord signal forkgram # dev scoop install python go nodejs rustup scoop install neovim jetbrains-toolbox vscode docker docker-compose @@ -20,6 +21,7 @@ scoop install steam # run with admin rights (buckets can be installed as normal user) scoop bucket add games scoop bucket add nonportable +# scoop install protonvpn-np # scoop install epic-games-launcher -# scoop install protonvpn-np voicemeeter-np +# scoop install voicemeeter-np -- GitLab From efbb1392221b2a8381d92c61f72dec12bc7b28c9 Mon Sep 17 00:00:00 2001 From: utzuro Date: Thu, 24 Aug 2023 19:30:17 +0900 Subject: [PATCH 16/18] update configs --- config/skhd/.skhdrc | 1 + config/zsh/.zshrc | 1 + 2 files changed, 2 insertions(+) diff --git a/config/skhd/.skhdrc b/config/skhd/.skhdrc index 045c2fe..55a37ed 100644 --- a/config/skhd/.skhdrc +++ b/config/skhd/.skhdrc @@ -1,2 +1,3 @@ ctrl - return : /Applications/kitty.app/Contents/MacOS/kitty --single-instance -d ~ cmd - h : : +ctrl - p : skhd -k "play" diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 7b6c41e..7751458 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -90,3 +90,4 @@ export MANPAGER="nvimpager" alias less="nvimpager" alias cat="nvimpager" alias ls="exa" +export PATH="/opt/homebrew/opt/postgresql@15/bin:$PATH" -- GitLab From 8ec048acbc0121ecf20835ed981c8f1ef00e206a Mon Sep 17 00:00:00 2001 From: utzuro Date: Sun, 24 Sep 2023 15:54:10 +0900 Subject: [PATCH 17/18] update --- config/vim/.vim/plugins.vim | 28 +++++++++++++++++----------- config/waybar/config | 1 + 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/config/vim/.vim/plugins.vim b/config/vim/.vim/plugins.vim index b02c4a4..1bbf4b4 100644 --- a/config/vim/.vim/plugins.vim +++ b/config/vim/.vim/plugins.vim @@ -20,7 +20,7 @@ Plugin 'junegunn/goyo.vim' " Plugin 'inkarkat/vim-ingo-library' | Plugin 'inkarkat/vim-SpellCheck' " IDE - Plugin 'github/copilot.vim' + " Plugin 'github/copilot.vim' Plugin 'vim-scripts/ReplaceWithRegister' Plugin 'sheerun/vim-polyglot' Plugin 'tommcdo/vim-exchange' @@ -53,29 +53,35 @@ "Plugin 'mhinz/vim-signify' "Plugin 'SirVer/ultisnips' | Plugin 'honza/vim-snippets' Plugin 'vim-scripts/AutoComplPop' + + " Tools + Plugin 'tpope/vim-git' + + " Programming languages support + " Server Plugin 'fatih/vim-go' + Plugin 'vim-python/python-syntax' Plugin 'rust-lang/rust.vim' - " Languages and file types. + " Frontend + Plugin 'pangloss/vim-javascript' + Plugin 'othree/html5.vim' + Plugin 'chrisbra/csv.vim' Plugin 'cakebaker/scss-syntax.vim' + + " Config scripts support + Plugin 'elkowar/yuck.vim' + Plugin 'PotatoesMaster/i3-vim-syntax' Plugin 'chr4/nginx.vim' - Plugin 'chrisbra/csv.vim' + Plugin 'lifepillar/pgsql.vim' Plugin 'ekalinin/dockerfile.vim' Plugin 'elixir-editors/vim-elixir' Plugin 'Glench/Vim-Jinja2-Syntax' Plugin 'godlygeek/tabular' | Plugin 'tpope/vim-markdown' Plugin 'iamcco/markdown-preview.nvim', { 'do': 'cd app & yarn install' } Plugin 'jvirtanen/vim-hcl' - Plugin 'lifepillar/pgsql.vim' - Plugin 'othree/html5.vim' - Plugin 'pangloss/vim-javascript' - Plugin 'PotatoesMaster/i3-vim-syntax' Plugin 'stephpy/vim-yaml' Plugin 'tmux-plugins/vim-tmux' - Plugin 'tpope/vim-git' Plugin 'tpope/vim-liquid' - Plugin 'tpope/vim-rails' - Plugin 'vim-python/python-syntax' - Plugin 'vim-ruby/vim-ruby' Plugin 'wgwoods/vim-systemd-syntax' Plugin 'towolf/vim-helm' diff --git a/config/waybar/config b/config/waybar/config index ada51d8..5882ac3 100644 --- a/config/waybar/config +++ b/config/waybar/config @@ -164,3 +164,4 @@ // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name } } + -- GitLab From 76d2f4c1fecb08a7a475eb9641cd0900ca01d503 Mon Sep 17 00:00:00 2001 From: utzuro Date: Tue, 17 Oct 2023 10:43:30 +0900 Subject: [PATCH 18/18] use terminal to enter gpg key --- config/zsh/.zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 7751458..648ba4e 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -41,6 +41,7 @@ export alchemy="$HOME/alchemy" export manuscripts="$alchemy/manuscripts" # Program specific +export GPG_TTY=$(tty) export npm_config_prefix=~/.node_modules export LD_LIBRARY_PATH=/usr/local/lib/ export MANGOHUD=0 #1 for fps in steam games -- GitLab