diff options
| -rw-r--r-- | .config/autorandr/docked-new-dell/config | 41 | ||||
| -rw-r--r-- | .config/autorandr/docked-new-dell/setup | 3 | ||||
| -rw-r--r-- | .config/autorandr/new-dock/config | 33 | ||||
| -rw-r--r-- | .config/autorandr/new-dock/setup | 2 | ||||
| -rw-r--r-- | .config/autorandr/undocked-new-dell/config | 21 | ||||
| -rw-r--r-- | .config/autorandr/undocked-new-dell/setup | 1 | ||||
| -rw-r--r-- | .config/doom/config.el | 8 | ||||
| -rw-r--r-- | .config/doom/config.org | 8 | ||||
| -rw-r--r-- | .config/doom/custom.el | 26 | ||||
| -rw-r--r-- | .config/doom/init.el | 6 | ||||
| -rw-r--r-- | .config/doom/packages.el | 3 | ||||
| -rw-r--r-- | .config/fish/config.fish | 5 | ||||
| -rw-r--r-- | .config/i3/config | 23 | ||||
| -rw-r--r-- | .config/polybar/config | 8 | ||||
| -rwxr-xr-x | .config/polybar/mullvad_status.sh | 13 | ||||
| -rw-r--r-- | .gitignore | 1 |
16 files changed, 162 insertions, 40 deletions
diff --git a/.config/autorandr/docked-new-dell/config b/.config/autorandr/docked-new-dell/config new file mode 100644 index 00000000..9d6761a5 --- /dev/null +++ b/.config/autorandr/docked-new-dell/config @@ -0,0 +1,41 @@ +output eDP-1 +off +output DP-1 +off +output HDMI-1 +off +output DP-3 +off +output DP-4 +off +output DP-3-2 +off +output DP-3-1 +crtc 0 +mode 1920x1080 +pos 0x0 +primary +rate 60.00 +x-prop-audio auto +x-prop-broadcast_rgb Automatic +x-prop-max_bpc 12 +x-prop-non_desktop 0 +output DP-2 +crtc 2 +mode 1920x1080 +pos 1920x0 +rate 60.00 +x-prop-audio auto +x-prop-broadcast_rgb Automatic +x-prop-colorspace Default +x-prop-max_bpc 12 +x-prop-non_desktop 0 +output DP-3-3 +crtc 3 +mode 1280x1024 +pos 3840x0 +rate 60.02 +x-prop-audio auto +x-prop-broadcast_rgb Automatic +x-prop-max_bpc 12 +x-prop-non_desktop 0 diff --git a/.config/autorandr/docked-new-dell/setup b/.config/autorandr/docked-new-dell/setup new file mode 100644 index 00000000..e9eed15f --- /dev/null +++ b/.config/autorandr/docked-new-dell/setup @@ -0,0 +1,3 @@ +DP-2 00ffffffffffff004c2d320d36555a42171e0103803c22782a5295a556549d250e5054bb8c00b30081c0810081809500a9c001010101023a801871382d40582c450056502100001e000000fd0032481e5111000a202020202020000000fc00433237463339300a2020202020000000ff0048345a4e3630303030340a202001e002031af14690041f131203230907078301000066030c00100080011d00bc52d01e20b828554056502100001e8c0ad090204031200c4055005650210000188c0ad08a20e02d10103e9600565021000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000061 +DP-3-1 00ffffffffffff004c2d320d36555a42171e0103803c22782a5295a556549d250e5054bb8c00b30081c0810081809500a9c001010101023a801871382d40582c450056502100001e000000fd0032481e5111000a202020202020000000fc00433237463339300a2020202020000000ff0048345a4e3630303032360a202001dc02031af14690041f131203230907078301000066030c00100080011d00bc52d01e20b828554056502100001e8c0ad090204031200c4055005650210000188c0ad08a20e02d10103e9600565021000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000061 +DP-3-3 00ffffffffffff004293a506010101012610010308221b96ea6e06a1544c9926194f54bfef0081800101010101010101010101010101302a009851002a4030701300510e1100001ec31e00204100203010601300510e11000000000000fd003c4b1e500e000a202020202020000000ff00463557593639313030333430550043 diff --git a/.config/autorandr/new-dock/config b/.config/autorandr/new-dock/config new file mode 100644 index 00000000..18d6bdba --- /dev/null +++ b/.config/autorandr/new-dock/config @@ -0,0 +1,33 @@ +output eDP-1 +off +output DP-1 +off +output HDMI-1 +off +output DP-2 +off +output DP-3 +off +output DP-4 +off +output DP-2-2 +off +output DP-2-3 +crtc 0 +mode 1920x1080 +pos 0x0 +primary +rate 60.00 +x-prop-audio auto +x-prop-broadcast_rgb Automatic +x-prop-max_bpc 12 +x-prop-non_desktop 0 +output DP-2-1 +crtc 2 +mode 1920x1080 +pos 1920x0 +rate 60.00 +x-prop-audio auto +x-prop-broadcast_rgb Automatic +x-prop-max_bpc 12 +x-prop-non_desktop 0 diff --git a/.config/autorandr/new-dock/setup b/.config/autorandr/new-dock/setup new file mode 100644 index 00000000..d747cb96 --- /dev/null +++ b/.config/autorandr/new-dock/setup @@ -0,0 +1,2 @@ +DP-2-1 00ffffffffffff004c2d320d36555a42171e0103803c22782a5295a556549d250e5054bb8c00b30081c0810081809500a9c001010101023a801871382d40582c450056502100001e000000fd0032481e5111000a202020202020000000fc00433237463339300a2020202020000000ff0048345a4e3630303030340a202001e002031af14600041f131203230907078301000066030c00100080011d00bc52d01e20b828554056502100001e8c0ad090204031200c4055005650210000188c0ad08a20e02d10103e96005650210000180000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f1 +DP-2-3 00ffffffffffff004c2d320d36555a42171e0103803c22782a5295a556549d250e5054bb8c00b30081c0810081809500a9c001010101023a801871382d40582c450056502100001e000000fd0032481e5111000a202020202020000000fc00433237463339300a2020202020000000ff0048345a4e3630303032360a202001dc02031af14600041f131203230907078301000066030c00100080011d00bc52d01e20b828554056502100001e8c0ad090204031200c4055005650210000188c0ad08a20e02d10103e96005650210000180000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f1 diff --git a/.config/autorandr/undocked-new-dell/config b/.config/autorandr/undocked-new-dell/config new file mode 100644 index 00000000..bda0d30a --- /dev/null +++ b/.config/autorandr/undocked-new-dell/config @@ -0,0 +1,21 @@ +output DP-1 +off +output HDMI-1 +off +output DP-2 +off +output DP-3 +off +output DP-4 +off +output eDP-1 +crtc 0 +mode 1920x1200 +pos 0x0 +primary +rate 59.95 +x-prop-broadcast_rgb Automatic +x-prop-colorspace Default +x-prop-max_bpc 12 +x-prop-non_desktop 0 +x-prop-scaling_mode Full aspect diff --git a/.config/autorandr/undocked-new-dell/setup b/.config/autorandr/undocked-new-dell/setup new file mode 100644 index 00000000..06b2bf31 --- /dev/null +++ b/.config/autorandr/undocked-new-dell/setup @@ -0,0 +1 @@ +eDP-1 00ffffffffffff004d101515000000000d1f0104a52215780ede50a3544c99260f505400000001010101010101010101010101010101283c80a070b023403020360050d210000018203080a070b023403020360050d210000018000000fe00445737584e814c513135364e31000000000002410332001200000a010a202000d1 diff --git a/.config/doom/config.el b/.config/doom/config.el index ecd058a6..11eb6571 100644 --- a/.config/doom/config.el +++ b/.config/doom/config.el @@ -79,7 +79,7 @@ ("j" "Journal entry") ("jP" "Journal entry private" entry (file+olp+datetree "~/org/journal-private.org") "** %U - %^{Heading}") ("jX" "Journal entry X-Team" entry (file+olp+datetree "~/org/journal-xteam.org") "** %U - %^{Heading}") - ("jX" "Journal entry Lazer" entry (file+olp+datetree "~/org/journal-lazer.org") "** %U - %^{Heading}") + ("jL" "Journal entry Lazer" entry (file+olp+datetree "~/org/journal-lazer.org") "** %U - %^{Heading}") ))) ;; Custom agenda views (setq org-agenda-custom-commands @@ -256,12 +256,12 @@ text and copying to the killring." (setq lsp-headerline-breadcrumb-enable t) (setq lsp-headerline-breadcrumb-icons-enable t)) -(require 'auto-virtualenv) +;; (require 'auto-virtualenv) (after! python :init - (add-hook 'python-mode-hook 'auto-virtualenv-set-virtualenv) (add-hook 'python-mode-hook #'poetry-tracking-mode) - (setq enable-local-variables :all)) + (setq enable-local-variables :all) + (setq poetry-tracking-strategy 'projectile)) (after! groovy-mode (define-key groovy-mode-map (kbd "<f4>") 'my/jenkins-verify)) diff --git a/.config/doom/config.org b/.config/doom/config.org index 032bc804..bef6bce4 100644 --- a/.config/doom/config.org +++ b/.config/doom/config.org @@ -147,7 +147,7 @@ TODO: Breakup later ("j" "Journal entry") ("jP" "Journal entry private" entry (file+olp+datetree "~/org/journal-private.org") "** %U - %^{Heading}") ("jX" "Journal entry X-Team" entry (file+olp+datetree "~/org/journal-xteam.org") "** %U - %^{Heading}") - ("jX" "Journal entry Lazer" entry (file+olp+datetree "~/org/journal-lazer.org") "** %U - %^{Heading}") + ("jL" "Journal entry Lazer" entry (file+olp+datetree "~/org/journal-lazer.org") "** %U - %^{Heading}") ))) ;; Custom agenda views (setq org-agenda-custom-commands @@ -343,12 +343,12 @@ text and copying to the killring." :END: #+begin_src emacs-lisp -(require 'auto-virtualenv) +;; (require 'auto-virtualenv) (after! python :init - (add-hook 'python-mode-hook 'auto-virtualenv-set-virtualenv) (add-hook 'python-mode-hook #'poetry-tracking-mode) - (setq enable-local-variables :all)) + (setq enable-local-variables :all) + (setq poetry-tracking-strategy 'projectile)) #+end_src ** Groovy :PROPERTIES: diff --git a/.config/doom/custom.el b/.config/doom/custom.el new file mode 100644 index 00000000..3c0a1382 --- /dev/null +++ b/.config/doom/custom.el @@ -0,0 +1,26 @@ +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(magit-todos-insert-after '(bottom) nil nil "Changed by setter of obsolete option `magit-todos-insert-at'") + '(safe-local-variable-values + '((lsp-pylsp-plugins-ruff-enabled . t) + (poetry-tracking-strategy . "projectile") + (poetry-tracking-mode quote projectile) + (poetry-tracking-strategy quote projectile) + (projectile-project-compilation-cmd . "npm run python:lint") + (projectile-project-run-cmd . "npm start") + (projectile-project-test-cmd . "npm run python:unit") + (lsp-pylsp-plugins-pydocstyle-enabled) + (projectile-project-run-cmd . "make up") + (python-pytest-executable . "docker-compose run --rm -e CI=True app python -m pytest") + (projectile-project-test-cmd . "make test") + (lsp-pylsp-plugins-flake8-enabled)))) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(font-lock-comment-face ((t (:slant italic)))) + '(font-lock-keyword-face ((t (:slant italic))))) diff --git a/.config/doom/init.el b/.config/doom/init.el index 6ae1f4c4..9dc03c7d 100644 --- a/.config/doom/init.el +++ b/.config/doom/init.el @@ -81,7 +81,7 @@ :checkers syntax ; tasing you for every semicolon you forget - ;;(spell +flyspell) ; tasing you for misspelling mispelling + (spell +flyspell +everywhere) ; tasing you for misspelling mispelling ;;grammar ; tasing grammar mistake every you make :tools @@ -160,7 +160,9 @@ ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;purescript ; javascript, but functional - (python +lsp) ; beautiful is better than ugly + (python + +lsp + +poetry) ; beautiful is better than ugly ;;qt ; the 'cutest' gui framework ever ;;racket ; a DSL for DSLs ;;raku ; the artist formerly known as perl6 diff --git a/.config/doom/packages.el b/.config/doom/packages.el index 14a57bc6..14e44121 100644 --- a/.config/doom/packages.el +++ b/.config/doom/packages.el @@ -49,7 +49,6 @@ ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) ;(unpin! t) -(package! auto-virtualenv) (package! org-bullets) (package! idle-highlight-mode) (package! symbol-overlay) @@ -73,4 +72,4 @@ (package! deferred) (package! ox-slack) (package! org-auto-tangle) -(package! poetry) +;; (package! poetry) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index a8cb53c5..72ad6db0 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -23,8 +23,11 @@ alias pr='ping rogs.me' alias my-ip="curl ifconfig.me" alias emacs="emacsclient -c -a 'emacs'" alias grep="rg -n --with-filename --smart-case" -alias dock="xrandr --output DP-3-1 --primary --auto --left-of DP-2 --output DP-2 --auto --output DP-3-3 --auto --right-of DP-2 --output eDP-1 --off" +alias dock="xrandr --output DP-2-3 --auto --primary --left-of DP-2-1 --output DP-2-1 --auto --output eDP-1 --off" source "$HOME/.config/fish/abbreviations.fish" +alias cpuinfo="watch -n1 'grep \"^[c]pu MHz\" /proc/cpuinfo'" +alias vpn-on="sudo protonvpn c --cc US -p UDP" +alias vpn-off="sudo protonvpn d" # tabtab source for packages # uninstall by removing these lines diff --git a/.config/i3/config b/.config/i3/config index 4c5603c4..f8ff71bb 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -36,7 +36,8 @@ exec --no-startup-id xss-lock --transfer-sleep-lock ~/.config/i3/i3lock_script.s exec --no-startup-id nm-applet # Screen resolution -exec --no-startup-id sleep 2; autorandr --change +exec_always --no-startup-id sleep 2; autorandr --change +bindsym $mod+Shift+x exec autorandr --change # Use pactl to adjust volume in PulseAudio. set $refresh_i3status killall -SIGUSR1 i3status @@ -180,11 +181,11 @@ workspace $ws5 output primary workspace $ws7 output primary workspace $ws9 output primary -workspace $ws2 output DP-2 -workspace $ws4 output DP-2 -workspace $ws6 output DP-2 -workspace $ws8 output DP-2 -workspace $ws10 output DP-2 +workspace $ws2 output DP-2-1 +workspace $ws4 output DP-2-1 +workspace $ws6 output DP-2-1 +workspace $ws8 output DP-2-1 +workspace $ws10 output DP-2-1 # reload the configuration file bindsym $mod+Shift+c reload @@ -265,6 +266,7 @@ assign [class="Sublime-music"] $ws6 assign [class="Thunar"] $ws7 assign [class="Pcmanfm"] $ws7 assign [class="KeePassXC"] $ws8 +assign [class="Bitwarden"] $ws8 assign [class="Joplin"] $ws9 assign [class="kdeconnect.app"] $ws9 @@ -285,7 +287,7 @@ exec --no-startup-id exec /usr/bin/nextcloud --background # exec_always --no-startup-id .config/conky/start.sh exec --no-startup-id exec emacsclient -c -a emacs # exec --no-startup-id exec /usr/bin/librewolf -exec --no-startup-id exec /usr/bin/firefox +exec --no-startup-id sleep 5; exec /usr/bin/firefox exec --no-startup-id sleep 5; exec $terminal exec --no-startup-id sleep 10; exec nitrogen --restore exec --no-startup-id blueman-applet @@ -294,14 +296,15 @@ exec --no-startup-id /usr/bin/unclutter exec --no-startup-id xfce4-power-manager exec --no-startup-id pamac-tray exec --no-startup-id exec /opt/Mullvad\ VPN/mullvad-gui --no-sandbox -exec --no-startup-id picom +exec_always --no-startup-id sleep 5; exec picom exec --no-startup-id /usr/lib/xfce4/notifyd/xfce4-notifyd exec_always --no-startup-id autotiling exec --no-startup-id xinput set-prop 14 345 1 -exec --no-startup-id exec /usr/bin/keepassxc +exec --no-startup-id exec /usr/bin/bitwarden-desktop +# exec --no-startup-id exec /usr/bin/keepassxc exec --no-startup-id exec /usr/bin/play-with-mpv exec --no-startup-id exec "~/.config/i3/connect-speakers.sh" -exec --no-startup-id exec /usr/bin/kdeconnect-app +exec --no-startup-id sleep 5; exec /usr/bin/kdeconnect-app exec dbus-update-activation-environment --systemd DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY & # Random scripts diff --git a/.config/polybar/config b/.config/polybar/config index 20b633c4..e05f08bc 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -35,7 +35,7 @@ font-4 = FontAwesome:size=10;0 font-5 = Noto Color Emoji:scale=12;0 modules-left = i3 music modules-center = xwindow -modules-right = pulseaudio xkeyboard cpu memory wireless-network mullvad-status battery clock +modules-right = pulseaudio xkeyboard cpu memory wireless-network protonvpn-status battery clock [module/i3] @@ -136,10 +136,10 @@ interval = 1 label = %output% exec = ~/.config/polybar/music -[module/mullvad-status] +[module/protonvpn-status] type = custom/script -exec = /home/roger/.config/polybar/mullvad_status.sh -interval = 1 +exec = /home/roger/.config/polybar/protonvpn_status.sh +interval = 5 [module/cpu-temperature] type = internal/temperature diff --git a/.config/polybar/mullvad_status.sh b/.config/polybar/mullvad_status.sh deleted file mode 100755 index fbca326c..00000000 --- a/.config/polybar/mullvad_status.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -euo pipefail -IFS=$'\n\t' - -MULLVAD_STATUS=$(mullvad status) - -if echo $MULLVAD_STATUS | grep -q 'Connected'; then - echo "%{u#75d85a}VPN %{T5}✅%{T-}" - elif echo $MULLVAD_STATUS | grep -q 'Connecting'; then - echo "VPN ..." - else - echo "%{u#f90000}VPN %{T5}🚫%{T-}" -fi @@ -5,3 +5,4 @@ tmp/ .config/vifm/vifminfo +.config/doom/custom-packages/private.el |