merge

2026-02-11 11:26:09 +01:00
parent 56d61d9d1b f3e676b455
commit 42d5c9750b
11 changed files with 199 additions and 14 deletions
--- a/.bashrc
+++ b/.bashrc
@@ -172,6 +172,10 @@ alias edit-vim='cd ~/.config/nvim && vim .'
 hostname=$(cat ~/hostname)
 if [[ $hostname == "arch-bepis" ]]; then
  export SSH_AUTH_SOCK=/home/wholteza/.bitwarden-ssh-agent.sock
+elif [[ $hostname == "surface-bepis" ]]; then
+  export SSH_AUTH_SOCK=/home/wholteza/.bitwarden-ssh-agent.sock
+elif [[ $hostname == "printer" ]]; then
+  export SSH_AUTH_SOCK=/home/wholteza/.bitwarden-ssh-agent.sock
 elif [[ $hostname == "bepis-laptop" ]]; then
  export PATH="$PATH:/opt/nvim-linux-x86_64/bin"
  export SSH_AUTH_SOCK=/home/wholteza/snap/bitwarden/current/.bitwarden-ssh-agent.sock
@@ -200,9 +204,10 @@ export ompPath="$HOME/.config/oh-my-posh/theme.omp.json"
 ### Start oh my posh

 eval "$(oh-my-posh init bash --config $ompPath)"
-
+eval "$(fnm env --use-on-cd --shell bash)"
 if [ -d "$HOME/.cargo/env" ]; then
 	. "$HOME/.cargo/env"
 fi


+export PATH="$HOME/.local/bin:$PATH"
--- a/.config/alacritty/alacritty.toml
+++ b/.config/alacritty/alacritty.toml
@@ -68,4 +68,4 @@ color = "#f5e0dc"
 size = 16.0

 [font.normal]
-family = "Fira Code Nerd Font"
+family = "JetBrainsMono Nerd Font"
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -2,8 +2,8 @@
 -- external requirements
 --  - use nvm and install @vue/typescript-plugin globally
 --    then ts_ls will use it for vue parsing. It is already in the arch install script.
-local nvm_bin = os.getenv 'NVM_BIN'
-local vue_typescript_plugin_path = nvm_bin .. '/../lib/node_modules/@vue/typescript-plugin'
+local home = os.getenv 'HOME'
+local vue_typescript_plugin_path =  home .. '/node_modules/@vue/typescript-plugin'

 -- "<leader>sh" to [s]earch the [h]elp documentation.

--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -8,7 +8,7 @@
  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
  "gitsigns.nvim": { "branch": "main", "commit": "f780609807eca1f783a36a8a31c30a48fbe150c5" },
  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
  "lazydev.nvim": { "branch": "main", "commit": "258d2a5ef4a3e3d6d9ba9da72c9725c53e9afcbd" },
  "mason-lspconfig.nvim": { "branch": "main", "commit": "a1067cf84b4ff81b66d2bf4d01f4cbdb5de40bd0" },
  "mason-nvim-dap.nvim": { "branch": "main", "commit": "86389a3dd687cfaa647b6f44731e492970034baa" },
@@ -24,7 +24,7 @@
  "nvim-lint": { "branch": "master", "commit": "0864f81c681e15d9bdc1156fe3a17bd07db5a3ed" },
  "nvim-lspconfig": { "branch": "master", "commit": "ef73a4f2a1ddf0439eb97b46de2aab265ddba1cd" },
  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-treesitter": { "branch": "main", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
  "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" },
  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
--- a/.config/requirements/install-arch.sh
+++ b/.config/requirements/install-arch.sh
@@ -1,15 +1,38 @@
 #!/bin/bash
 # Installs requirements for my arch setup.

+set -e
+
+sudo pacman -Suy archlinux-keyring
+sudo pacman -Suy
+
 sudo pacman -S \
  neovim \
  fd \
  tmux \
  nvm \
  telegram-desktop \
-  signal-desktop
+  signal-desktop \
+  alacritty \
+  rofi \
+  ttf-jetbrains-mono-nerd
+
+if [ ! -d /home/wholteza/repos/yay ]; then
+	cd ~
+	mkdir -p repos
+	sudo pacman -S --needed git base-devel
+	git clone https://aur.archlinux.org/yay.git
+	cd yay
+	makepkg -si
+fi

 yay -S \
-  librewolf-bin
+  librewolf-bin \
+  fnm \
+  oh-my-posh
+
+fnm install 24
+fnm use 24
+
+npm install

-npm install -g @vue/typescript-plugin
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -55,7 +55,6 @@ exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
 # exec --no-startup-id nm-applet

 # Use pactl to adjust volume in PulseAudio.
-set $refresh_i3status killall -SIGUSR1 i3status
 # bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
 # bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
 # bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
