diff options
| -rw-r--r-- | .config/dunst/dunstrc | 28 | ||||
| -rw-r--r-- | .config/emacs/TODO.org | 16 | ||||
| -rw-r--r-- | .config/emacs/init.el | 86 | ||||
| -rw-r--r-- | .config/hypr/binds.conf | 1 | ||||
| -rw-r--r-- | .config/swenu/conf.ini | 2 | ||||
| -rw-r--r-- | .zprofile | 2 | ||||
| -rwxr-xr-x | scripts/getprojects | 1 | ||||
| -rwxr-xr-x | scripts/startup | 1 | ||||
| -rwxr-xr-x | scripts/sysinfo | 41 |
9 files changed, 134 insertions, 44 deletions
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index eb46e1c..10cd563 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -17,7 +17,7 @@ # # If this option is set to mouse or keyboard, the monitor option # will be ignored. - follow = none + follow = mouse ### Geometry ### @@ -33,7 +33,8 @@ origin = top-right # Offset from the origin - offset = 35x35 + # offset = 20x20 + offset = 0x0 # Scale factor. It is auto-detected if value is 0. scale = 0 @@ -68,7 +69,7 @@ # The transparency of the window. Range: [0; 100]. # This option will only work if a compositing window manager is # present (e.g. xcompmgr, compiz, etc.). (X11 only) - transparency = 10 + transparency = 100 # Draw a line of "separator_height" pixel height between two # notifications. @@ -87,10 +88,11 @@ # Defines width in pixels of frame around the notification window. # Set to 0 to disable. - frame_width = 2 + frame_width = 0 # Defines color of the frame around the notification window. - frame_color = "#FFFFFF" + # frame_color = "#00cc88" + frame_color = "#191724" # Size of gap to display between notifications - requires a compositor. # If value is greater than 0, separator_height will be ignored and a border @@ -114,11 +116,11 @@ # Set to 0 to disable. # A client can set the 'transient' hint to bypass this. See the rules # section for how to disable this if necessary - idle_threshold = 120 + idle_threshold = 30 ### Text ### - font = DejaVu Sans Mono 9.7 + font = DejaVu Sans Mono 10.6 # The spacing between lines. If the height is smaller than the # font height, it will get raised to the font height. @@ -226,7 +228,7 @@ ### Misc/Advanced ### # dmenu path. - dmenu = /usr/bin/dmenu -p dunst: + dmenu = /usr/bin/swenu -p dunst: # Browser for opening urls in context menu. browser = /usr/bin/xdg-open @@ -245,7 +247,7 @@ # corners. # The radius will be automatically lowered if it exceeds half of the # notification height to avoid clipping text and/or icons. - corner_radius = 4 + corner_radius = 0 # Ignore the dbus closeNotification message. # Useful to enforce the timeout set by dunst configuration. Without this @@ -457,15 +459,15 @@ [urgency_low] # IMPORTANT: colors have to be defined in quotation marks. # Otherwise the "#" and following would be interpreted as a comment. - background = "#0D1B2A80" - foreground = "#ffffff" + background = "#191724" + foreground = "#e0def4" timeout = 10 # Icon for notifications with low urgency, uncomment to enable #icon = /path/to/icon [urgency_normal] - background = "#0D1B2A80" - foreground = "#ffffff" + background = "#191724" + foreground = "#e0def4" timeout = 10 # Icon for notifications with normal urgency, uncomment to enable #icon = /path/to/icon diff --git a/.config/emacs/TODO.org b/.config/emacs/TODO.org index 7d629ed..cb69cc7 100644 --- a/.config/emacs/TODO.org +++ b/.config/emacs/TODO.org @@ -5,18 +5,14 @@ - [x] C-g dwim for minibuffer - [x] vterm and command to open terms - [x] spacious padding -- [ ] session management -- [ ] vterm fix resizing + % - +- [x] basic session management +- [ ] fix cape completions not being active in most buffers +- [ ] dape presets and run config - [ ] switch to eglot -- [ ] agent shell -- [ ] always running under dape +- [ ] gptel -Session Management System -- [x] Session creator tool (creates emacs daemon with name and directory, and open client) -- [x] Session opener tool (opens frame from an existing session) -- [x] Misc terminal keybind -- [x] Command to open this perspective's main vterm (in the current projectile directory). Also command to push a new term +Revamp Session Management System +- [ ] switch to perject - [ ] easy session switcher (yank or replace or something), maybe save frame or placement from last session's frame - [ ] session name displayed in modeline - [ ] XDG open client which asks which session diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 3bbd6cd..e279d89 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -45,7 +45,8 @@ ;; == better meta behaviour (setq inhibit-startup-message t - vc-follow-symlinks t) + vc-follow-symlinks t + use-short-answers t) (use-package saveplace :ensure nil :config @@ -209,16 +210,36 @@ ;; :config ;; (load-theme 'dracula) ;; (set-face-attribute 'show-paren-match nil :background "dark violet" :foreground "black")) -(use-package doom-themes - :demand t - :config - (load-theme 'doom-tokyo-night)) +;; (use-package doom-themes +;; :demand t +;; :config +;; (load-theme 'doom-tokyo-night)) +;; (use-package ef-themes +;; :demand t +;; :config +;; (load-theme 'ef-bio)) +;; (use-package catppuccin-theme +;; :demand t +;; :config +;; (setq catppuccin-flavor 'mocha) +;; (load-theme 'catppuccin t)) -(use-package spacious-padding - :config - (setq spacious-padding-widths (plist-put spacious-padding-widths :internal-border-width 10)) - (setq spacious-padding-widths (plist-put spacious-padding-widths :right-divider-width 10)) - (spacious-padding-mode)) +(load-theme `modus-vivendi) + +;; (use-package spacious-padding +;; :config +;; (setq spacious-padding-widths (plist-put spacious-padding-widths :internal-border-width 10)) +;; (setq spacious-padding-widths (plist-put spacious-padding-widths :right-divider-width 10)) +;; (spacious-padding-mode)) + +(set-face-attribute 'mode-line nil + :box nil + :foreground "#9fefff" + :background "black") +(set-face-attribute 'mode-line-inactive nil + :box nil + :foreground "#5e8891" + :background "black") (use-package doom-modeline :config @@ -234,6 +255,7 @@ (use-package nerd-icons-completion :after marginalia :config + (nerd-icons-completion-mode) (add-hook 'marginalia-mode-hook #'nerd-icons-completion-marginalia-setup)) (use-package nerd-icons-corfu :after corfu @@ -264,10 +286,10 @@ ("M-DEL" . vertico-directory-delete-word))) (use-package marginalia - :after vertico - :custom - (marginalia-annotators '(marginalia-annotators-heavy marginalia-annotators-light nil)) - :config + :bind (:map minibuffer-local-map + ("M-A" . marginalia-cycle)) + + :init (marginalia-mode)) (use-package orderless @@ -280,6 +302,11 @@ :ensure nil :hook (after-init . savehist-mode)) +(use-package stillness-mode + :ensure nil + :init + (stillness-mode)) + ;; == effecient navigation ;; consult @@ -329,7 +356,9 @@ (c-mode . lsp-deferred) (typst-ts-mode . lsp-deferred) (java-mode . lsp-deferred)) - :commands lsp) + :commands lsp + :bind + (("C-c s" . lsp-signature-activate))) (use-package lsp-ui :after lsp-mode @@ -372,6 +401,12 @@ orig-result))) (advice-add 'lsp-resolve-final-command :around #'lsp-booster--advice-final-command) +;; == dumb jump +(use-package dumb-jump + :init + (add-hook 'xref-backend-functions #'dumb-jump-xref-activate) + (setq xref-show-definitions-function #'xref-show-definitions-completing-read)) + ;; == text completion (use-package corfu :bind @@ -388,7 +423,6 @@ (corfu-history-mode)) (use-package cape - :after lsp-mode :init (add-hook 'completion-at-point-functions #'cape-dabbrev) (add-hook 'completion-at-point-functions #'cape-file) @@ -467,7 +501,8 @@ (vterm-other-window)))) (with-current-buffer buf (rename-buffer master-name t))))) -(defun my/switch-to-master-vterm () + +(defun my/switch-to-master-vterm-other-window () (interactive) (let* ((master-name "Master Terminal") (master-buf (get-buffer master-name)) @@ -482,8 +517,23 @@ (with-current-buffer buf (rename-buffer master-name t))))))) +(defun my/switch-to-master-vterm () + (interactive) + (let* ((master-name "Master Terminal") + (master-buf (get-buffer master-name)) + (visible-win (and master-buf (get-buffer-window master-buf t)))) + (cond + (visible-win + (select-window visible-win)) + (master-buf + (switch-to-buffer master-buf)) + (t + (let ((buf (vterm))) + (with-current-buffer buf + (rename-buffer master-name t))))))) + (use-package vterm - :bind ( ("C-c a" . my/switch-to-master-vterm) + :bind ( ("C-c a" . my/switch-to-master-vterm-other-window) ("C-c C-a" . my/replace-master-vterm) :map vterm-mode-map ("C-c c" . vterm-copy-mode) diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index 388b2a6..8de4514 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -20,6 +20,7 @@ bind = $mainMod SHIFT, Q, exit, # app and util binds bind = $mainMod CONTROLALT SHIFT, L, exec, xdg-open https://linkedin.com +bind = $mainMod, I, exec, sysinfo bind = $mainMod, A, exec, $terminal bind = $mainMod, W, exec, $browser bind = $mainMod, E, exec, launchemacs diff --git a/.config/swenu/conf.ini b/.config/swenu/conf.ini index ad213b1..2c2e901 100644 --- a/.config/swenu/conf.ini +++ b/.config/swenu/conf.ini @@ -1,4 +1,4 @@ -fancy_scroll = on +fancy_scroll = no exit_on_focus_lost = true min_width = 500 font_size = 16 @@ -1,4 +1,4 @@ -export PATH="$HOME/dotfiles/scripts/:$PATH" +export PATH="$HOME/dotfiles/scripts/:/usr/local/lib:$HOME/path:$HOME/opt/Odin:$PATH" export EDITOR="/bin/emacs" export GHIDRA_INSTALL_DIR="/usr/local/bin/ghidraFiles" diff --git a/scripts/getprojects b/scripts/getprojects index c10f507..3f0bd31 100755 --- a/scripts/getprojects +++ b/scripts/getprojects @@ -3,4 +3,5 @@ find "$HOME/homework/" -mindepth 2 -maxdepth 2 -type d find "$HOME/development/" -mindepth 1 -maxdepth 1 -type d find "$HOME/opt/" -mindepth 1 -maxdepth 1 -type d + find "$HOME/classes/" -mindepth 1 -maxdepth 1 -type d } diff --git a/scripts/startup b/scripts/startup index a3291e4..e79419e 100755 --- a/scripts/startup +++ b/scripts/startup @@ -1,7 +1,6 @@ #!/bin/sh hyprpaper & hypridle & -waybar & pipewire & restartemacs >/dev/null & dunst diff --git a/scripts/sysinfo b/scripts/sysinfo new file mode 100755 index 0000000..1daf4c7 --- /dev/null +++ b/scripts/sysinfo @@ -0,0 +1,41 @@ +#!/bin/sh + +batperc=$(cat /sys/class/power_supply/BAT0/capacity) +batstate=$(cat /sys/class/power_supply/BAT0/status) +brightness=$(brightnessctl -m | cut -d, -f 4) + +network_info() { + device=$(ip a | grep "state UP" | awk -F': ' '{ printf($2) }') + case "${device}" in + wlan*) + network=$(iwctl station ${device} show | grep 'Connected network' \ + | awk -F' ' '{ printf($3) }') + echo "${device}: ${network}" + ;; + eth*) + echo "${device}: ${network}" + ;; + esac +} + +get_volume() { + wpctl get-volume @DEFAULT_SINK@ | awk -F' ' '{ printf "%s %s%% %s", $1, ($2 * 100), $3; }' +} + +if [ "$TERM" = "linux" ]; then + notify-send \ + "System Info:" \ + "\ +Time: $(date "+%I:%M:%S") +$(get_volume) +Brightness: ${brightness} +${batstate}: ${batperc}% +$(network_info)" +else + echo "\ +Time: $(date "+%I:%M:%S") +$(get_volume) +Brightness: ${brightness}% +${batstate}: ${batperc}% +$(network_info)" +fi |