From 511b79c285a960e84c655404afb13db0ed96772a Mon Sep 17 00:00:00 2001 From: Oke Hargens Date: Tue, 28 Jan 2025 16:02:13 +0100 Subject: [PATCH] WSL --- .config/Code/User/keybindings.json | 16 ++++++++-------- .config/Code/User/settings.json | 3 +++ .config/i3/config | 11 +++++------ .config/i3status-rust/config.toml | 8 ++++---- .xinitrc | 2 +- .zshrc | 2 ++ install_packages_arch.sh | 2 +- 7 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.config/Code/User/keybindings.json b/.config/Code/User/keybindings.json index 025302c..ab0fd59 100644 --- a/.config/Code/User/keybindings.json +++ b/.config/Code/User/keybindings.json @@ -90,29 +90,29 @@ "command": "-workbench.action.terminal.toggleTerminal" }, { - "key": "alt+[Minus]", + "key": "ctrl+shift+t", "command": "workbench.action.focusActiveEditorGroup", "when": "terminalFocus" }, { - "key": "alt+[Minus]", + "key": "ctrl+shift+t", "command": "workbench.action.terminal.toggleTerminal", "when": "!terminalFocus" }, // navigation between editors / terminals { - "key": "alt+down", + "key": "ctrl+shift+down", "command": "workbench.action.terminal.focusNext", "when": "terminalFocus && terminalProcessSupported" }, { - "key": "alt+up", + "key": "ctrl+shift+up", "command": "workbench.action.terminal.focusPrevious", "when": "terminalFocus && terminalProcessSupported" }, { - "key": "alt+up", + "key": "ctrl+shift+up", "command": "workbench.action.focusAboveGroup", "when": "!terminalFocus" }, @@ -121,7 +121,7 @@ "command": "-workbench.action.focusAboveGroup" }, { - "key": "alt+down", + "key": "ctrl+shift+down", "command": "workbench.action.focusBelowGroup", "when": "!terminalFocus" }, @@ -131,7 +131,7 @@ "when": "!terminalFocus" }, { - "key": "alt+left", + "key": "ctrl+shift+left", "command": "workbench.action.focusLeftGroup", "when": "!terminalFocus" }, @@ -141,7 +141,7 @@ "when": "!terminalFocus" }, { - "key": "alt+right", + "key": "ctrl+shift+right", "command": "workbench.action.focusRightGroup", "when": "!terminalFocus" }, diff --git a/.config/Code/User/settings.json b/.config/Code/User/settings.json index 043461d..d428272 100644 --- a/.config/Code/User/settings.json +++ b/.config/Code/User/settings.json @@ -62,4 +62,7 @@ "editor.tabSize": 4, "terminal.integrated.scrollback": 10000, "files.insertFinalNewline": true, + "keyboard.dispatch": "keyCode", + "python.analysis.typeCheckingMode": "standard", + "python.analysis.autoImportCompletions": true } diff --git a/.config/i3/config b/.config/i3/config index 412dfdf..86a7d76 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -13,7 +13,7 @@ set $terminal xterm set $mod Mod1 set $screenlock ~/.dotfiles/scripts/i3lock_oke -# fake-outputs 1920x1080+0+0,1366x768+1920+0 +fake-outputs 1920x1200+0+0,1920x1200+1920+0,1920x1200+3840+0 exec_always --no-startup-id ~/.dotfiles/scripts/mod_keys @@ -35,11 +35,10 @@ default_border pixel 1 # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the # screen before suspend. Use loginctl lock-session to lock your screen. -exec --no-startup-id xss-lock --transfer-sleep-lock -- $screenlock --nofork # NetworkManager is the most popular way to manage wireless networks on Linux, # and nm-applet is a desktop environment-independent system tray GUI for it. -exec --no-startup-id nm-applet +# exec --no-startup-id nm-applet # Use pactl to adjust volume in PulseAudio. set $refresh_i3status killall -SIGUSR1 i3status @@ -149,9 +148,9 @@ for_window [workspace=$ws9] layout stacked # for_window [class="Chromium"] move container to workspace $ws9 -exec --no-startup-id i3-msg 'workspace $ws8; exec thunderbird' -exec --no-startup-id protonmail-bridge --no-window -exec --no-startup-id nextcloud +#exec --no-startup-id i3-msg 'workspace $ws8; exec thunderbird' +#exec --no-startup-id protonmail-bridge --no-window +#exec --no-startup-id nextcloud # must be last exec --no-startup-id i3-msg 'workspace $ws1; exec "xterm -e \\"$HOME/.winfo.sh; zsh\\""' diff --git a/.config/i3status-rust/config.toml b/.config/i3status-rust/config.toml index 947c73d..85e4826 100644 --- a/.config/i3status-rust/config.toml +++ b/.config/i3status-rust/config.toml @@ -39,10 +39,10 @@ good = 50 inputs = ["Tctl"] format = " $icon $max " -[[block]] -block = "sound" -driver = "pulseaudio" -show_volume_when_muted = false +# [[block]] +# block = "sound" +# driver = "pulseaudio" +# show_volume_when_muted = false #name = "alsa_output.usb-Yamaha_Corporation_Steinberg_UR22mkII-00.analog-stereo" [[block]] diff --git a/.xinitrc b/.xinitrc index 4287a7a..9eae60c 100644 --- a/.xinitrc +++ b/.xinitrc @@ -1,7 +1,7 @@ #!/bin/sh userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap + sysresources=/etc/X11/xinit/.Xresources sysmodmap=/etc/X11/xinit/.Xmodmap diff --git a/.zshrc b/.zshrc index dde1991..d076a66 100644 --- a/.zshrc +++ b/.zshrc @@ -105,5 +105,7 @@ source $ZSH/oh-my-zsh.sh if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then exec startx; fi +export DONT_PROMPT_WSL_INSTALL=1 +export DE=generic DISPLAY=$(ip route | awk '/^default/{print $3; exit}'):0 PATH="$HOME/.dotfiles/scripts:${PATH}" diff --git a/install_packages_arch.sh b/install_packages_arch.sh index edda510..b3a7395 100755 --- a/install_packages_arch.sh +++ b/install_packages_arch.sh @@ -167,7 +167,7 @@ if ! pacman -Qqe | grep pikaur > /dev/null; then makepkg -irs fi -sudo pikaur -Sy --noedit --needed "${packages_to_install[@]}" +pikaur -Sy --noedit --needed "${packages_to_install[@]}" if [ "${CORE}" -eq 1 ]; then sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" || true