aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Triguba <hello@eugenetriguba.com>2025-12-12 18:23:50 -0500
committerEugene Triguba <hello@eugenetriguba.com>2025-12-13 09:16:47 -0500
commit38605cfc3a6e9f09c1b0d2f815a7f7d54f9f6621 (patch)
tree1d2e849a6838f528dda5bd05bc4e3d0ece6b32ee
parentSync every 5m and re-enable gmail (diff)
downloaddotfiles-38605cfc3a6e9f09c1b0d2f815a7f7d54f9f6621.zip
Replace openbsd with debian
-rwxr-xr-xbin/.local/bin/tree-sitterbin0 -> 12489088 bytes
-rw-r--r--cwm/.cwmrc117
-rw-r--r--gpg/.gnupg/gpg-agent.conf2
-rwxr-xr-xinstall.sh18
-rw-r--r--kitty/.config/kitty/kitty.conf65
-rw-r--r--ksh/.kshrc124
-rwxr-xr-xlemonbar-xft/.config/lemonbar-xft/bar.sh133
-rw-r--r--linux-debian/packages.txt91
-rwxr-xr-xlinux-debian/update-packages.sh9
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/fzf-lua.lua4
-rw-r--r--openbsd/etc/doas.conf3
-rw-r--r--openbsd/etc/login.conf129
-rw-r--r--openbsd/etc/rc.conf.local3
-rw-r--r--openbsd/etc/sysctl.conf5
-rw-r--r--openbsd/etc/wsconsctl.conf7
-rw-r--r--openbsd/packages.txt49
-rwxr-xr-xopenbsd/update-packages.sh4
-rw-r--r--shlib/bootstrap.sh40
-rw-r--r--shlib/os.sh9
-rw-r--r--wallpapers/Pictures/Wallpapers/3840x2160-dark-openbsd.pngbin157327 -> 0 bytes
-rw-r--r--x/.Xresources73
-rw-r--r--x/.profile11
-rw-r--r--x/.xinitrc38
-rwxr-xr-xzsh/.zshrc5
24 files changed, 160 insertions, 779 deletions
diff --git a/bin/.local/bin/tree-sitter b/bin/.local/bin/tree-sitter
new file mode 100755
index 0000000..05ed7f3
--- /dev/null
+++ b/bin/.local/bin/tree-sitter
Binary files differ
diff --git a/cwm/.cwmrc b/cwm/.cwmrc
deleted file mode 100644
index 2749ced..0000000
--- a/cwm/.cwmrc
+++ /dev/null
@@ -1,117 +0,0 @@
-############################
-# Unbind ALL defaults first
-############################
-unbind-key all
-unbind-mouse all
-
-####################
-# Key bindings
-#
-# For bind-key:
-# - 4 = super
-# - M = alt
-# - C = ctrl
-# - S = shift
-#
-# For bind-mouse:
-# - 1 = left
-# - 2 = middle
-# - 3 = right
-####################
-
-# Window management
-bind-key 4-q window-delete
-bind-key 4S-q quit
-bind-key 4-f window-fullscreen
-bind-key 4S-space window-stick
-bind-key 4-m window-maximize
-
-# Tiling/snapping
-bind-key 4-h window-snap-left
-bind-key 4-j window-snap-down
-bind-key 4-k window-snap-up
-bind-key 4-l window-snap-right
-bind-key 4-v window-vtile
-bind-key 4-b window-htile
-
-# Focus movement
-bind-key 4-Tab window-cycle
-bind-key 4S-Tab window-rcycle
-
-# Workspaces
-bind-key 4-1 group-only-1
-bind-key 4-2 group-only-2
-bind-key 4-3 group-only-3
-bind-key 4-4 group-only-4
-bind-key 4-5 group-only-5
-bind-key 4-6 group-only-6
-bind-key 4-7 group-only-7
-bind-key 4-8 group-only-8
-bind-key 4-9 group-only-9
-
-# Move window to workspace
-bind-key 4S-1 window-movetogroup-1
-bind-key 4S-2 window-movetogroup-2
-bind-key 4S-3 window-movetogroup-3
-bind-key 4S-4 window-movetogroup-4
-bind-key 4S-5 window-movetogroup-5
-bind-key 4S-6 window-movetogroup-6
-bind-key 4S-7 window-movetogroup-7
-bind-key 4S-8 window-movetogroup-8
-bind-key 4S-9 window-movetogroup-9
-
-# Applications
-bind-key 4-Return terminal
-bind-key 4-a menu-cmd
-bind-key 4-d menu-exec
-bind-key 4-w menu-window
-bind-key 4S-s menu-ssh
-
-# Reload config
-bind-key 4S-r reload
-bind-key 4S-q quit
-
-# Window hiding/unhiding
-bind-key 4-x window-hide
-bind-key 4S-x menu-unhide
-
-# Mouse bindings
-bind-mouse 4-1 window-move
-bind-mouse 4-3 window-resize
-bind-mouse 4S-3 window-lower
-
-####################
-# Window behavior
-####################
-# Assign new windows to the current group
-sticky yes
-
-snapdist 10
-moveamount 5
-
-####################
-# Ignore lemonbar
-#
-# % xprop | grep WM_CLASS
-####################
-ignore Bar
-
-######################
-# Application commands
-######################
-command kitty kitty
-command chrome chrome
-command firefox firefox
-
-command browser chrome
-command terminal kitty
-
-####################
-# Appearance
-####################
-fontname "Hack:pixelsize=14"
-color menubg "#32302f"
-color menufg "#ebdbb2"
-color font "#ebdbb2"
-color selffont "#32302f"
-gap 26 2 2 2
diff --git a/gpg/.gnupg/gpg-agent.conf b/gpg/.gnupg/gpg-agent.conf
index bb19ac5..049b40e 100644
--- a/gpg/.gnupg/gpg-agent.conf
+++ b/gpg/.gnupg/gpg-agent.conf
@@ -1 +1 @@
-pinentry-program /usr/local/bin/pinentry-curses
+pinentry-program /usr/bin/pinentry-curses
diff --git a/install.sh b/install.sh
index e341368..4d5386f 100755
--- a/install.sh
+++ b/install.sh
@@ -9,8 +9,8 @@ set -e
main() {
if os_is_macos; then
bootstrap_macos
- elif os_is_openbsd; then
- bootstrap_openbsd
+ elif os_is_linux_debian; then
+ bootstrap_linux_debian
else
log_error "Unexpected OS: $(os_print)"
exit 1
@@ -20,20 +20,14 @@ main() {
}
if os_is_macos; then
- stow ghostty
stow macos-gpg
fi
- if os_is_openbsd; then
- stow ksh
- stow x
- stow feh
- stow cwm
- stow kitty
- stow lemonbar-xft
- stow newsboat
- stow ansiweather
+ if os_is_linux_debian; then
stow gpg
fi
+ stow ghostty
+ stow ansiweather
+ stow newsboat
stow wallpapers
stow ssh
stow bin
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
deleted file mode 100644
index 68a3467..0000000
--- a/kitty/.config/kitty/kitty.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-# Terminal identification
-term xterm-256color
-
-# Window settings
-remember_window_size no
-initial_window_width 90c
-initial_window_height 34c
-
-# Scrollback
-scrollback_lines 10000
-
-# Font settings
-font_family Hack
-font_size 12.0
-disable_ligatures never
-
-# Copy/paste shortcuts
-map ctrl+shift+c copy_to_clipboard
-map ctrl+shift+v paste_from_clipboard
-
-# Additional settings
-shell_integration enabled
-allow_remote_control no
-enable_audio_bell no
-
-# Tokyo Night Theme
-foreground #a9b1d6
-background #1a1b26
-cursor #a9b1d6
-
-# Selection colors
-selection_foreground none
-selection_background #33467c
-
-# Black
-color0 #1a1b26
-color8 #4e5173
-
-# Red
-color1 #F7768E
-color9 #F7768E
-
-# Green
-color2 #9ECE6A
-color10 #9ECE6A
-
-# Yellow
-color3 #E0AF68
-color11 #E0AF68
-
-# Blue
-color4 #7AA2F7
-color12 #7AA2F7
-
-# Magenta
-color5 #9a7ecc
-color13 #9a7ecc
-
-# Cyan
-color6 #4abaaf
-color14 #4abaaf
-
-# White
-color7 #acb0d0
-color15 #acb0d0
diff --git a/ksh/.kshrc b/ksh/.kshrc
deleted file mode 100644
index 1958a6b..0000000
--- a/ksh/.kshrc
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/ksh
-
-if [ "$(uname)" = "OpenBSD" ]; then
- . ~/.profile
-fi
-
-#
-# Setup Shell Prompt
-#
-git_branch() {
- git branch 2>/dev/null | grep '^\*' | cut -d' ' -f2-
-}
-
-# PS1 with git branch support
-PS1='$(
- printf " %s " "${PWD#$HOME/}"
- branch=$(git_branch)
- if [ -n "$branch" ]; then
- printf "\033[32m(%s)\033[0m " "$branch"
- fi
- if [ "$(id -u)" -eq 0 ]; then
- printf "# "
- else
- printf "$ "
- fi
-)'
-
-#
-# Setup shell history
-#
-export HISTFILE=~/.ksh_history
-export HISTSIZE=1000000
-
-#
-# Setup default env variables
-#
-export EDITOR="nvim"
-export BROWSER="firefox"
-export GPG_TTY=$(tty)
-export PAGER="less"
-export MANPAGER="less"
-export BAT_THEME="tokyonight_night"
-export LANG="en_US.UTF-8"
-export LC_CTYPE="en_US.UTF-8"
-export TERM="xterm-256color"
-
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_STATE_HOME="$HOME/.local/state"
-
-#
-# Language setup
-#
-export GOPATH="$XDG_DATA_HOME/go"
-export GOBIN="$HOME/.local/bin"
-export GOPROXY="direct"
-
-if [ -d "$HOME/.pyenv" ]; then
- export PYENV_ROOT="$HOME/.pyenv"
- export PATH="$PYENV_ROOT/bin:$PATH"
- eval "$(pyenv init -)"
-fi
-
-if [ -f "$HOME/.cargo/env" ]; then
- . "$HOME/.cargo/env"
-fi
-
-if [ -d "$HOME/.nvm" ]; then
- export NVM_DIR="$HOME/.nvm"
- [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
-fi
-
-#
-# Append additional directories onto PATH
-#
-export PATH="$HOME/.local/bin:$PATH"
-
-#
-# macOS
-#
-if [ $(uname) = "Darwin" ]; then
- # Homebrew
- eval "$(brew shellenv)"
- export LDFLAGS="-L/opt/homebrew/lib"
- export CPPFLAGS="-I/opt/homebrew/include"
- export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib"
-
- export JAVA_HOME=$(/usr/libexec/java_home -v 24)
- export PATH="/opt/homebrew/opt/openjdk@24/bin:$PATH"
- export CPPFLAGS="-I/opt/homebrew/opt/openjdk@24/include"
-
- export PNPM_HOME="/Users/eugene/Library/pnpm"
- case ":$PATH:" in
- *":$PNPM_HOME:"*) ;;
- *) export PATH="$PNPM_HOME:$PATH" ;;
- esac
-
- export PATH="$HOME/.poetry/bin:$PATH"
- export PATH="/opt/homebrew/opt/curl/bin:$PATH"
-fi
-
-#
-# Aliases
-#
-alias gs="git status"
-alias gc="git commit"
-alias ga="git add"
-alias gd="git diff"
-alias gds="git diff --staged"
-alias gp="git push"
-alias gpo="git push origin"
-alias gpl="git pull"
-alias gplrb="git pull --rebase"
-alias gl="git log"
-alias gv="git log --graph --decorate --oneline"
-alias gch="git checkout"
-alias gcb="git checkout -b"
-
-alias h="history 25"
-alias j="jobs -l"
-alias l="ls -al"
-
-set -o emacs
diff --git a/lemonbar-xft/.config/lemonbar-xft/bar.sh b/lemonbar-xft/.config/lemonbar-xft/bar.sh
deleted file mode 100755
index 8f5370e..0000000
--- a/lemonbar-xft/.config/lemonbar-xft/bar.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/sh
-
-RED="%{F#cd0000}"
-YELLOW="%{F#cdcd00}"
-RESET="%{F-}"
-
-main() {
- while true; do
- update_bar
- sleep 5
- done
-}
-
-is_laptop() {
- [ "$(hostname -s)" = "openbsd-laptop" ]
-}
-
-update_bar() {
- if is_laptop; then
- printf "%%{l} %s | %s | %s | %s | %s %%{r} %s | %s | %s \n" \
- "$(battery)" \
- "$(temp)" \
- "$(cpu)" \
- "$(memory)" \
- "$(brightness)" \
- "$(volume)" \
- "$(wifi)" \
- "$(datetime)"
- else
- printf "%s | %s | %s | %s %%{r} %s | %s \n" \
- "$(temp)" \
- "$(cpu)" \
- "$(memory)" \
- "$(volume)" \
- "$(wifi)" \
- "$(datetime)"
- fi
-}
-
-battery() {
- apm_output=$(apm -al)
- percent=$(echo "$apm_output" | sed -n '1p')
- batt_state=$(echo "$apm_output" | sed -n '2p')
- minutes=$(apm -m)
-
- filled=$((percent / 10))
- bar=""
- i=0
- while [ $i -lt 10 ]; do
- if [ $i -lt $filled ]; then
- if [ "$batt_state" = "1" ]; then
- bar="${bar}+"
- else
- bar="${bar}#"
- fi
- else
- bar="${bar}-"
- fi
- i=$((i + 1))
- done
-
- if [ "$percent" -lt 30 ] && [ "$batt_state" != "1" ]; then
- bar="${RED}${bar}${RESET}"
- elif [ "$percent" -lt 50 ] && [ "$batt_state" != "1" ]; then
- bar="${YELLOW}${bar}${RESET}"
- fi
-
- printf "%s%% %s (%s min)" "$percent" "$bar" "$minutes"
-}
-
-temp() {
- avg=$(sysctl hw.sensors | awk -F'=' '/temp/ {
- gsub(/degC.*/, "", $2);
- sum += $2;
- count++
- } END {
- printf "%.0f", sum/count
- }')
-
- if [ "$avg" -ge 85 ]; then
- printf "%s%d°C%s" "$RED" "$avg" "$RESET"
- else
- printf "%d°C" "$avg"
- fi
-}
-
-cpu() {
- apm -Pv | awk '{gsub(/\(|\)/, ""); print $5, $6, $4}'
-}
-
-memory() {
- top -n | awk '/^Memory:/ {
- split($3, r, "/");
- printf "Used:%s Free:%s", r[2], $6
- }'
-}
-
-net() {
- ifconfig egress 2>/dev/null | awk '/inet / {print $2}'
-}
-
-brightness() {
- bright=$(xbacklight -get | cut -d. -f1)
- printf "Bri: %d%%" "$bright"
-}
-
-volume() {
- vol=$(sndioctl -n output.level)
- percent=$(printf "%.0f" "$(echo "$vol" | awk '{print $1 * 100}')")
-
- if sndioctl output.mute | grep -q "=1"; then
- printf "Vol: MUTE"
- else
- printf "Vol: %d%%" "$percent"
- fi
-}
-
-wifi() {
- wifi_info=$(ifconfig iwm0 2>/dev/null | grep "ieee80211:")
- if [ -n "$wifi_info" ]; then
- ssid=$(echo "$wifi_info" | sed -n 's/.*join \(.*\) chan.*/\1/p' | tr -d '"')
- signal=$(ifconfig iwm0 | awk '/ieee80211:/ {for(i=1;i<=NF;i++) if($i ~ /%/) print $i}' | head -1)
- printf "%s %s %s" "$ssid" "$signal" "$(net)"
- else
- net
- fi
-}
-
-datetime() {
- date '+%Y-%m-%d %H:%M'
-}
-
-main
diff --git a/linux-debian/packages.txt b/linux-debian/packages.txt
new file mode 100644
index 0000000..eafc093
--- /dev/null
+++ b/linux-debian/packages.txt
@@ -0,0 +1,91 @@
+1password-cli
+aerc
+ansiweather
+apt-listchanges
+bash
+bash-completion
+bat
+bind9-dnsutils
+bind9-host
+bsdutils
+build-essential
+clang-format
+cmake
+console-setup
+cryptsetup-initramfs
+curl
+dash
+debian-faq
+dhcpcd-base
+diffutils
+doc-debian
+fdisk
+findutils
+firmware-intel-graphics
+firmware-iwlwifi
+firmware-sof-signed
+fonts-hack
+ftp
+fzf
+ghostty
+git
+golang
+grep
+grub-common
+grub-efi-amd64
+gzip
+hostname
+htop
+ifupdown
+inetutils-telnet
+init
+installation-report
+intel-microcode
+iproute2
+iputils-ping
+isync
+less
+libbpf1
+liblockfile-bin
+linux-image-amd64
+login
+logrotate
+lvm2
+msmtp
+nano
+ncurses-base
+ncurses-bin
+ncurses-term
+netcat-traditional
+newsboat
+nftables
+nodejs
+npm
+openjdk-25-jdk
+openjdk-25-jre
+os-prober
+pciutils
+php
+python3.13-venv
+reportbug
+ripgrep
+ruby
+rustfmt
+shfmt
+shim-signed
+stow
+task-desktop
+task-english
+task-gnome-desktop
+task-laptop
+tmux
+traceroute
+usbutils
+util-linux-extra
+vim
+vim-common
+vim-tiny
+wget
+wl-clipboard
+wtmpdb
+zsh
diff --git a/linux-debian/update-packages.sh b/linux-debian/update-packages.sh
new file mode 100755
index 0000000..03d4305
--- /dev/null
+++ b/linux-debian/update-packages.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+main() {
+ sudo apt-mark minimize-manual
+ sudo apt-mark showmanual >packages.txt
+}
+
+main
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/fzf-lua.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/fzf-lua.lua
index 5d0d830..be01d2e 100644
--- a/nvim/.config/nvim/lua/eugenetriguba/plugins/fzf-lua.lua
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/fzf-lua.lua
@@ -1,5 +1,9 @@
vim.pack.add {
{
+ name = 'mini.icons',
+ src = 'https://github.com/nvim-mini/mini.icons',
+ },
+ {
name = 'fzf-lua',
src = 'https://github.com/ibhagwan/fzf-lua',
},
diff --git a/openbsd/etc/doas.conf b/openbsd/etc/doas.conf
deleted file mode 100644
index a4231a0..0000000
--- a/openbsd/etc/doas.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-permit nopass root
-permit nopass eugene as root
-permit persist :wheel
diff --git a/openbsd/etc/login.conf b/openbsd/etc/login.conf
deleted file mode 100644
index ad4f6f3..0000000
--- a/openbsd/etc/login.conf
+++ /dev/null
@@ -1,129 +0,0 @@
-# $OpenBSD: login.conf,v 1.27 2025/07/17 14:44:42 landry Exp $
-
-#
-# Sample login.conf file. See login.conf(5) for details.
-#
-
-#
-# Standard authentication styles:
-#
-# passwd Use only the local password file
-# chpass Do not authenticate, but change user's password (change
-# the YP password if the user has one, else change the
-# local password)
-# lchpass Do not login; change user's local password instead
-# ldap Use LDAP authentication
-# radius Use RADIUS authentication
-# reject Use rejected authentication
-# skey Use S/Key authentication
-# activ ActivCard X9.9 token authentication
-# crypto CRYPTOCard X9.9 token authentication
-# snk Digital Pathways SecureNet Key authentication
-# token Generic X9.9 token authentication
-# yubikey YubiKey authentication
-#
-
-# Default allowed authentication styles
-auth-defaults:auth=passwd,skey:
-
-# Default allowed authentication styles for authentication type ftp
-auth-ftp-defaults:auth-ftp=passwd:
-
-#
-# The default values
-# To alter the default authentication types change the line:
-# :tc=auth-defaults:\
-# to read something like: (enables passwd, "myauth", and activ)
-# :auth=passwd,myauth,activ:\
-# Any value changed in the daemon class should be reset in default
-# class.
-#
-default:\
- :path=/usr/bin /bin /usr/sbin /sbin /usr/X11R6/bin /usr/local/bin /usr/local/sbin:\
- :umask=022:\
- :datasize-max=1536M:\
- :datasize-cur=1536M:\
- :maxproc-max=256:\
- :maxproc-cur=128:\
- :openfiles-max=1024:\
- :openfiles-cur=512:\
- :stacksize-cur=4M:\
- :localcipher=blowfish,a:\
- :tc=auth-defaults:\
- :tc=auth-ftp-defaults:
-
-#
-# Settings used by /etc/rc and root
-# This must be set properly for daemons started as root by inetd as well.
-# Be sure to reset these values to system defaults in the default class!
-#
-daemon:\
- :ignorenologin:\
- :datasize=4096M:\
- :maxproc=infinity:\
- :openfiles-max=1024:\
- :openfiles-cur=128:\
- :stacksize-cur=8M:\
- :tc=default:
-
-#
-# Staff have fewer restrictions and can login even when nologins are set.
-#
-staff:\
- :datasize-cur=6144M:\
- :datasize-max=infinity:\
- :maxproc-max=512:\
- :maxproc-cur=256:\
- :openfiles-max=2048:\
- :openfiles-cur=1024:\
- :ignorenologin:\
- :requirehome@:\
- :tc=default:
-
-#
-# Authpf accounts get a special motd and shell
-#
-authpf:\
- :welcome=/etc/motd.authpf:\
- :shell=/usr/sbin/authpf:\
- :tc=default:
-
-#
-# Building LLVM in base requires higher limits
-#
-build:\
- :datasize-max=1843M:\
- :datasize-cur=1843M:\
- :tc=default:
-
-#
-# Building ports with DPB uses raised limits
-#
-pbuild:\
- :datasize-max=infinity:\
- :datasize-cur=12G:\
- :maxproc-max=1024:\
- :maxproc-cur=512:\
- :stacksize-cur=8M:\
- :priority=5:\
- :tc=default:
-
-#
-# Override resource limits for certain daemons started by rc.d(8)
-#
-bgpd:\
- :datasize=16384M:\
- :openfiles=512:\
- :tc=daemon:
-
-unbound:\
- :openfiles=512:\
- :tc=daemon:
-
-vmd:\
- :datasize=16384M:\
- :tc=daemon:
-
-xenodm:\
- :openfiles=512:\
- :tc=daemon:
diff --git a/openbsd/etc/rc.conf.local b/openbsd/etc/rc.conf.local
deleted file mode 100644
index 0fdf669..0000000
--- a/openbsd/etc/rc.conf.local
+++ /dev/null
@@ -1,3 +0,0 @@
-apmd_flags=-A
-ntpd_flags=
-vmd_flags=
diff --git a/openbsd/etc/sysctl.conf b/openbsd/etc/sysctl.conf
deleted file mode 100644
index b15059c..0000000
--- a/openbsd/etc/sysctl.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-hw.smt=1
-hw.battery.chargestart=75
-hw.battery.chargestop=80
-kern.audio.record=1
-kern.video.record=1
diff --git a/openbsd/etc/wsconsctl.conf b/openbsd/etc/wsconsctl.conf
deleted file mode 100644
index 2947d07..0000000
--- a/openbsd/etc/wsconsctl.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-keyboard.bell.volume=0
-keyboard.encoding=us.swapctrlcaps
-mouse.reverse_scrolling=1
-mouse.tp.tapping=1 # enable tapping with default button mappings;
-display.vblank=on # enable vertical sync blank for screen burner
-display.screen_off=60000 # set screen burner timeout to 60 seconds
-display.msact=off # disable screen unburn w/ mouse
diff --git a/openbsd/packages.txt b/openbsd/packages.txt
deleted file mode 100644
index b1dee10..0000000
--- a/openbsd/packages.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-ImageMagick
-aerc
-ansiweather
-bash
-chafa
-chromium
-cmake
-cppcheck
-curl
-fd
-feh
-ffmpeg
-firefox
-fzf
-git
-glib2
-gmake
-gnupg
-go
-gopls
-hack-fonts
-htop
-jq
-kitty
-lemonbar-xft
-lynx
-neovim
-newsboat
-node
-noto-fonts
-noto-nerd-fonts
-pinentry
-py3-black
-py3-isort
-python
-quirks
-ripgrep
-sct
-shellcheck
-shfmt
-stow
-stylua
-tflint
-unzip
-wget
-xdg-utils
-xsel
-zip
-zsh
diff --git a/openbsd/update-packages.sh b/openbsd/update-packages.sh
deleted file mode 100755
index fd6891a..0000000
--- a/openbsd/update-packages.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -e
-
-pkg_info -m | awk '{ print }' | grep -v 'firmware' | sed 's/-[0-9].*//' | sort >packages.txt
diff --git a/shlib/bootstrap.sh b/shlib/bootstrap.sh
index f55822a..50be271 100644
--- a/shlib/bootstrap.sh
+++ b/shlib/bootstrap.sh
@@ -24,10 +24,40 @@ bootstrap_macos() {
sudo ln -sf "$(which op)" /usr/local/bin/op
}
-bootstrap_openbsd() {
- log_info "Installing OpenBSD packages..."
- _openbsd_packages="$(cat "$(dirname "$0")/openbsd/packages.txt" | tr '\n' ' ')"
+bootstrap_linux_debian() {
+ sudo apt-get install curl
+ if ! command -v op; then
+ _install_1password_cli
+ fi
+ if ! command -v ghostty; then
+ _install_ghostty
+ fi
+
+ log_info "Installing debian packages..."
+ _linux_debian_packages="$(cat "$(dirname "$0")/linux-debian/packages.txt" | tr '\n' ' ')"
# shellcheck disable=SC2086
- doas pkg_add $_openbsd_packages
- chsh -s /usr/local/bin/zsh "$USER"
+ sudo apt-get install --assume-yes $_linux_debian_packages
+ chsh -s $(which zsh) "$USER"
+}
+
+_install_1password_cli() {
+ # https://developer.1password.com/docs/cli/get-started/
+ curl -sS https://downloads.1password.com/linux/keys/1password.asc | \
+ sudo gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg && \
+ echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/$(dpkg --print-architecture) stable main" | \
+ sudo tee /etc/apt/sources.list.d/1password.list && \
+ sudo mkdir -p /etc/debsig/policies/AC2D62742012EA22/ && \
+ curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | \
+ sudo tee /etc/debsig/policies/AC2D62742012EA22/1password.pol && \
+ sudo mkdir -p /usr/share/debsig/keyrings/AC2D62742012EA22 && \
+ curl -sS https://downloads.1password.com/linux/keys/1password.asc | \
+ sudo gpg --dearmor --output /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg && \
+ sudo apt update && sudo apt install 1password-cli
+}
+
+_install_ghostty() {
+ curl -sS https://debian.griffo.io/EA0F721D231FDD3A0A17B9AC7808B4DD62C41256.asc | sudo gpg --dearmor --yes -o /etc/apt/trusted.gpg.d/debian.griffo.io.gpg
+ echo "deb https://debian.griffo.io/apt $(lsb_release -sc 2>/dev/null) main" | sudo tee /etc/apt/sources.list.d/debian.griffo.io.list
+ sudo apt update
+ sudo apt intall ghostty
}
diff --git a/shlib/os.sh b/shlib/os.sh
index 9c3b62c..4fb7989 100644
--- a/shlib/os.sh
+++ b/shlib/os.sh
@@ -13,3 +13,12 @@ os_is_macos() {
os_is_openbsd() {
[ "$(os_print)" = "OpenBSD" ]
}
+
+os_is_linux() {
+ [ "$(os_print)" = "Linux" ]
+}
+
+os_is_linux_debian() {
+ _linux_debian_id=$(. /etc/os-release && echo $ID)
+ [ os_is_linux ] && [ "$_linux_debian_id" = "debian" ]
+}
diff --git a/wallpapers/Pictures/Wallpapers/3840x2160-dark-openbsd.png b/wallpapers/Pictures/Wallpapers/3840x2160-dark-openbsd.png
deleted file mode 100644
index f8c1c88..0000000
--- a/wallpapers/Pictures/Wallpapers/3840x2160-dark-openbsd.png
+++ /dev/null
Binary files differ
diff --git a/x/.Xresources b/x/.Xresources
deleted file mode 100644
index 1812cf5..0000000
--- a/x/.Xresources
+++ /dev/null
@@ -1,73 +0,0 @@
-xterm*termName: xterm-256color
-xterm*loginShell: true
-xterm*vt100*geometry: 90x34
-xterm*saveLines: 10000
-xterm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48
-xterm*eightBitInput: false
-xterm*allowBoldFonts: false
-
-! Desktop settings
-#ifdef SRVR_openbsd_desktop_local
-*.dpi: 196
-Xft.dpi: 196
-#endif
-
-! Laptop settings
-#ifdef SRVR_openbsd_laptop_local
-*.dpi: 96
-Xft.dpi: 96
-#endif
-
-Xft.antialias: true
-Xft.rgba: rgb
-Xft.hinting: true
-Xft.hintstyle: hintslight
-
-XTerm*vt100.translation: #override \
- Shift Ctrl <Key> C: copy-selection(CLIPBOARD) \n\
- Shift Ctrl <Key> V: insert-selection(ght theme
-
-! Font Settings
-xterm*faceName: Hack:size=12
-xterm*faceSize: 12
-xterm*renderFont: true
-
-! Tokyo Night Theme
-*foreground: #a9b1d6
-*background: #1a1b26
-*cursorColor: #a9b1d6
-
-! terminal padding color
-*borderColor: #1a1b26
-
-! black
-*color0: #1a1b26
-*color8: #4e5173
-
-! red
-*color1: #F7768E
-*color9: #F7768E
-
-! green
-*color2: #9ECE6A
-*color10: #9ECE6A
-
-! yellow
-*color3: #E0AF68
-*color11: #E0AF68
-
-! blue
-*color4: #7AA2F7
-*color12: #7AA2F7
-
-! magenta
-*color5: #9a7ecc
-*color13: #9a7ecc
-
-! cyan
-*color6: #4abaaf
-*color14: #4abaaf
-
-! white
-*color7: #acb0d0
-*color15: #acb0d0
diff --git a/x/.profile b/x/.profile
deleted file mode 100644
index 64747ae..0000000
--- a/x/.profile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $OpenBSD: dot.profile,v 1.8 2022/08/10 07:40:37 tb Exp $
-#
-# sh/ksh initialization
-
-PATH=$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin
-ENV=~/.kshrc
-export PATH HOME TERM ENV
-
-if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/ttyC0" ]; then
- startx
-fi
diff --git a/x/.xinitrc b/x/.xinitrc
deleted file mode 100644
index 0f8407d..0000000
--- a/x/.xinitrc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-set -e
-
-main() {
- export MOZ_ACCELERATED=1
- export MOZ_WEBRENDER=1
-
- xrdb -merge ~/.Xresources
- setxkbmap -option caps:ctrl_modifier
- setxkbmap -option altwin:swap_lalt_lwin
- xinput set-prop /dev/wsmouse "Device Accel Constant Deceleration" 1.0
-
- ~/.fehbg &
- start_lemonbar
- ~/.local/bin/sct-daemon &
-
- exec cwm
-}
-
-start_lemonbar() {
- _lemonbar_fontsize="10"
- _lemonbar_width="48"
- if is_laptop; then
- _lemonbar_fontsize="12"
- _lemonbar_width="24"
- fi
- ~/.config/lemonbar-xft/bar.sh |
- lemonbar-xft \
- -f "Hack:size=${_lemonbar_fontsize}" \
- -g x${_lemonbar_width} \
- -B "#1c1c1c" -F "#d0d0d0" &
-}
-
-is_laptop() {
- [ "$(hostname -s)" = "openbsd-laptop" ]
-}
-
-main
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 787447b..81184ef 100755
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -75,6 +75,11 @@ if [ -d "$HOME/.nvm" ]; then
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
fi
+if [ -d "$HOME/.config/nvm" ]; then
+ export NVM_DIR="$HOME/.config/nvm"
+ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+fi
+
if command -v fzf > /dev/null 2>&1; then
eval "$(fzf --zsh)"
fi