diff --git a/dot_zshrc b/dot_zshrc index 771e07b..4e7baf6 100644 --- a/dot_zshrc +++ b/dot_zshrc @@ -1,15 +1,4 @@ # {{{ Reminders to install useful extensions -if [[ -e /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh ]]; then - . /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh -elif [[ -e /usr/share/zsh-history-substring-search/zsh-history-substring-search.zsh ]]; then - . /usr/share/zsh-history-substring-search/zsh-history-substring-search.zsh -elif [[ -x "$(whence yay)" ]]; then - echo 'yay -S zsh-history-substring-search' -elif [[ -x "$(whence zyp)" ]]; then - echo 'zyp in zsh-history-substring-search' -else - echo "zsh-history-substring-search not found" -fi #if [[ -e /usr/share/zsh/plugins/zsh-directory-history/zsh-directory-history.zsh ]]; then #. /usr/share/zsh/plugins/zsh-directory-history/zsh-directory-history.zsh #elif [[ -x "$(whence yay)" ]]; then @@ -39,6 +28,17 @@ elif [[ -x "$(whence zyp)" ]]; then else echo "zsh-syntax-highlighting not found" fi +if [[ -e /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh ]]; then + . /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh +elif [[ -e /usr/share/zsh-history-substring-search/zsh-history-substring-search.zsh ]]; then + . /usr/share/zsh-history-substring-search/zsh-history-substring-search.zsh +elif [[ -x "$(whence yay)" ]]; then + echo 'yay -S zsh-history-substring-search' +elif [[ -x "$(whence zyp)" ]]; then + echo 'zyp in zsh-history-substring-search' +else + echo "zsh-history-substring-search not found" +fi if [[ -x "$(whence direnv)" ]]; then eval "$(direnv hook zsh)" elif [[ -x "$(whence pacman)" ]]; then @@ -145,7 +145,7 @@ export PATH=$PATH:/opt/gradle/gradle-6.9.4/bin export TERMINAL=kitty export MPD_HOST=127.0.0.1 export MPD_PORT=6969 -export EDITOR=vim +export EDITOR="emacs -nw" function reload_gtk_theme() { theme=$(gsettings get org.gnome.desktop.interface gtk-theme) @@ -209,3 +209,5 @@ eval "$(pyenv init -)" export PATH=$PATH:~/.spicetify export PATH=$PATH:/home/libkyy/.spicetify export PATH=$PATH:~/.emacs.d/bin + +export PATH=$PATH:/home/linly/.spicetify diff --git a/private_dot_config/doom/config.el b/private_dot_config/doom/config.el index 9a59035..7f853cf 100644 --- a/private_dot_config/doom/config.el +++ b/private_dot_config/doom/config.el @@ -32,7 +32,7 @@ ;; There are two ways to load a theme. Both assume the theme is installed and ;; available. You can either set `doom-theme' or manually load a theme with the ;; `load-theme' function. This is the default: -(setq doom-theme 'doom-gruvbox-light) +(setq doom-theme 'doom-gruvbox) ;; This determines the style of line numbers in effect. If set to `nil', line ;; numbers are disabled. For relative line numbers, set this to `relative'. @@ -148,17 +148,17 @@ :init ;; This is the sync on close function; it also prompts for save after syncing so ;; no late changes get lost - (defun org-caldav-sync-at-close () - (org-caldav-sync) - (save-some-buffers)) - +;; (defun org-caldav-sync-at-close () +;; (org-caldav-sync) +;; (save-some-buffers)) +;; ;; This is the delayed sync function; it waits until emacs has been idle for ;; "secs" seconds before syncing. The delay is important because the caldav-sync ;; can take five or ten seconds, which would be painful if it did that right at save. ;; This way it just waits until you've been idle for a while to avoid disturbing ;; the user. (defvar org-caldav-sync-timer nil - "Timer that `org-caldav-push-timer' used to reschedule itself, or nil.") +;; "Timer that `org-caldav-push-timer' used to reschedule itself, or nil.") (defun org-caldav-sync-with-delay (secs) (when org-caldav-sync-timer (cancel-timer org-caldav-sync-timer)) @@ -167,12 +167,12 @@ (* 1 secs) nil 'org-caldav-sync))) ;; Actual calendar configuration edit this to meet your specific needs - (setq org-caldav-url "https://nextcloud.sewelam.tech/remote.php/dav/calendars/Aly") + (setq org-caldav-url "http://132.145.236.249:48575/remote.php/dav/calendars/Aly") (setq org-caldav-calendars '( - (:calendar-id "capture-1" - :files ("~/org/todo.org") - :inbox "~/org/todo.org") +;; (:calendar-id "capture-1" +;; :files ("~/org/todo.org") +;; :inbox "~/org/todo.org") (:calendar-id "poggers" :files ("~/org/work.org") :inbox "~/org/work.org") @@ -212,27 +212,33 @@ ;; MORE TEMPLATES (after! org -(add-to-list 'org-capture-templates - '("w" "Work" entry - (file "~/org/work.org") - "* TODO %?" :empty-lines 1)) - -(add-to-list 'org-capture-templates - '("t" "Personal todo" entry - (file "~/org/todo.org") - "* TODO %?" :empty-lines 1)) -(add-to-list 'org-capture-templates - '("l" "Someday" entry - (file "~/org/someday.org") - "* TODO %?" :empty-lines 1)) -(add-to-list 'org-capture-templates - '("s" "Studies" entry - (file "~/org/studies.org") - "* TODO %?" :empty-lines 1)) -(add-to-list 'org-capture-templates - '("h" "Home" entry - (file "~/org/home.org") - "* TODO %?" :empty-lines 1)) -) + (add-to-list 'org-capture-templates + '("w" "Work" entry + (file "~/org/work.org") + "* TODO %?" :empty-lines 1)) + (add-to-list 'org-capture-templates + '("l" "Someday" entry + (file "~/org/someday.org") + "* TODO %?" :empty-lines 1)) + (add-to-list 'org-capture-templates + '("s" "Studies" entry + (file "~/org/studies.org") + "* TODO %?" :empty-lines 1)) + (add-to-list 'org-capture-templates + '("h" "Home" entry + (file "~/org/home.org") + "* TODO %?" :empty-lines 1)) + ) (setq-default cache-long-scans nil) + +;; zsh pls +(setq explicit-shell-file-name "/usr/bin/zsh") +(setq shell-file-name "zsh") +(setq explicit-zsh-args '("--login" "--interactive")) +(defun zsh-shell-mode-setup () + (setq-local comint-process-echoes t)) +(add-hook 'shell-mode-hook #'zsh-shell-mode-setup) + +(after! telega + (telega-notifications-mode 1)) diff --git a/private_dot_config/doom/packages.el b/private_dot_config/doom/packages.el index 33ae413..c5d450c 100644 --- a/private_dot_config/doom/packages.el +++ b/private_dot_config/doom/packages.el @@ -41,7 +41,7 @@ ;(package! builtin-package :pin "1a2b3c4d5e") (package! org-roam-ui) (package! chezmoi) -(package! org-caldav) +;(package! org-caldav) (package! telega) ;; Doom's packages are pinned to a specific commit and updated from release to diff --git a/private_dot_config/dunst/dunstrc b/private_dot_config/dunst/dunstrc new file mode 100644 index 0000000..1ad0ba8 --- /dev/null +++ b/private_dot_config/dunst/dunstrc @@ -0,0 +1,52 @@ +[global] + font = "Hack 10" + allow_markup = yes + format = "%s\n%b" + sort = yes + indicate_hidden = yes + alignment = center + bounce_freq = 0 + show_age_threshold = 60 + word_wrap = yes + ignore_newline = no + origin = top-center + geometry = "200x5-876+30" + transparency = 0 + idle_threshold = 120 + monitor = 0 + #follow = mouse + sticky_history = yes + line_height = 0 + separator_height = 2 + padding = 8 + horizontal_padding = 8 + separator_color = "#585858" + startup_notification = false + # https://github.com/knopwob/dunst/issues/26#issuecomment-36159395 + #icon_position = left + #icon_folders = /usr/share/icons/elementary/actions/16/ + +[frame] + width = 1 + color = "#83a598" + +[shortcuts] + close = ctrl+space + close_all = ctrl+shift+space + #history = ctrl+grave + context = ctrl+shift+period + +[urgency_low] + background = "#282828" + foreground = "#ebdbb2" + timeout = 5 + +[urgency_normal] + background = "#282828" + foreground = "#ebdbb2" + timeout = 10 + +[urgency_critical] + background = "#282828" + foreground = "#ebdbb2" + timeout = 15 diff --git a/private_dot_config/i3/autostart.conf b/private_dot_config/i3/autostart.conf index f03bb47..9592ff4 100644 --- a/private_dot_config/i3/autostart.conf +++ b/private_dot_config/i3/autostart.conf @@ -5,3 +5,5 @@ exec killall -q notify-osd exec bash ~/scripts/res.sh exec_always --no-startup-id dunst -config ~/.config/dunst/dunstrc exec --no-startup-id redshift -l $(curl -s "https://location.services.mozilla.com/v1/geolocate?key=geoclue" | jq -r '"\(.location.lat):\(.location.lng)"') +#emacs +exec --no-startup-id emacs --daemon diff --git a/private_dot_config/i3/config b/private_dot_config/i3/config index ea02c49..39a32ad 100644 --- a/private_dot_config/i3/config +++ b/private_dot_config/i3/config @@ -204,6 +204,7 @@ bindsym Escape mode "default" bindsym $mod+semicolon mode "default" } + bindsym $mod+r mode "resize" bindsym $mod+semicolon mode "switch" diff --git a/private_dot_config/i3/window_rules.conf b/private_dot_config/i3/window_rules.conf index 5c7ce0e..ce7a6e3 100644 --- a/private_dot_config/i3/window_rules.conf +++ b/private_dot_config/i3/window_rules.conf @@ -33,6 +33,7 @@ assign [class = "jetbrains-idea"] $Code assign [class = "jetbrains-studio"] $Code assign [class = "neovide"] $Code assign [class = "VSCodium"] $Code +assign [class = "Emacs"] $Code #Ircs assign [class = "discord"] $IRC @@ -55,7 +56,7 @@ assign [class = "mpv"] $Youtube #Game Launchers assign [class = "heroic"] $Steam -assign [class = "Steam"] $Steam +assign [class = "steam"] $Steam assign [class = "Lutris"] $Steam assign [class = "r2modman"] $Steam assign [class = "MultiMC"] $Steam @@ -65,7 +66,6 @@ assign [class = "PrismLauncher"] $Steam assign [class = "Albion Online Launcher"] $Steam #Notes -assign [class = "Emacs"] $Notes assign [class = "obsidian"] $Notes assign [class = "^.*libreoffice"] $Notes #assign [class = "wpsoffice"] $Notes #Gave up on WPS LOL @@ -76,7 +76,6 @@ assign [class = "csgo_linux64"] $Game assign [class = "steam_proton"] $Game assign [class = "steam_app^.*"] $Game assign [class = "^.*Minecraft"] $Game -assign [class = "^.*steam"] $Game assign [class = "^.*overwatch.exe"] $Game assign [class = "Albion-Online"] $Game assign [class = "leagueclientux.exe"] $Game @@ -131,3 +130,4 @@ for_window [title = "work" class = "kitty"] move to workspace $Code #for_window [title = "manga-cli"] move to workspace $Youtube for_window [title = "Albion Online Launcher"] move to workspace $Steam for_window [title = "Albion Online Client"] move to workspace $Game +for_window [title = ".*Telega Root*."] move to workspace $IRC diff --git a/private_dot_config/kitty/kitty.conf b/private_dot_config/kitty/kitty.conf index d3ce1f9..f14e5e1 100644 --- a/private_dot_config/kitty/kitty.conf +++ b/private_dot_config/kitty/kitty.conf @@ -1,3 +1,3 @@ include misc.conf -include themes/gruvbox_light.conf +include themes/gruvbox_dark.conf diff --git a/private_dot_config/private_mpv/empty_mpv.conf b/private_dot_config/private_mpv/empty_mpv.conf new file mode 100644 index 0000000..6b879e2 --- /dev/null +++ b/private_dot_config/private_mpv/empty_mpv.conf @@ -0,0 +1,4 @@ +ytdl-format=bestvideo[height<=?480]+bestaudio/best +fullscreen = yes +save-position-on-quit +volume=69 diff --git a/private_dot_config/private_procps/toprc b/private_dot_config/private_procps/toprc new file mode 100644 index 0000000..7c78eb2 --- /dev/null +++ b/private_dot_config/private_procps/toprc @@ -0,0 +1,16 @@ +top's Config File (Linux processes with windows) +Id:j, Mode_altscr=0, Mode_irixps=1, Delay_time=3.0, Curwin=0 +Def fieldscur=¥¨³´»½ÀÄ·º¹Å&')*+,-./012568<>?ABCFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz + winflags=195892, sortindx=18, maxtasks=0, graph_cpus=0, graph_mems=0, double_up=0, combine_cpus=0 + summclr=2, msgsclr=1, headclr=229, taskclr=229 +Job fieldscur=¥¦¹·º(³´Ä»½@<§Å)*+,-./012568>?ABCFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz + winflags=193844, sortindx=0, maxtasks=0, graph_cpus=0, graph_mems=0, double_up=0, combine_cpus=0 + summclr=6, msgsclr=6, headclr=7, taskclr=6 +Mem fieldscur=¥º»<½¾¿ÀÁMBNÃD34·Å&'()*+,-./0125689FGHIJKLOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz + winflags=193844, sortindx=21, maxtasks=0, graph_cpus=0, graph_mems=0, double_up=0, combine_cpus=0 + summclr=5, msgsclr=5, headclr=4, taskclr=5 +Usr fieldscur=¥¦§¨ª°¹·ºÄÅ)+,-./1234568;<=>?@ABCFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz + winflags=193844, sortindx=3, maxtasks=0, graph_cpus=0, graph_mems=0, double_up=0, combine_cpus=0 + summclr=3, msgsclr=3, headclr=2, taskclr=3 +Fixed_widest=0, Summ_mscale=2, Task_mscale=0, Zero_suppress=0 +