@@ -218,6 +217,7 @@ client.background        $base

 # bar
 bar {
+  swaybar_command waybar
  colors {
    background         $base
    statusline         $text
@@ -326,3 +326,6 @@ input "type:pointer" {
 exec --no-startup-id blueman-applet
 exec --no-startup-id bitwarden-desktop
 exec --no-startup-id sunshine
+
+input 1118:2478:Microsoft_Surface_045E:09AE_Keyboard xkb_layout colemak-se
+input "*" xkb_options caps:backspace
--- a/.config/yadm/bootstrap##default
+++ b/.config/yadm/bootstrap##default
--- a/.config/yadm/bootstrap##distro.arch
+++ b/.config/yadm/bootstrap##distro.arch
@@ -0,0 +1,39 @@
+#!/bin/bash
+# Installs requirements for my arch setup.
+
+set -e
+
+sudo pacman -Suy archlinux-keyring
+sudo pacman -Suy
+
+sudo pacman -S \
+  neovim \
+  fd \
+  tmux \
+  nvm \
+  telegram-desktop \
+  signal-desktop \
+  alacritty \
+  rofi \
+  ttf-jetbrains-mono-nerd \
+  less
+
+if [ ! -d /home/wholteza/repos/yay ]; then
+	cd ~
+	mkdir -p repos
+	sudo pacman -S --needed git base-devel
+	git clone https://aur.archlinux.org/yay.git
+	cd yay
+	makepkg -si
+fi
+
+yay -S \
+  librewolf-bin \
+  fnm \
+  oh-my-posh
+
+fnm install 24
+fnm use 24
+
+npm install
+
--- a/.config/yadm/bootstrap##distro.ubuntu
+++ b/.config/yadm/bootstrap##distro.ubuntu
@@ -0,0 +1,112 @@
+graphical=false
+for arg in "$@"; do
+    if [[ $arg == "--graphical" ]]; then
+        graphical=true
+        break
+    fi
+done
+
+sudo apt update
+
+sudo apt install \
+  unzip \
+  feh \
+  wget \
+  curl \
+  neofetch \
+  bashtop \
+  htop \
+  build-essential \
+  cmake \
+  pkg-config \
+  python3 \
+  wireguard \
+  -y
+
+# Dependencies for cargo
+sudo snap install rustup --classic
+rustup default stable
+rustup update
+# Oh my posh
+curl -s https://ohmyposh.dev/install.sh | bash -s
+# Node version manager
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+nvm install 22
+nvm use 22
+npm install
+# Install nvim
+curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux-x86_64.tar.gz
+sudo rm -rf /opt/nvim
+sudo rm -rf /opt/nvim-linux-x86_64
+sudo tar -C /opt -xzf nvim-linux-x86_64.tar.gz
+
+if $graphical; then
+sudo apt install \
+  i3 \
+  i3blocks \
+  i3lock \
+  suckless-tools \
+  arandr \
+  scrot \
+  gnupg2 \
+  gnupg-agent \
+  dirmngr \
+  cryptsetup \
+  scdaemon \
+  pcscd \
+  secure-delete \
+  hopenpgp-tools \
+  yubikey-personalization \
+  solaar \
+  cifs-utils \
+  rofi \
+  brightnessctl \
+  libfreetype6-dev \
+  libfontconfig1-dev \
+  libxcb-xfixes0-dev \
+  libxkbcommon-dev \
+  dunst \
+  nvme-cli \
+  -y
+
+# Remove ibus since it causes issues with my custom keyboard layout
+sudo apt remove ibus
+
+sudo systemctl enable bluetooth.service
+
+# Used for scrot
+mkdir ~/Screenshots
+
+sudo snap install caprine
+sudo snap install telegram-desktop
+sudo snap install discord
+sudo snap install firefox
+sudo snap install signal-desktop
+sudo snap install code --classic
+sudo snap install moonlight
+sudo snap install heroic
+sudo snap install freecad
+sudo snap install thunderbird
+
+
+# Cargo packages
+## Alacritty needs to be installed with cargo to get the version that supports toml configurations
+cargo install alacritty
+cargo install battop
+
+# Access to brightness devices for brightnessctl
+sudo usermod -aG video wholteza
+
+# Decrypt and move VPN wireguard key
+gpg --decrypt /home/wholteza/.config/wireguard/got58-got80.conf.gpg > /home/wholteza/.config/wireguard/got58-got80.conf && sudo mv /home/wholteza/.config/wireguard/got58-got80.conf /etc/wireguard/ovpn.conf
+
+# Xorg configs
+sudo cp /home/wholteza/.config/X11/xorg.conf.d/* /etc/X11/xorg.conf.d/
+
+
+fi
+ 
+
+source ~/.bashrc
+echo Done!
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,6 +1,5 @@
-unbind C-b
-set -g prefix C-t
-bind C-t send-prefix
+set -g prefix C-b
+bind C-b send-prefix

 set -g mouse on

--- a/package.json
+++ b/package.json
@@ -7,5 +7,9 @@
    "test": "echo \"Error: no test specified\" && exit 1"
  },
  "author": "",
-  "license": "ISC"
+  "license": "ISC",
+  "dependencies": {
+    "@vue/typescript-plugin": "^3.2.2",
+    "neovim": "^5.4.0"
+  }
 }