aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--git/.gitconfig1
-rw-r--r--git/.gitignore2
-rw-r--r--idasen/idasen.yaml4
-rwxr-xr-xinstall.sh62
-rw-r--r--lf/lfrc1
-rw-r--r--nvim/init.lua14
-rw-r--r--openocd/interface/stm32vslink.cfg5
-rw-r--r--openocd/target/stm32f1x.cfg12
-rw-r--r--python/requirements.pip310.txt2
-rw-r--r--python/requirements.pip311.txt2
-rw-r--r--python/requirements.pip38.txt2
-rw-r--r--python/requirements.pip39.txt2
-rwxr-xr-xqt-designer/qt-designer.desktop6
-rwxr-xr-xradio/jaska6
-rw-r--r--shell/.profile4
-rw-r--r--shell/zsh/.zshrc2
-rwxr-xr-xsublime-music/sublime-music.desktop9
-rwxr-xr-xvm/netbsd/run.sh28
-rwxr-xr-xyay/yay5
19 files changed, 85 insertions, 84 deletions
diff --git a/git/.gitconfig b/git/.gitconfig
index db80b88..77ecd9f 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -9,6 +9,7 @@
[core]
autocrlf = false
editor = nvim
+ excludesfile = ~/.dotfiles/git/.gitignore
[alias]
tree = log --graph --pretty='format:"%C(auto)%h [%ad] %an%d: %s"' --date=short
[diff]
diff --git a/git/.gitignore b/git/.gitignore
new file mode 100644
index 0000000..5846fc7
--- /dev/null
+++ b/git/.gitignore
@@ -0,0 +1,2 @@
+/.venv
+/.envrc
diff --git a/idasen/idasen.yaml b/idasen/idasen.yaml
new file mode 100644
index 0000000..c24b6a7
--- /dev/null
+++ b/idasen/idasen.yaml
@@ -0,0 +1,4 @@
+mac_address: E6:2D:44:F6:A1:51
+positions:
+ sit: 0.8391
+ stand: 1.2197
diff --git a/install.sh b/install.sh
index aa4fe02..114d921 100755
--- a/install.sh
+++ b/install.sh
@@ -6,44 +6,11 @@ symlink () {
ln -sfT "$@"
}
-install_python_venv() {
- PYTHON_CMD="$(which -a $1 2> /dev/null | grep -m 1 -v "^$(cd; pwd)" || true)"
- [ -z "$PYTHON_CMD" ] && return 0;
-
- PYTHON=$PYTHON_CMD
- PYTHON=${PYTHON%%[0-9]*}
- PYTHON=${PYTHON##*/}
- MAJOR=$($PYTHON_CMD -c "import sys; print(sys.version_info.major)")
- MINOR=$($PYTHON_CMD -c "import sys; print(sys.version_info.minor)")
- REQUIREMENTS=~/.dotfiles/python/requirements.pip$MAJOR$MINOR.txt
-
- VENV_DIR=$(cd ~/opt; pwd)/$PYTHON$MAJOR$MINOR
- VENV_PYTHON=$VENV_DIR/bin/$PYTHON
- VENV_PIP=$VENV_DIR/bin/pip
-
- BIN_DIR=$(cd ~/bin; pwd)
- BIN_PYTHON=$BIN_DIR/$PYTHON$MAJOR.$MINOR
-
- $PYTHON_CMD -m venv --system-site-packages $VENV_DIR
- if [ -f "$REQUIREMENTS" ]; then
- $VENV_PIP -q install -U -r $REQUIREMENTS
- fi
-
- echo -e "#!/bin/sh\\nexec $VENV_PYTHON \"\$@\"" > $BIN_PYTHON
- chmod +x $BIN_PYTHON
- symlink $BIN_PYTHON $BIN_DIR/$PYTHON$MAJOR
- symlink $BIN_DIR/$PYTHON$MAJOR $BIN_DIR/$PYTHON
-
- symlink $VENV_PIP $BIN_DIR/pip
- echo -e "#!/bin/sh\\nexec $VENV_PYTHON -m doit \"\$@\"" > $BIN_DIR/doit
-}
-
mkdir -p ~/bin
mkdir -p ~/opt
mkdir -p ~/repos
mkdir -p ~/.config
mkdir -p ~/.local/share/applications
-mkdir -p ~/.local/share/icons/hicolor/128x128/apps
symlink $(cd $(dirname "$0"); pwd -P) ~/.dotfiles
# alacritty
@@ -90,12 +57,18 @@ symlink ~/.dotfiles/git/.gitconfig ~/.gitconfig
# i3
symlink ~/.dotfiles/i3 ~/.config/i3
+# idasen
+symlink ~/.dotfiles/idasen ~/.config/idasen
+
# kanshi
symlink ~/.dotfiles/kanshi ~/.config/kanshi
# lein
symlink ~/.dotfiles/lein/lein ~/bin/lein
+# lf
+symlink ~/.dotfiles/lf ~/.config/lf
+
# lock
symlink ~/.dotfiles/lock/lock ~/bin/lock
symlink ~/.dotfiles/lock/lock.desktop \
@@ -110,17 +83,6 @@ symlink ~/.dotfiles/pictures ~/.pictures
# polybar
symlink ~/.dotfiles/polybar ~/.config/polybar
-# python
-install_python_venv pypy3
-install_python_venv python3.8
-install_python_venv python3.9
-install_python_venv python3.10
-install_python_venv python3.11
-
-# qt-designer
-symlink ~/.dotfiles/qt-designer/qt-designer.desktop \
- ~/.local/share/applications/qt-designer.desktop
-
# qutebrowser
mkdir -p ~/.config/qutebrowser
symlink ~/.dotfiles/qutebrowser/autoconfig.yml \
@@ -129,6 +91,7 @@ symlink ~/.dotfiles/qutebrowser/autoconfig.yml \
# radio
symlink ~/.dotfiles/radio/student ~/bin/radio-student
symlink ~/.dotfiles/radio/sljeme ~/bin/radio-sljeme
+symlink ~/.dotfiles/radio/jaska ~/bin/radio-jaska
# ranger
symlink ~/.dotfiles/ranger ~/.config/ranger
@@ -156,12 +119,6 @@ symlink ~/.dotfiles/shell/fish ~/.config/fish
symlink ~/.dotfiles/shell/zsh/.zshrc ~/.zshrc
symlink ~/.profile ~/.zprofile
-# sublime-music
-symlink ~/.dotfiles/sublime-music/sublime-music.desktop \
- ~/.local/share/applications/sublime-music.desktop
-symlink ~/.dotfiles/pictures/icons/sublime-music.png \
- ~/.local/share/icons/hicolor/128x128/apps/sublime-music.png
-
# sublime-text
mkdir -p ~/.config/sublime-text/Packages/User
for i in Adaptive.sublime-theme \
@@ -186,11 +143,13 @@ symlink ~/.dotfiles/tmux ~/.config/tmux
mkdir -p ~/vm/alpine
mkdir -p ~/vm/archlinux/armv7
mkdir -p ~/vm/debian/armv7
+mkdir -p ~/vm/netbsd
mkdir -p ~/vm/openbsd
mkdir -p ~/vm/win11
symlink ~/.dotfiles/vm/alpine/run.sh ~/vm/alpine/run.sh
symlink ~/.dotfiles/vm/archlinux/armv7/run.sh ~/vm/archlinux/armv7/run.sh
symlink ~/.dotfiles/vm/debian/armv7/run.sh ~/vm/debian/armv7/run.sh
+symlink ~/.dotfiles/vm/netbsd/run.sh ~/vm/netbsd/run.sh
symlink ~/.dotfiles/vm/openbsd/run.sh ~/vm/openbsd/run.sh
symlink ~/.dotfiles/vm/win11/run.sh ~/vm/win11/run.sh
@@ -206,6 +165,3 @@ symlink ~/.dotfiles/xorg/.xinitrc ~/.xinitrc
symlink ~/.dotfiles/xorg/.Xresources ~/.Xresources
symlink ~/.dotfiles/xorg/loadxresources ~/bin/loadxresources
symlink ~/.dotfiles/xorg/setwallpaper ~/bin/setwallpaper
-
-# yay
-symlink ~/.dotfiles/yay/yay ~/bin/yay
diff --git a/lf/lfrc b/lf/lfrc
new file mode 100644
index 0000000..7558d9e
--- /dev/null
+++ b/lf/lfrc
@@ -0,0 +1 @@
+set mouse true
diff --git a/nvim/init.lua b/nvim/init.lua
index 0de9dde..13b834a 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -308,7 +308,8 @@ require('packer').startup {
'monokai.nvim'
},
config = function()
- vim.minimap_git_colors = 1
+ vim.g.minimap_highlight_range = 1
+ vim.g.minimap_git_colors = 1
vim.keymap.set('', '<F4>', vim.cmd.MinimapToggle)
end
}
@@ -361,13 +362,22 @@ require('packer').startup {
config = function()
local cmp = require('cmp')
cmp.setup {
+ completion = {
+ autocomplete = false
+ },
snippet = {
expand = function (args)
vim.fn["vsnip#anonymous"](args.body)
end
},
mapping = cmp.mapping.preset.insert({
- ['<C-Space>'] = cmp.mapping.complete(),
+ ['<C-Space>'] = function()
+ if cmp.visible() then
+ cmp.close()
+ else
+ cmp.complete()
+ end
+ end,
['<C-e>'] = cmp.mapping.abort(),
['<CR>'] = cmp.mapping.confirm({ select = true })
}),
diff --git a/openocd/interface/stm32vslink.cfg b/openocd/interface/stm32vslink.cfg
new file mode 100644
index 0000000..bbfd901
--- /dev/null
+++ b/openocd/interface/stm32vslink.cfg
@@ -0,0 +1,5 @@
+adapter driver vsllink
+vsllink usb_vid 0x0483
+vsllink usb_pid 0xA038
+adapter speed 100
+transport select jtag
diff --git a/openocd/target/stm32f1x.cfg b/openocd/target/stm32f1x.cfg
new file mode 100644
index 0000000..6e16f9d
--- /dev/null
+++ b/openocd/target/stm32f1x.cfg
@@ -0,0 +1,12 @@
+set CHIPNAME stm32f1x
+set CPUTAPID 0x3ba00477
+
+gdb_memory_map enable
+gdb_flash_program enable
+
+jtag newtap $CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $CPUTAPID
+dap create $CHIPNAME.dap -chain-position $CHIPNAME.cpu
+
+jtag newtap $CHIPNAME bs -irlen 5
+
+target create $CHIPNAME.cpu cortex_m -endian little -dap $CHIPNAME.dap
diff --git a/python/requirements.pip310.txt b/python/requirements.pip310.txt
deleted file mode 100644
index eb2c599..0000000
--- a/python/requirements.pip310.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-doit
-pip
diff --git a/python/requirements.pip311.txt b/python/requirements.pip311.txt
deleted file mode 100644
index eb2c599..0000000
--- a/python/requirements.pip311.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-doit
-pip
diff --git a/python/requirements.pip38.txt b/python/requirements.pip38.txt
deleted file mode 100644
index eb2c599..0000000
--- a/python/requirements.pip38.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-doit
-pip
diff --git a/python/requirements.pip39.txt b/python/requirements.pip39.txt
deleted file mode 100644
index eb2c599..0000000
--- a/python/requirements.pip39.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-doit
-pip
diff --git a/qt-designer/qt-designer.desktop b/qt-designer/qt-designer.desktop
deleted file mode 100755
index 6e81c50..0000000
--- a/qt-designer/qt-designer.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Qt6 Designer
-Exec=/home/bozo/opt/python310/lib/python3.10/site-packages/PySide6/designer
-Terminal=false
-Categories=Development;
diff --git a/radio/jaska b/radio/jaska
new file mode 100755
index 0000000..11a6c77
--- /dev/null
+++ b/radio/jaska
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+URL=https://uk1.streamingpulse.com/ssl/RadioJaska
+
+# mplayer -ao pulse -quiet $URL | ts '[%Y-%m-%d %H:%M:%S]'
+exec ffmpeg -i $URL -f pulse -name ffmpeg "radio jaska"
diff --git a/shell/.profile b/shell/.profile
index 7922bbd..bffc8c1 100644
--- a/shell/.profile
+++ b/shell/.profile
@@ -24,12 +24,14 @@ export QT_QPA_PLATFORMTHEME=qt5ct
export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket
export VISUAL=nvim
-prepend_path ~/opt/python311/bin
prepend_path ~/opt/river/bin
prepend_path ~/opt/janet/bin
+prepend_path ~/opt/pkgsrc/bin
prepend_path ~/bin
export PATH
+[ -n "$(command -v luarocks)" ] && eval "$(luarocks path)"
+
# nix_profile_sh=~/.nix-profile/etc/profile.d/nix.sh
# [ -e $nix_profile_sh ] && . $nix_profile_sh
diff --git a/shell/zsh/.zshrc b/shell/zsh/.zshrc
index 83f69b7..debd4b0 100644
--- a/shell/zsh/.zshrc
+++ b/shell/zsh/.zshrc
@@ -25,6 +25,8 @@ PROMPT='[%F{green}%n%f@%m %F{green}%~%f$(__git_ps1 " (%s)")]$ '
[ -n "$(command -v broot)" ] && . ~/.dotfiles/shell/zsh/broot.zsh
+[ -n "$(command -v direnv)" ] && eval "$(direnv hook zsh)"
+
SYSTEM_PLUGINS=(/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
/usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh)
diff --git a/sublime-music/sublime-music.desktop b/sublime-music/sublime-music.desktop
deleted file mode 100755
index 75fd96b..0000000
--- a/sublime-music/sublime-music.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Sublime Music
-GenericName=Music Player
-Comment=Native Subsonic client for Linux
-Exec=sublime-music
-Icon=sublime-music
-Terminal=false
-Categories=AudioVideo;Audio;Music;
diff --git a/vm/netbsd/run.sh b/vm/netbsd/run.sh
new file mode 100755
index 0000000..d487259
--- /dev/null
+++ b/vm/netbsd/run.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname -- "$0")
+
+if [ ! -f netbsd.iso ]; then
+ curl -L -o netbsd.iso https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.3/images/NetBSD-9.3-amd64.iso
+fi
+
+if [ ! -f netbsd.qcow2 ]; then
+ qemu-img create -f qcow2 netbsd.qcow2 20G
+fi
+
+exec qemu-system-x86_64 \
+ -enable-kvm \
+ -cpu host \
+ -hda netbsd.qcow2 \
+ -cdrom netbsd.iso \
+ -m 2G \
+ -device e1000,netdev=net0 \
+ -netdev user,id=net0 \
+ -usb \
+ -device usb-tablet \
+ -display curses \
+ "$@"
+
+
diff --git a/yay/yay b/yay/yay
deleted file mode 100755
index cf31584..0000000
--- a/yay/yay
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-export PATH="/usr/bin:$PATH"
-
-exec /usr/bin/yay "$@"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2026-02-11 11:28:47 +0000