Browse Source

Bunch of changes

- shells: set GOPROXY=direct (download sources directly instead of going
through proxy.golang.org)
- emacs: deprecated EXWM
- scripts: api_keys for `imdb` is not valid anymore, and I don't want to
subscribe for another key
FollieHiyuki 5 months ago
parent
commit
383de337f4
Signed by: FollieHiyuki GPG Key ID: 813CF484F4993419
  1. 1
      home/.bashrc-bloated
  2. 17
      home/.config/X11/xinitrc
  3. 107
      home/.config/doom/config.el
  4. 345
      home/.config/doom/exwm.el
  5. 3
      home/.config/doom/packages.el
  6. 1
      home/.config/fish/conf.d/env.fish
  7. 1
      home/.config/zsh/.zshenv
  8. 6
      home/.local/bin/imdb

1
home/.bashrc-bloated

@ -47,6 +47,7 @@ export EDITOR=nvim
export SVDIR=$HOME/.local/share/service
export _JAVA_AWT_WM_NONREPARENTING=1
export GPG_TTY="$(tty)"
export GOPROXY=direct
# pfetch
export PF_INFO="ascii title kernel wm shell uptime pkgs memory"
# fzf

17
home/.config/X11/xinitrc

@ -23,25 +23,10 @@ export XDG_SESSION_TYPE=x11
export PATH=$HOME/.local/bin/X11:$PATH
# $HOME/.config/emacs-config/doom/bin/doom env
session=${1:-exwm}
session=${1:-spectrwm}
case $session in
bspwm ) exec bspwm ;;
spectrwm ) exec spectrwm -c ~/.config/spectrwm/spectrwm-nord.conf ;;
exwm )
# In case of using seatd. Flatpak apps won't work
if [ -z "${XDG_RUNTIME_DIR}" ]
then
userid=$(id -u ${USER})
export XDG_RUNTIME_DIR="$(mktemp -d /tmp/${userid}-runtime-XXXXXX)"
if [ ! -d "${XDG_RUNTIME_DIR}" ]
then
mkdir -p "${XDG_RUNTIME_DIR}"
chmod 0700 "${XDG_RUNTIME_DIR}"
fi
# Assure we use seatd
# export LIBSEAT_BACKEND=seatd
fi
exec dbus-run-session emacs -mm --debug-init -l ~/.config/doom/exwm.el > "${XDG_RUNTIME_DIR}/exwm-$(date "+%Y-%m-%d").log" 2>&1 ;;
* ) exec "$1" ;;
esac

107
home/.config/doom/config.el

