WIP
This commit is contained in:
Oke Hargens
parent
e6f6553a80
commit
c9f703efdf
@ -1,98 +1,209 @@
|
||||
{
|
||||
"cmake.configureOnOpen": true,
|
||||
"window.enableMenuBarMnemonics": false,
|
||||
"window.customMenuBarAltFocus": false,
|
||||
"window.titleBarStyle": "custom",
|
||||
"window.menuBarVisibility": "visible",
|
||||
"workbench.colorTheme": "papercolor-vscode-dark",
|
||||
"workbench.startupEditor": "none",
|
||||
"task.problemMatchers.neverPrompt": {
|
||||
"shell": true
|
||||
},
|
||||
"debug.onTaskErrors": "abort",
|
||||
"update.showReleaseNotes": false,
|
||||
"vscode-office.markdownType": "hyperMD",
|
||||
"todo-tree.tree.showScanModeButton": false,
|
||||
"todo-tree.general.tags": [
|
||||
"BUG",
|
||||
"HACK",
|
||||
"FIXME",
|
||||
"TODO"
|
||||
],
|
||||
"todo-tree.regex.regex": "($TAGS) *(\\([^\\)]*\\))? *:",
|
||||
"todo-tree.highlights.defaultHighlight": {
|
||||
"type": "line",
|
||||
"foreground": "blue",
|
||||
"fontWeight": "bold",
|
||||
},
|
||||
"files.trimTrailingWhitespace": true,
|
||||
"diffEditor.ignoreTrimWhitespace": false,
|
||||
"update.mode": "none",
|
||||
"C/C++ Include Guard.Macro Type": "Filepath",
|
||||
"cSpell.userWords": [
|
||||
"amax",
|
||||
"avtp",
|
||||
"BEAMER",
|
||||
"calib",
|
||||
"calibs",
|
||||
"clkd",
|
||||
"csrcs",
|
||||
"enclustra",
|
||||
"firmwares",
|
||||
"ftdi",
|
||||
"FTENC",
|
||||
"GALVO",
|
||||
"ieciidc",
|
||||
"iidc",
|
||||
"interruptible",
|
||||
"irqsave",
|
||||
"jobserver",
|
||||
"JTAG",
|
||||
"machineapi",
|
||||
"marzhauser",
|
||||
"mediats",
|
||||
"mtap",
|
||||
"Nanocard",
|
||||
"nanocardfirmware",
|
||||
"ndarray",
|
||||
"nobackendmachineapi",
|
||||
"parafocal",
|
||||
"photodiode",
|
||||
"printk",
|
||||
"proxyserver",
|
||||
"rtcp",
|
||||
"ssrc",
|
||||
"stap",
|
||||
"tangoapi",
|
||||
"tclient",
|
||||
"touchgui",
|
||||
"tscode",
|
||||
"userspace",
|
||||
"waittime",
|
||||
"xlabel",
|
||||
"ylabel"
|
||||
],
|
||||
"files.exclude": {
|
||||
"**/.history/**": true,
|
||||
"**/*.dwo": true,
|
||||
"**/*.o": true,
|
||||
"**/*.o.cmd": true,
|
||||
"**/*.o.d": true
|
||||
},
|
||||
"git.confirmSync": false,
|
||||
"editor.rulers": [
|
||||
80, 120
|
||||
],
|
||||
"C_Cpp.loggingLevel": "Information",
|
||||
"editor.tabSize": 4,
|
||||
"terminal.integrated.scrollback": 10000,
|
||||
"files.insertFinalNewline": true,
|
||||
"keyboard.dispatch": "keyCode",
|
||||
"python.analysis.typeCheckingMode": "standard",
|
||||
"python.analysis.autoImportCompletions": true,
|
||||
"ruff.configuration": "/home/oke/projects/setupdevenvqx/ruff.toml",
|
||||
"git.openRepositoryInParentFolders": "never",
|
||||
"workbench.editorAssociations": {
|
||||
"*.pickle": "default"
|
||||
}
|
||||
"python.analysis.useLibraryCodeForTypes": true,
|
||||
"python.analysis.extraPaths": [
|
||||
"../PyNvVideoCodec_2.0.2/src",
|
||||
"../acceptancetests/src",
|
||||
"../autofocusFramework/src",
|
||||
"../calibration/src",
|
||||
"../camerastream/src",
|
||||
"../common/src",
|
||||
"../contrastenhancer/src",
|
||||
"../distutils/src",
|
||||
"../enclustra-flasher/src",
|
||||
"../grayscale/src",
|
||||
"../grayscalegui",
|
||||
"../gwlcparser/src",
|
||||
"../jobserver",
|
||||
"../jobtemplates/src",
|
||||
"../lithography",
|
||||
"../machineapi/src",
|
||||
"../machineapiproxy/src",
|
||||
"../machinecomposer",
|
||||
"../measure_checker_board/src",
|
||||
"../measurement",
|
||||
"../nanocard_hdl2",
|
||||
"../nanocardapi2/src",
|
||||
"../nanocardupgrade/src",
|
||||
"../nanoprintx",
|
||||
"../nobackendmachineapi",
|
||||
"../perfectjump/src",
|
||||
"../planascripts",
|
||||
"../processlib/src",
|
||||
"../qx3dconfig/src",
|
||||
"../qx3dcore",
|
||||
"../reporting/src",
|
||||
"../scancurve/src",
|
||||
"../servicereport/src",
|
||||
"../servicereporttools/src",
|
||||
"../shared/src",
|
||||
"../shared_ui/src",
|
||||
"../stacktools",
|
||||
"../tangoapi/src",
|
||||
"../touchgui/src",
|
||||
"../versioning",
|
||||
"./PyNvVideoCodec_2.0.2/src",
|
||||
"./acceptancetests/src",
|
||||
"./autofocusFramework/src",
|
||||
"./calibration/src",
|
||||
"./camerastream/src",
|
||||
"./common/src",
|
||||
"./contrastenhancer/src",
|
||||
"./distutils/src",
|
||||
"./enclustra-flasher/src",
|
||||
"./grayscale/src",
|
||||
"./grayscalegui",
|
||||
"./gwlcparser/src",
|
||||
"./jobserver",
|
||||
"./jobtemplates/src",
|
||||
"./lithography",
|
||||
"./machineapi/src",
|
||||
"./machineapiproxy/src",
|
||||
"./machinecomposer",
|
||||
"./measure_checker_board/src",
|
||||
"./measurement",
|
||||
"./nanocard_hdl2",
|
||||
"./nanocardapi2/src",
|
||||
"./nanocardupgrade/src",
|
||||
"./nanoprintx",
|
||||
"./nobackendmachineapi",
|
||||
"./perfectjump/src",
|
||||
"./planascripts",
|
||||
"./processlib/src",
|
||||
"./qx3dconfig/src",
|
||||
"./qx3dcore",
|
||||
"./reporting/src",
|
||||
"./scancurve/src",
|
||||
"./servicereport/src",
|
||||
"./servicereporttools/src",
|
||||
"./shared/src",
|
||||
"./shared_ui/src",
|
||||
"./stacktools",
|
||||
"./tangoapi/src",
|
||||
"./touchgui/src",
|
||||
"./versioning",
|
||||
],
|
||||
"yaml.schemas": {
|
||||
"https://json.schemastore.org/gitlab-ci.json": ".gitlab-ci.yml"
|
||||
},
|
||||
"yaml.validate": true,
|
||||
"cmake.configureOnOpen": true,
|
||||
"window.enableMenuBarMnemonics": false,
|
||||
"window.customMenuBarAltFocus": false,
|
||||
"window.titleBarStyle": "custom",
|
||||
"window.menuBarVisibility": "compact",
|
||||
"// \"workbench.colorTheme\"": "papercolor-vscode-dark",
|
||||
"workbench.startupEditor": "none",
|
||||
"task.problemMatchers.neverPrompt": {
|
||||
"shell": true
|
||||
},
|
||||
"debug.onTaskErrors": "abort",
|
||||
"update.showReleaseNotes": false,
|
||||
"vscode-office.markdownType": "hyperMD",
|
||||
"todo-tree.tree.showScanModeButton": false,
|
||||
"todo-tree.general.tags": [
|
||||
"BUG",
|
||||
"HACK",
|
||||
"FIXME",
|
||||
"TODO"
|
||||
],
|
||||
"todo-tree.regex.regex": "($TAGS) *(\\([^\\)]*\\))? *:",
|
||||
"todo-tree.highlights.defaultHighlight": {
|
||||
"type": "line",
|
||||
"foreground": "blue",
|
||||
"fontWeight": "bold"
|
||||
},
|
||||
"files.trimTrailingWhitespace": true,
|
||||
"diffEditor.ignoreTrimWhitespace": false,
|
||||
"update.mode": "none",
|
||||
"C/C++ Include Guard.Macro Type": "Filepath",
|
||||
"cSpell.userWords": [
|
||||
"amax",
|
||||
"avtp",
|
||||
"BEAMER",
|
||||
"calib",
|
||||
"calibs",
|
||||
"clkd",
|
||||
"csrcs",
|
||||
"enclustra",
|
||||
"firmwares",
|
||||
"ftdi",
|
||||
"FTENC",
|
||||
"GALVO",
|
||||
"ieciidc",
|
||||
"iidc",
|
||||
"interruptible",
|
||||
"irqsave",
|
||||
"jobserver",
|
||||
"JTAG",
|
||||
"machineapi",
|
||||
"marzhauser",
|
||||
"mediats",
|
||||
"modbus",
|
||||
"mtap",
|
||||
"Nanocard",
|
||||
"nanocardfirmware",
|
||||
"ndarray",
|
||||
"nobackendmachineapi",
|
||||
"parafocal",
|
||||
"photodiode",
|
||||
"printk",
|
||||
"proxyserver",
|
||||
"rtcp",
|
||||
"ssrc",
|
||||
"stap",
|
||||
"tangoapi",
|
||||
"tclient",
|
||||
"touchgui",
|
||||
"tscode",
|
||||
"userspace",
|
||||
"wago",
|
||||
"waittime",
|
||||
"xlabel",
|
||||
"ylabel"
|
||||
],
|
||||
"files.exclude": {
|
||||
"**/.history/**": true,
|
||||
"**/*.dwo": true,
|
||||
"**/*.o": true,
|
||||
"**/*.o.cmd": true,
|
||||
"**/*.o.d": true
|
||||
},
|
||||
"git.confirmSync": false,
|
||||
"editor.rulers": [
|
||||
80,
|
||||
120
|
||||
],
|
||||
"C_Cpp.loggingLevel": "Information",
|
||||
"editor.tabSize": 4,
|
||||
"terminal.integrated.scrollback": 10000,
|
||||
"files.insertFinalNewline": true,
|
||||
"keyboard.dispatch": "keyCode",
|
||||
"python.analysis.autoImportCompletions": true,
|
||||
"ruff.configuration": "/home/oke/projects/setupdevenvqx/ruff.toml",
|
||||
"git.openRepositoryInParentFolders": "never",
|
||||
"workbench.editorAssociations": {
|
||||
"*.pickle": "default"
|
||||
},
|
||||
"python.analysis.typeCheckingMode": "standard",
|
||||
"terminal.integrated.lineHeight": 1.1,
|
||||
"python.defaultInterpreterPath": "/home/oke/projects/setupdevenvqx/venv",
|
||||
"ruff.lineLength": 120,
|
||||
"git.blame.editorDecoration.enabled": true,
|
||||
"git.blame.statusBarItem.enabled": true,
|
||||
"[dockercompose]": {
|
||||
"editor.insertSpaces": true,
|
||||
"editor.tabSize": 2,
|
||||
"editor.autoIndent": "advanced",
|
||||
"editor.defaultFormatter": "redhat.vscode-yaml"
|
||||
},
|
||||
"[github-actions-workflow]": {
|
||||
"editor.defaultFormatter": "redhat.vscode-yaml"
|
||||
},
|
||||
"git.detectSubmodules": false,
|
||||
"git.autoRepositoryDetection": false,
|
||||
"[yaml]": {
|
||||
"diffEditor.ignoreTrimWhitespace": false
|
||||
},
|
||||
"diffEditor.renderSideBySide": true,
|
||||
"diffEditor.experimental.showMoves": true
|
||||
}
|
||||
|
||||
@ -73,7 +73,7 @@ bindsym Mod4+l exec $screenlock
|
||||
bindsym $mod+d exec --no-startup-id dmenu_run
|
||||
# A more modern dmenu replacement is rofi:
|
||||
#bindsym $mod+space exec "rofi -modi windowcd,window -show windowcd"
|
||||
bindsym $mod+space exec "rofi -show combi -modes combi,drun,run,ssh -combi-modes 'window,drun,run,ssh' -show-icons"
|
||||
bindsym $mod+space exec "rofi -show combi -modes combi,drun,run,ssh -combi-modes 'drun,window,ssh,run' -show-icons"
|
||||
# There also is i3-dmenu-desktop which only displays applications shipping a
|
||||
# .desktop file. It is a wrapper around dmenu, so you need that installed.
|
||||
# bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop
|
||||
|
||||
@ -4,7 +4,7 @@ PROMPT=""
|
||||
PROMPT+="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ )"
|
||||
|
||||
if [[ "$(env | grep SSH_)" != "" || "$(env | grep SUDO_)" != "" ]]; then
|
||||
PROMPT+="%{$FG[007]%}%n@%m:"
|
||||
PROMPT+="%{$FG[008]%}%n@%m:"
|
||||
fi
|
||||
|
||||
PROMPT+='%{$fg[cyan]%}%c%{$reset_color%}$(git_prompt_info) '
|
||||
|
||||
5
.zshrc
5
.zshrc
@ -107,8 +107,13 @@ if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then exec startx; fi
|
||||
unset WAYLAND_DISPLAY
|
||||
export WAYLAND_DISPLAY
|
||||
export DONT_PROMPT_WSL_INSTALL=1
|
||||
# export LIBGL_ALWAYS_INDIRECT=1
|
||||
export DE=generic
|
||||
DISPLAY=$(ip route | awk '/^default/{print $3; exit}'):0
|
||||
PATH="$HOME/.dotfiles/scripts:${PATH}"
|
||||
export DISPLAY
|
||||
export PATH
|
||||
alias venv='source ~/projects/setupdevenvqx/venv/bin/activate'
|
||||
alias rslv='rslv() { host $1 | awk "{print \$4}" };rslv'
|
||||
venv
|
||||
alias nsh="ssh -F ~/.ssh/nconfig"
|
||||
|
||||
48
scripts/dis
48
scripts/dis
@ -1,24 +1,42 @@
|
||||
#!/usr/bin/bash
|
||||
|
||||
readarray -t monitors < <(xrandr --listmonitors | tail +2 | awk '{print $2}')
|
||||
|
||||
declare -a args=()
|
||||
for monitor in "${monitors[@]}"; do
|
||||
args+=(--delmonitor "${monitor}")
|
||||
if [[ "$monitor" =~ default~[0-9]* ]]; then
|
||||
args+=(--delmonitor "${monitor}")
|
||||
fi
|
||||
done
|
||||
|
||||
n_monitors=${1:-3}
|
||||
idx=1
|
||||
for i in "${@}"; do
|
||||
prefix=default
|
||||
if [[ "$idx" -gt 1 ]]; then
|
||||
prefix=none
|
||||
fi
|
||||
args+=(--setmonitor default~"$idx" "$i" "$prefix")
|
||||
idx=$(("$idx"+1))
|
||||
done
|
||||
|
||||
if [ $n_monitors -ge 1 ]; then
|
||||
args+=(--setmonitor default~1 1920/508x1200/317+0+0 default)
|
||||
|
||||
|
||||
#n_monitors=${1:-3}
|
||||
#if [ $n_monitors -ge 1 ]; then
|
||||
# args+=(--setmonitor default~1 2560/508x1440/317+0+0 default)
|
||||
#fi
|
||||
#
|
||||
#if [ $n_monitors -ge 2 ]; then
|
||||
# args+=(--setmonitor default~2 1920/508x1200/317+1920+0 none)
|
||||
#fi
|
||||
#
|
||||
#if [ $n_monitors -ge 3 ]; then
|
||||
# args+=(--setmonitor default~3 1920/508x1200/317+3840+0 none)
|
||||
#fi
|
||||
|
||||
|
||||
if [[ "${#args[@]}" -gt 0 ]]; then
|
||||
echo xrandr "${args[@]}"
|
||||
xrandr "${args[@]}"
|
||||
fi
|
||||
|
||||
if [ $n_monitors -ge 2 ]; then
|
||||
args+=(--setmonitor default~2 1920/508x1200/317+1920+0 none)
|
||||
fi
|
||||
|
||||
if [ $n_monitors -ge 3 ]; then
|
||||
args+=(--setmonitor default~3 1920/508x1200/317+3840+0 none)
|
||||
fi
|
||||
|
||||
echo xrandr "${args[@]}"
|
||||
xrandr "${args[@]}"
|
||||
xrandr --listmonitors
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user