From 75affa071ded04e3da51f0ae999d16991c1ad72e Mon Sep 17 00:00:00 2001 From: Phil Bajsicki Date: Sat, 22 Jul 2023 23:09:34 +0200 Subject: [PATCH] Updated config 2023-07-22 --- .config/alacritty/alacritty.yml | 360 +------------------------------ .config/doom/config.el | 73 +++---- .config/doom/custom.el | 3 +- .config/xmonad/xmonad.hs | 2 +- .runhyprland.sh | 2 +- .screenlayout/3-laptop-center.sh | 7 +- 6 files changed, 49 insertions(+), 398 deletions(-) diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 265f395..4b49fb3 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -214,365 +214,9 @@ font: # If `true`, bold text is drawn using the bright color variants. draw_bold_text_with_bright_colors: true -####################################### -## START OF COLOR SCHEMES ## -####################################### -schemes: - ### Doom One ### - DoomOne: &DoomOne - primary: - background: '#282c34' - foreground: '#bbc2cf' - cursor: - text: CellBackground - cursor: '#528bff' - selection: - text: CellForeground - background: '#3e4451' - normal: - black: '#1c1f24' - red: '#ff6c6b' - green: '#98be65' - yellow: '#da8548' - blue: '#51afef' - magenta: '#c678dd' - cyan: '#5699af' - white: '#202328' - bright: - black: '#5b6268' - red: '#da8548' - green: '#4db5bd' - yellow: '#ecbe7b' - blue: '#3071db' # This is 2257a0 in Doom Emacs but I lightened it. - magenta: '#a9a1e1' - cyan: '#46d9ff' - white: '#dfdfdf' - ### Dracula ### - Dracula: &Dracula - primary: - background: '#282a36' - foreground: '#f8f8f2' - cursor: - text: CellBackground - cursor: CellForeground - vi_mode_cursor: - text: CellBackground - cursor: CellForeground - search: - matches: - foreground: '#44475a' - background: '#50fa7b' - focused_match: - foreground: '#44475a' - background: '#ffb86c' - bar: - background: '#282a36' - foreground: '#f8f8f2' - line_indicator: - foreground: None - background: None - selection: - text: CellForeground - background: '#44475a' - normal: - black: '#000000' - red: '#ff5555' - green: '#50fa7b' - yellow: '#f1fa8c' - blue: '#bd93f9' - magenta: '#ff79c6' - cyan: '#8be9fd' - white: '#bfbfbf' - bright: - black: '#4d4d4d' - red: '#ff6e67' - green: '#5af78e' - yellow: '#f4f99d' - blue: '#caa9fa' - magenta: '#ff92d0' - cyan: '#9aedfe' - white: '#e6e6e6' - dim: - black: '#14151b' - red: '#ff2222' - green: '#1ef956' - yellow: '#ebf85b' - blue: '#4d5b86' - magenta: '#ff46b0' - cyan: '#59dffc' - white: '#e6e6d1' - - ### Gruvbox dark ### - GruvboxDark: &GruvboxDark - # Default colors - primary: - # hard contrast: background = '0x1d2021' - background: '#282828' - # soft contrast: background = '0x32302f' - foreground: '#ebdbb2' - - # Normal colors - normal: - black: '#282828' - red: '#cc241d' - green: '#98971a' - yellow: '#d79921' - blue: '#458588' - magenta: '#b16286' - cyan: '#689d6a' - white: '#a89984' - - # Bright colors - bright: - black: '#928374' - red: '#fb4934' - green: '#b8bb26' - yellow: '#fabd2f' - blue: '#83a598' - magenta: '#d3869b' - cyan: '#8ec07c' - white: '#ebdbb2' - -### Monokai ### - MonokaiPro: &MonokaiPro - # Default colors - primary: - background: '#2D2A2E' - foreground: '#FCFCFA' - - # Normal colors - normal: - black: '#403E41' - red: '#FF6188' - green: '#A9DC76' - yellow: '#FFD866' - blue: '#FC9867' - magenta: '#AB9DF2' - cyan: '#78DCE8' - white: '#FCFCFA' - - # Bright colors - bright: - black: '#727072' - red: '#FF6188' - green: '#A9DC76' - yellow: '#FFD866' - blue: '#FC9867' - magenta: '#AB9DF2' - cyan: '#78DCE8' - white: '#FCFCFA' - - ### Nord ### - Nord: &Nord - # Default colors - primary: - background: '#2E3440' - foreground: '#D8DEE9' - - # Normal colors - normal: - black: '#3B4252' - red: '#BF616A' - green: '#A3BE8C' - yellow: '#EBCB8B' - blue: '#81A1C1' - magenta: '#B48EAD' - cyan: '#88C0D0' - white: '#E5E9F0' - - # Bright colors - bright: - black: '#4C566A' - red: '#BF616A' - green: '#A3BE8C' - yellow: '#EBCB8B' - blue: '#81A1C1' - magenta: '#B48EAD' - cyan: '#8FBCBB' - white: '#ECEFF4' - - ### Oceanic Next ### - OceanicNext: &OceanicNext - # Default colors - primary: - background: '#1b2b34' - foreground: '#d8dee9' - - # Colors the cursor will use if `custom_cursor_colors` is true - cursor: - text: '#1b2b34' - cursor: '#ffffff' - - # Normal colors - normal: - black: '#343d46' - red: '#EC5f67' - green: '#99C794' - yellow: '#FAC863' - blue: '#6699cc' - magenta: '#c594c5' - cyan: '#5fb3b3' - white: '#d8dee9' - - # Bright colors - bright: - black: '#343d46' - red: '#EC5f67' - green: '#99C794' - yellow: '#FAC863' - blue: '#6699cc' - magenta: '#c594c5' - cyan: '#5fb3b3' - white: '#d8dee9' - - ### Palenight ### - Palenight: &Palenight - # Default colors - primary: - background: '#292d3e' - foreground: '#d0d0d0' - - # Normal colors - normal: - black: '#292d3e' - red: '#f07178' - green: '#c3e88d' - yellow: '#ffcb6b' - blue: '#82aaff' - magenta: '#c792ea' - cyan: '#89ddff' - white: '#d0d0d0' - - # Bright colors - bright: - black: '#434758' - red: '#ff8b92' - green: '#ddffa7' - yellow: '#ffe585' - blue: '#9cc4ff' - magenta: '#e1acff' - cyan: '#a3f7ff' - white: '#ffffff' - - ### Solarized Dark ### - SolarizedDark: &SolarizedDark - # Default colors - primary: - background: '#002b36' # base03 - foreground: '#839496' # base0 - - # Cursor colors - cursor: - text: '#002b36' # base03 - cursor: '#839496' # base0 - - # Normal colors - normal: - black: '#073642' # base02 - red: '#dc322f' # red - green: '#859900' # green - yellow: '#b58900' # yellow - blue: '#268bd2' # blue - magenta: '#d33682' # magenta - cyan: '#2aa198' # cyan - white: '#eee8d5' # base2 - - # Bright colors - bright: - black: '#002b36' # base03 - red: '#cb4b16' # orange - green: '#586e75' # base01 - yellow: '#657b83' # base00 - blue: '#839496' # base0 - magenta: '#6c71c4' # violet - cyan: '#93a1a1' # base1 - white: '#fdf6e3' # base3 - - ### Solarized Light ### - SolarizedLight: &SolarizedLight - # Default colors - primary: - background: '#fdf6e3' # base3 - foreground: '#657b83' # base00 - - # Cursor colors - cursor: - text: '#fdf6e3' # base3 - cursor: '#657b83' # base00 - - # Normal colors - normal: - black: '#073642' # base02 - red: '#dc322f' # red - green: '#859900' # green - yellow: '#b58900' # yellow - blue: '#268bd2' # blue - magenta: '#d33682' # magenta - cyan: '#2aa198' # cyan - white: '#eee8d5' # base2 - - # Bright colors - bright: - black: '#002b36' # base03 - red: '#cb4b16' # orange - green: '#586e75' # base01 - yellow: '#657b83' # base00 - blue: '#839496' # base0 - magenta: '#6c71c4' # violet - cyan: '#93a1a1' # base1 - white: '#fdf6e3' # base3 - - ### Tomorrow Night ### - TomorrowNight: &TomorrowNight - # Default colors - primary: - background: '#1d1f21' - foreground: '#c5c8c6' - - # Colors the cursor will use if `custom_cursor_colors` is true - cursor: - text: '#1d1f21' - cursor: '#ffffff' - - # Normal colors - normal: - black: '#1d1f21' - red: '#cc6666' - green: '#b5bd68' - yellow: '#e6c547' - blue: '#81a2be' - magenta: '#b294bb' - cyan: '#70c0ba' - white: '#373b41' - - # Bright colors - bright: - black: '#666666' - red: '#ff3334' - green: '#9ec400' - yellow: '#f0c674' - blue: '#81a2be' - magenta: '#b77ee0' - cyan: '#54ced6' - white: '#282a2e' - -###################################################################### -## SET THEME: Choose ONE color scheme from those in the above list. ## -## ################################################################### -# Available themes are: -# *DoomOne -# *Dracula -# *GruvboxDark -# *MonokaiPro -# *Nord -# *OceanicNext -# *Palenight -# *SolarizedLight -# *SolarizedDark -# *TomorrowNight - -colors: *TomorrowNight +import: +- ~/.config/alacritty/themes/themes/tomorrow_night.yaml ####################################### ## END OF COLOR SCHEMES ## diff --git a/.config/doom/config.el b/.config/doom/config.el index d02ac8d..d3f4de3 100644 --- a/.config/doom/config.el +++ b/.config/doom/config.el @@ -82,7 +82,8 @@ org-agenda-include-diary "~/enc/org/phil-diary.org" org-agenda-insert-diary-extract-time t org-log-into-drawer t - org-clock-into-drawer t) + org-clock-into-drawer t + org-agenda-log-mode-items '(closed clock state)) (setq org-agenda-files '("~/enc/org/")) @@ -205,7 +206,7 @@ :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n") :unnarrowed t))) -(org-roam-setup) +(org-roam-db-autosync-enable) (setq org-contacts-files @@ -229,47 +230,47 @@ (after! counsel (setq counsel-outline-display-style 'title)) -(after! org-id - ;; Do not create ID if a CUSTOM_ID exists - (setq org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id)) +;; (after! org-id +;; ;; Do not create ID if a CUSTOM_ID exists +;; (setq org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id)) -(defun zz/make-id-for-title (title) - "Return an ID based on TITLE." - (let* ((new-id (replace-regexp-in-string "[^[:alnum:]]" "-" (downcase title)))) - new-id)) +;; (defun zz/make-id-for-title (title) +;; "Return an ID based on TITLE." +;; (let* ((new-id (replace-regexp-in-string "[^[:alnum:]]" "-" (downcase title)))) +;; new-id)) -(defun zz/org-custom-id-create () - "Create and store CUSTOM_ID for current heading." - (let* ((title (or (nth 4 (org-heading-components)) "")) - (new-id (zz/make-id-for-title title))) - (org-entry-put nil "CUSTOM_ID" new-id) - (org-id-add-location new-id (buffer-file-name (buffer-base-buffer))) - new-id)) +;; (defun zz/org-custom-id-create () +;; "Create and store CUSTOM_ID for current heading." +;; (let* ((title (or (nth 4 (org-heading-components)) "")) +;; (new-id (zz/make-id-for-title title))) +;; (org-entry-put nil "CUSTOM_ID" new-id) +;; (org-id-add-location new-id (buffer-file-name (buffer-base-buffer))) +;; new-id)) -(defun zz/org-custom-id-get-create (&optional where force) - "Get or create CUSTOM_ID for heading at WHERE. +;; (defun zz/org-custom-id-get-create (&optional where force) +;; "Get or create CUSTOM_ID for heading at WHERE. -If FORCE is t, always recreate the property." - (org-with-point-at where - (let ((old-id (org-entry-get nil "CUSTOM_ID"))) - ;; If CUSTOM_ID exists and FORCE is false, return it - (if (and (not force) old-id (stringp old-id)) - old-id - ;; otherwise, create it - (zz/org-custom-id-create))))) +;; If FORCE is t, always recreate the property." +;; (org-with-point-at where +;; (let ((old-id (org-entry-get nil "CUSTOM_ID"))) +;; ;; If CUSTOM_ID exists and FORCE is false, return it +;; (if (and (not force) old-id (stringp old-id)) +;; old-id +;; ;; otherwise, create it +;; (zz/org-custom-id-create))))) -;; Now override counsel-org-link-action -(after! counsel - (defun counsel-org-link-action (x) - "Insert a link to X. +;; ;; Now override counsel-org-link-action +;; (after! counsel +;; (defun counsel-org-link-action (x) +;; "Insert a link to X. -X is expected to be a cons of the form (title . point), as passed -by `counsel-org-link'. +;; X is expected to be a cons of the form (title . point), as passed +;; by `counsel-org-link'. -If X does not have a CUSTOM_ID, create it based on the headline -title." - (let* ((id (zz/org-custom-id-get-create (cdr x)))) - (org-insert-link nil (concat "#" id) (car x))))) +;; If X does not have a CUSTOM_ID, create it based on the headline +;; title." +;; (let* ((id (zz/org-custom-id-get-create (cdr x)))) +;; (org-insert-link nil (concat "#" id) (car x))))) ;; Whenever You Reconfigure A package, make sure to wrap your config in an diff --git a/.config/doom/custom.el b/.config/doom/custom.el index aed9b4f..34e8c90 100644 --- a/.config/doom/custom.el +++ b/.config/doom/custom.el @@ -3,7 +3,8 @@ ;; 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. - '(org-safe-remote-resources '("\\`https://bajsicki\\.com\\(?:/\\|\\'\\)"))) + '(org-safe-remote-resources + '("\\`https://lvxnox\\.com/org-html-themes/org/theme-readtheorg\\.setup\\'" "\\`https://bajsicki\\.com\\(?:/\\|\\'\\)"))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/.config/xmonad/xmonad.hs b/.config/xmonad/xmonad.hs index e7b50bc..ece806e 100644 --- a/.config/xmonad/xmonad.hs +++ b/.config/xmonad/xmonad.hs @@ -372,7 +372,7 @@ main = do -- ORG PROMPTS , ("M-c i", orgPrompt def "TODO" "~/enc/org/inbox.org") - , ("M-c c", orgPromptPrimary def "LINK" "~/enc/org/inbox.org") + , ("M-c l", orgPromptPrimary def "LINK" "~/enc/org/inbox.org") , ("M-c n", orgPrompt def "NOTE" "~/enc/org/inbox.org") , ("M-c p", orgPromptRefile def "TODO" "~/enc/org/phil.org") diff --git a/.runhyprland.sh b/.runhyprland.sh index 670a23a..1d087d1 100755 --- a/.runhyprland.sh +++ b/.runhyprland.sh @@ -11,7 +11,7 @@ export __GLX_VENDOR_LIBRARY_NAME=nvidia export XDG_SESSION_TYPE=wayland export XCURSOR_SIZE=24 -/usr/bin/Hyprland +LIBSEAT_BACKEND=logind /usr/bin/Hyprland exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK exec hash dbus-update-activation-environment 2>/dev/null && \ diff --git a/.screenlayout/3-laptop-center.sh b/.screenlayout/3-laptop-center.sh index 34517bc..90328bb 100755 --- a/.screenlayout/3-laptop-center.sh +++ b/.screenlayout/3-laptop-center.sh @@ -1,2 +1,7 @@ #!/bin/sh -xrandr --output DP-0 --off --output DP-1 --off --output DP-2 --mode 1920x1080 --rate 60 --pos 3840x0 --rotate normal --output DP-3 --off --output HDMI-0 --mode 1920x1080 --rate 60.00 --pos 0x0 --rotate normal --output DP-4 --mode 1920x1080 --rate 165 --pos 1920x0 --rotate normal +xrandr --output DP-0 --off +xrandr --output DP-1 --off +xrandr --output DP-2 --mode 1920x1080 --rate 60.00 --pos 3840x0 --rotate normal +xrandr --output DP-3 --off +xrandr --output HDMI-0 --mode 1920x1080 --rate 60.00 --pos 0x0 --rotate normal +xrandr --output DP-4 --mode 1920x1080 --rate 165 --pos 1920x0 --rotate normal