@ -365,6 +365,113 @@
;; (buffer-expose-mode 1)
;; xbps but with Emacs
;;(use-package! system-packages
;; :defer t
;; :config
;; (setq system-packages-use-sudo t))
(use-package! symon
:commands symon-mode
:custom
(symon-sparkline-type 'gridded)
:config
(symon-display))
;; playerctl status on modeline
;; (use-package! doom-modeline-now-playing
;; :after doom-modeline
;; :config
;; (doom-modeline-now-playing-timer)
;; ;; Enable almost everywhere
;; (doom-modeline-def-modeline 'main
;; '(bar workspace-name window-number modals matches buffer-info remote-host buffer-position word-count parrot selection-info now-playing)
;; '(objed-state misc-info persp-name battery grip irc mu4e gnus github debug repl lsp minor-modes input-method indent-info buffer-encoding major-mode process vcs checker))
;; (doom-modeline-def-modeline 'special
;; '(bar window-number modals matches buffer-info buffer-position word-count parrot selection-info now-playing)
;; '(objed-state misc-info battery irc-buffers debug minor-modes input-method indent-info buffer-encoding major-mode process))
;; (doom-modeline-def-modeline 'project
;; '(bar window-number buffer-default-directory now-playing)
;; '(misc-info battery irc mu4e gnus github debug minor-modes input-method major-mode process))
;; (doom-modeline-def-modeline 'vcs
;; '(bar window-number modals matches buffer-info buffer-position parrot selection-info now-playing)
;; '(misc-info battery irc mu4e gnus github debug minor-modes buffer-encoding major-mode process))
;; (doom-modeline-def-modeline 'info
;; '(bar window-number buffer-info info-nodes buffer-position parrot selection-info now-playing)
;; '(misc-info buffer-encoding major-mode))
;; (doom-modeline-def-modeline 'media
;; '(bar window-number buffer-size buffer-info now-playing)
;; '(misc-info media-info major-mode process vcs))
;; (doom-modeline-def-modeline 'message
;; '(bar window-number modals matches buffer-info-simple buffer-position word-count parrot selection-info now-playing)
;; '(objed-state misc-info battery debug minor-modes input-method indent-info buffer-encoding major-mode))
;; (doom-modeline-def-modeline 'pdf
;; '(bar window-number matches buffer-info pdf-pages now-playing)
;; '(misc-info major-mode process vcs))
;; (doom-modeline-def-modeline 'org-src
;; '(bar window-number modals matches buffer-info-simple buffer-position word-count parrot selection-info now-playing)
;; '(objed-state misc-info debug lsp minor-modes input-method indent-info buffer-encoding major-mode process checker))
;; (doom-modeline-def-modeline 'timemachine
;; '(bar window-number matches git-timemachine buffer-position word-count parrot selection-info now-playing)
;; '(misc-info minor-modes indent-info buffer-encoding major-mode)))
;; EMMS
(use-package! emms
:defer t
:init
(setq emms-seek-seconds 10)
:config
(emms-playing-time -1)
(emms-mode-line -1)
;; Play music with emms directly
(setq emms-source-file-default-directory "~/Music/"
emms-info-asynchronously 1
emms-playlist-buffer-name "*EMMS-Music*"
emms-source-file-directory-tree-function 'emms-source-file-directory-tree-find
emms-browser-covers 'emms-browser-cache-thumbnail-async)
;; Use mpd backend
(setq emms-player-mpd-server-name "localhost"
emms-player-mpd-server-port "6600"
emms-player-mpd-music-directory "~/Music/")
(add-to-list 'emms-player-list 'emms-player-mpd)
(add-to-list 'emms-info-functions
'emms-info-mpd
'emms-info-exiftool)
(map! :map emms-playlist-mode-map
:localleader
"d" #'emms-insert-directory))
(use-package! ivy-emms
:after emms
:config
(setq ivy-emms-default-action #'ivy-emms-play-next)
(setq ivy-emms-default-multi-action #'ivy-emms-play-next-multi))
;;(use-package! emms-mode-line-cycle
;; :after emms
;; :config
;; (emms-playing-time 1)
;; (emms-mode-line 1)
;; (emms-mode-line-cycle 1))
;; Duck the web with ivy
(use-package! counsel-web
:after counsel
:config
(setq counsel-web-engine 'duckduckgo)
(setq counsel-web-search-action #'browse-url)
(setq counsel-web-search-alternate-action #'browse-url-firefox)
(setq counsel-web-search-dynamic-update nil)
(exwm-input-set-key (kbd "s-d") #'counsel-web-search))
;; Start pinentry
(pinentry-start)
;; System monitor in minibuffer
(symon-mode)
;; Additional status info on modeline
;;(setq display-time-day-and-date t)
(display-time-mode 1)
(if (not (equal "Battery status not available" (battery)))
(display-battery-mode 1))
;; Here are some additional functions/macros that could help you configure Doom:
;;
;; - `load!' for loading external *.el files relative to this one

345
home/.config/doom/exwm.el

@ -1,345 +0,0 @@
;;; exwm.el -*- lexical-binding: t; -*-
(defun follie/run-in-background (command)
(let ((command-parts (split-string command "[ ]+")))
(apply #'call-process `(,(car command-parts) nil 0 nil ,@(cdr command-parts)))))
(defun follie/set-wallpaper ()
"Change the current wallpaper with feh"
(interactive)
(start-process-shell-command
"feh" nil "feh --no-fehbg --bg-fill --randomize ~/Pictures/Wallpapers/*"))
(defun follie/exwm-init-hook ()
;; Make workspace 1 the default at startup
;;(exwm-workspace-switch-create 1)
;; Start pinentry
(pinentry-start)
;; System monitor in minibuffer
(symon-mode)
;; Additional status info on modeline
;;(setq display-time-day-and-date t)
(display-time-mode 1)
(if (not (equal "Battery status not available" (battery)))
(display-battery-mode 1))
;; Startup apps
(follie/run-in-background "pipewire")
(follie/run-in-background "dunst")
(follie/run-in-background "mpDris2")
(start-process-shell-command "xsetroot" nil "xsetroot -cursor_name left_ptr"))
(follie/run-in-background "greenclip daemon")
(defun follie/configure-window-by-class ()
(pcase exwm-class-name
("Komikku" (exwm-floating-toggle-floating)
(exwm-layout-hide-mode-line))))
(defun follie/update-displays ()
(follie/run-in-background "~/.local/bin/X11/monitors.sh")
(follie/set-wallpaper)
(message "Updated displays: %s"
(string-trim (shell-command-to-string "xrandr | grep \" connected\" | awk '{print $1}' | sed 's/^/ /' | tr -d '\\n'"))))
(defun follie/exwm-rename-buffer ()
(exwm-workspace-rename-buffer
(concat "[" exwm-class-name "] "
(if (<= (length exwm-title) 30) exwm-title
(concat (substring exwm-title 0 29))))))
(use-package! exwm
:config
;; Number of workspaces
(setq exwm-workspace-number 6)
;; Extra stuff at startup
(add-hook 'exwm-init-hook #'follie/exwm-init-hook)
;; Update buffer name
(add-hook 'exwm-update-class-hook #'follie/exwm-rename-buffer)
(add-hook 'exwm-update-title-hook #'follie/exwm-rename-buffer)
;; Force tiling by default
;;(setq exwm-manage-force-tiling t)
;; Window rules
(add-hook 'exwm-manage-finish-hook #'follie/configure-window-by-class)
;; Automatically move EXWM buffer to current workspace
(setq exwm-layout-show-all-buffers t)
;; Display all buffers in every workspace buffer list
(setq exwm-workspace-show-all-buffers t)
;; Multi monitor
(require 'exwm-randr)
(setq exwm-randr-workspace-monitor-plist '(1 "HDMI-1"))
(add-hook 'exwm-randr-screen-change-hook #'follie/update-displays)
(exwm-randr-enable)
;; System tray on minibuffer
(require 'exwm-systemtray)
(setq exwm-systemtray-height 20)
(exwm-systemtray-enable)
;; Automatically send cursor to the selected display
(setq exwm-workspace-warp-cursor t)
;; Focus follows cursor
(setq mouse-autoselect-window t
focus-follows-mouse t)
;; Keys that always pass through to Emacs in line-mode
(setq exwm-input-prefix-keys
'(?\C-x
?\C-u
?\C-g ;; keyboard-quit
?\C-h
?\M-x
?\M-`
?\M-&
?\M-:
?\C-\M-j)) ;; Buffer list
;; Ctrl+q to enable next key to be sent directly
(define-key exwm-mode-map [?\C-q] 'exwm-input-send-next-key)
;; Global key bindings
(setq exwm-input-global-keys
`(
;; Reset to line-mode (C-c C-k switches to char-mode via exwm-input-release-keyboard)
([?\s-r] . exwm-reset)
;; Move between windows
([s-left] . windmove-left)
([s-right] . windmove-right)
([s-up] . windmove-up)
([s-down] . windmove-down)
([?\s-h] . windmove-left)
([?\s-l] . windmove-right)
([?\s-k] . windmove-up)
([?\s-j] . windmove-down)
;; Swap window position
([s-S-left] . windmove-swap-states-left)
([s-S-right] . windmove-swap-states-right)
([s-S-up] . windmove-swap-states-up)
([s-S-down] . windmove-swap-states-down)
([?\s-H] . windmove-swap-states-left)
([?\s-L] . windmove-swap-states-right)
([?\s-K] . windmove-swap-states-up)
([?\s-J] . windmove-swap-states-down)
;; Launch applications via shell command
([?\s-&] . (lambda (command)
(interactive (list (read-shell-command "$ ")))
(start-process-shell-command command nil command)))
;; Switch workspace
([?\s-w] . exwm-workspace-switch)
([?\s-`] . (lambda () (interactive) (exwm-workspace-switch-create 0)))
;; 's-N': Switch to certain workspace with Super (Win) plus a number key (0 - 9)
,@(mapcar (lambda (i)
`(,(kbd (format "s-%d" i)) .
(lambda ()
(interactive)
(exwm-workspace-switch-create ,i))))
(number-sequence 0 9))))
;; Additional bindings for convenience
(exwm-input-set-key (kbd "s-s") '+eshell/toggle)
(exwm-input-set-key (kbd "s-v") '+vterm/here)
(exwm-input-set-key (kbd "s-SPC") 'counsel-linux-app)
(exwm-input-set-key (kbd "s-t") 'exwm-floating-toggle-floating)
(exwm-input-set-key (kbd "s-f") 'exwm-layout-toggle-fullscreen)
;; Enable EXWM
(exwm-enable)
;; Work around ido frame
(require 'exwm-config)
(exwm-config-ido)
(ido-mode nil))
;; Edit everything in X windows with Emacs
(use-package! exwm-edit
:after exwm
:config
(exwm-input-set-key (kbd "s-e") #'exwm-edit--compose))
;; xbps but with Emacs
;;(use-package! system-packages
;; :defer t
;; :config
;; (setq system-packages-use-sudo t))
(use-package! symon
:commands symon-mode
:custom
(symon-sparkline-type 'gridded)
:config
(symon-display))
;; playerctl status on modeline
;; (use-package! doom-modeline-now-playing
;; :after doom-modeline
;; :config
;; (doom-modeline-now-playing-timer)
;; ;; Enable almost everywhere
;; (doom-modeline-def-modeline 'main
;; '(bar workspace-name window-number modals matches buffer-info remote-host buffer-position word-count parrot selection-info now-playing)
;; '(objed-state misc-info persp-name battery grip irc mu4e gnus github debug repl lsp minor-modes input-method indent-info buffer-encoding major-mode process vcs checker))
;; (doom-modeline-def-modeline 'special
;; '(bar window-number modals matches buffer-info buffer-position word-count parrot selection-info now-playing)
;; '(objed-state misc-info battery irc-buffers debug minor-modes input-method indent-info buffer-encoding major-mode process))
;; (doom-modeline-def-modeline 'project
;; '(bar window-number buffer-default-directory now-playing)
;; '(misc-info battery irc mu4e gnus github debug minor-modes input-method major-mode process))
;; (doom-modeline-def-modeline 'vcs
;; '(bar window-number modals matches buffer-info buffer-position parrot selection-info now-playing)
;; '(misc-info battery irc mu4e gnus github debug minor-modes buffer-encoding major-mode process))
;; (doom-modeline-def-modeline 'info
;; '(bar window-number buffer-info info-nodes buffer-position parrot selection-info now-playing)
;; '(misc-info buffer-encoding major-mode))
;; (doom-modeline-def-modeline 'media
;; '(bar window-number buffer-size buffer-info now-playing)
;; '(misc-info media-info major-mode process vcs))
;; (doom-modeline-def-modeline 'message
;; '(bar window-number modals matches buffer-info-simple buffer-position word-count parrot selection-info now-playing)
;; '(objed-state misc-info battery debug minor-modes input-method indent-info buffer-encoding major-mode))
;; (doom-modeline-def-modeline 'pdf
;; '(bar window-number matches buffer-info pdf-pages now-playing)
;; '(misc-info major-mode process vcs))
;; (doom-modeline-def-modeline 'org-src
;; '(bar window-number modals matches buffer-info-simple buffer-position word-count parrot selection-info now-playing)
;; '(objed-state misc-info debug lsp minor-modes input-method indent-info buffer-encoding major-mode process checker))
;; (doom-modeline-def-modeline 'timemachine
;; '(bar window-number matches git-timemachine buffer-position word-count parrot selection-info now-playing)
;; '(misc-info minor-modes indent-info buffer-encoding major-mode)))
;; EMMS
(use-package! emms
:defer t
:init
(setq emms-seek-seconds 10)
:config
(emms-playing-time -1)
(emms-mode-line -1)
;; Play music with emms directly
(setq emms-source-file-default-directory "~/Music/"
emms-info-asynchronously 1
emms-playlist-buffer-name "*EMMS-Music*"
emms-source-file-directory-tree-function 'emms-source-file-directory-tree-find
emms-browser-covers 'emms-browser-cache-thumbnail-async)
;; Use mpd backend
(setq emms-player-mpd-server-name "localhost"
emms-player-mpd-server-port "6600"
emms-player-mpd-music-directory "~/Music/")
(add-to-list 'emms-player-list 'emms-player-mpd)
(add-to-list 'emms-info-functions
'emms-info-mpd
'emms-info-exiftool)
(map! :map emms-playlist-mode-map
:localleader
"d" #'emms-insert-directory))
(use-package! ivy-emms
:after emms
:config
(setq ivy-emms-default-action #'ivy-emms-play-next)
(setq ivy-emms-default-multi-action #'ivy-emms-play-next-multi))
;;(use-package! emms-mode-line-cycle
;; :after emms
;; :config
;; (emms-playing-time 1)
;; (emms-mode-line 1)
;; (emms-mode-line-cycle 1))
;; Duck the web with ivy
(use-package! counsel-web
:after counsel
:config
(setq counsel-web-engine 'duckduckgo)
(setq counsel-web-search-action #'browse-url)
(setq counsel-web-search-alternate-action #'browse-url-firefox)
(setq counsel-web-search-dynamic-update nil)
(exwm-input-set-key (kbd "s-d") #'counsel-web-search))
;; Function keys
(use-package! desktop-environment
:after exwm
:diminish desktop-environment-mode
:config
;; Give me back Super+l
(progn
(setf
(alist-get (elt (kbd "s-l") 0) desktop-environment-mode-map nil t)
nil)
(desktop-environment-mode))
(exwm-input-set-key (kbd "s-x") #'desktop-environment-lock-screen)
:custom
;; Brightness
(desktop-environment-brightness-get-command "brightnessctl")
(desktop-environment-brightness-get-regexp "\\([0-9]+%\\)")
(desktop-environment-brightness-set-command "brightnessctl set %s")
(desktop-environment-brightness-small-increment "2%+")
(desktop-environment-brightness-small-decrement "2%-")
(desktop-environment-brightness-normal-increment "5%+")
(desktop-environment-brightness-normal-decrement "5%-")
;; Volume
(desktop-environment-volume-get-command "pulsemixer --get-volume")
(desktop-environment-volume-get-regexp "\\([0-9]+ \\)")
(desktop-environment-volume-toggle-command "pulsemixer --toggle-mute")
(desktop-environment-volume-toggle-microphone-command nil)
(desktop-environment-volume-set-command "pulsemixer --change-volume %s")
(desktop-environment-volume-small-increment "+2")
(desktop-environment-volume-small-decrement "-2")
(desktop-environment-volume-normal-increment "+5")
(desktop-environment-volume-normal-decrement "-5")
;; Screenshot
(desktop-environment-screenshot-directory "~/Screenshots")
(desktop-environment-screenshot-command "scrot -m -q 100 '%Y-%m-%d-%T_$wx$h.png'")
(desktop-environment-screenshot-partial-command
"scrot -s -f -l style=solid,width=2,color=\"red\" -q 100 '%Y-%m-%d-%T_$wx$h.png'")
;; Screenlock
(desktop-environment-screenlock-command "~/.local/bin/X11/i3lock.sh"))
;; Control dunst
(defun close-desktop-notifications ()
"Close all current notifications"
(interactive)
(start-process-shell-command "dunstctl" nil "dunstctl close-all"))
(defun toggle-desktop-notifications ()
"Toggle desktop notification on/off"
(interactive)
(start-process-shell-command "dunstctl" nil "dunstctl set-paused toggle"))
;; Clipboard management
(defun greenclip--select-item (str)
"Copy selected item to clipboard"
(setq str (replace-regexp-in-string "\u00a0" "\n" str))
;; (kill-new str) ;; Add the item to Emacs kill ring as well
(condition-case nil
(cond
((fboundp 'ns-set-pasteboard)
(ns-set-pasteboard str))
((fboundp 'gui-set-selection)
(gui-set-selection 'CLIPBOARD str))
(t
(error "No clipboard support")))
(error
(with-temp-buffer
(insert str)
(if (file-executable-p "xsel")
(call-process-region (point-min) (point-max) "xsel" nil nil nil "--clipboard" "--input")
(call-process-region (point-min) (point-max) "xclip" nil nil nil "-selection clipboard" "--input"))))))
(defun ivy-greenclip ()
"Select an item from X clipboard history"
(interactive)
(let* ((history (split-string (shell-command-to-string "greenclip print") "[\r\n]+")))
(ivy-read "Clipboard item: "
history
:action (lambda (str)
(greenclip--select-item str)))))
(defun greenclip-clear-history ()
"Clear X clipboard history"
(interactive)
(start-process-shell-command "greenclip" nil "pkill greenclip && greenclip clear")
(follie/run-in-background "greenclip daemon"))

3
home/.config/doom/packages.el

@ -49,9 +49,6 @@
;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
;(unpin! t)
(package! exwm)
(package! exwm-edit)
(package! desktop-environment)
(package! ebuku)
(package! counsel-web)
(package! elpher)

1
home/.config/fish/conf.d/env.fish

@ -58,6 +58,7 @@ set -gx PAGER "less -R"
set -gx SVDIR $HOME/.local/share/service
set -gx _JAVA_AWT_WM_NONREPARENTING 1
set -gx GPG_TTY (tty)
set -gx GOPROXY direct
# pfetch
set -gx PF_INFO "ascii title kernel wm shell uptime pkgs memory"
# fzf

1
home/.config/zsh/.zshenv

@ -45,6 +45,7 @@ export EDITOR=nvim
export SVDIR=$XDG_DATA_HOME/service
export _JAVA_AWT_WM_NONREPARENTING=1
export GPG_TTY="$(tty)"
export GOPROXY=direct
# pfetch
export PF_INFO="ascii title kernel wm shell uptime pkgs memory"
# fzf

6
home/.local/bin/imdb

@ -1,6 +0,0 @@
#!/bin/sh
apiKey=946f500a
movie=$( (echo "$@" | tr " " + ) | sed 's/-d+//g' )
curl -s "http://www.omdbapi.com/?t=$movie&apikey=$apiKey" | jq .