From b81df64d997376ddbadbf421d272a279ac08b77e Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Mon, 25 Apr 2022 09:31:27 -0400 Subject: Updates from siofra --- desktop/.config/rofi/config.rasi | 2 +- desktop/.xsession | 8 ++++---- emacs/.doom.d/config.el | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/desktop/.config/rofi/config.rasi b/desktop/.config/rofi/config.rasi index 0479b0d..9ca5789 100644 --- a/desktop/.config/rofi/config.rasi +++ b/desktop/.config/rofi/config.rasi @@ -1,4 +1,4 @@ configuration { font: "Noto Sans 20"; - theme: "glue_pro_blue"; } +@theme "/usr/share/rofi/themes/Paper.rasi" diff --git a/desktop/.xsession b/desktop/.xsession index 8cb1315..e22fd23 100755 --- a/desktop/.xsession +++ b/desktop/.xsession @@ -16,11 +16,11 @@ find_planck_keyboard() { export TERMINAL=urxvt xrdb -merge $HOME/.Xresources -I$HOME -if find_planck_keyboard; then - setxkbmap us -option compose:ralt -else +#if find_planck_keyboard; then +# setxkbmap us -option compose:ralt +#else setxkbmap us -variant dvorak -option compose:ralt -option caps:ctrl_modifier -fi +#fi xsetroot -solid "#2A3462" # pasystray & diff --git a/emacs/.doom.d/config.el b/emacs/.doom.d/config.el index 9c3435a..163b2c7 100644 --- a/emacs/.doom.d/config.el +++ b/emacs/.doom.d/config.el @@ -55,9 +55,9 @@ (setq doom-theme 'doom-solarized-light)) (system-specific-config - "^zot\." + "^siofra\." (setq kj/font-size 20) - (setq doom-theme 'doom-solarized-light)) + (setq doom-theme 'doom-one-light)) (setq doom-font (font-spec :family "iosevka" :size kj/font-size)) (setq doom-variable-pitch-font (font-spec :family "Noto Serif" :size kj/font-size)) -- cgit v1.2.3 From ffa57e9998f5de86b732a8c305df2096a3a0b099 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Mon, 25 Apr 2022 10:33:33 -0400 Subject: Update mouse button handling --- desktop/.xsession | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/desktop/.xsession b/desktop/.xsession index e22fd23..6cac814 100755 --- a/desktop/.xsession +++ b/desktop/.xsession @@ -29,7 +29,16 @@ xset -b dzen2 -dock -x 0 -h 24 -e 'onstart=lower' -bg '#252526' -p & conky | dzen2 -dock -geometry 800x24-950+0 -expand left -fn "WenQuanYi Micro Hei-16" -ta r -bg '#252526' -fg '#f4f4f4' & trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 100 --widthtype pixel --transparent true --height 24 --tint 0x252526 --alpha 0 & -xbindkeys +# xbindkeys + +{ + while true; do + xkbset exp 65535 && xkbset m && xmodmap -e 'keycode 87 = Pointer_Button1' + xkbset exp 65535 && xkbset m && xmodmap -e 'keycode 88 = Pointer_Button3' + xkbset exp 65535 && xkbset m && xmodmap -e 'keycode 89 = Pointer_Button2' + sleep 300 + done +} & [[ -f /etc/nixos/configuration.nix ]] || \ redshift -l 40:-70 -r -t 5500:3700 & -- cgit v1.2.3 From 7f024167db5cf53c13fa705ba383715caf94f72f Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Tue, 15 Mar 2022 09:43:28 -0400 Subject: config --- desktop/.config/rofi/Paper.rasi | 146 +++++++++++++++++++++++++++++++++++++++ desktop/.config/rofi/config.rasi | 2 +- emacs/.doom.d/config.el | 8 +++ 3 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 desktop/.config/rofi/Paper.rasi diff --git a/desktop/.config/rofi/Paper.rasi b/desktop/.config/rofi/Paper.rasi new file mode 100644 index 0000000..67a98b1 --- /dev/null +++ b/desktop/.config/rofi/Paper.rasi @@ -0,0 +1,146 @@ +/** + * ROFI Color theme + * User: Qball + * Copyright: Dave Davenport + */ + +* { + selected-normal-foreground: rgba ( 245, 245, 245, 100 % ); + foreground: rgba ( 0, 43, 54, 100 % ); + normal-foreground: @foreground; + alternate-normal-background: rgba ( 208, 208, 208, 100 % ); + red: rgba ( 220, 50, 47, 100 % ); + selected-urgent-foreground: rgba ( 245, 245, 245, 100 % ); + blue: rgba ( 38, 139, 210, 100 % ); + urgent-foreground: rgba ( 215, 95, 0, 100 % ); + alternate-urgent-background: rgba ( 208, 208, 208, 100 % ); + active-foreground: rgba ( 0, 95, 135, 100 % ); + lightbg: rgba ( 238, 232, 213, 100 % ); + selected-active-foreground: rgba ( 245, 245, 245, 100 % ); + alternate-active-background: rgba ( 208, 208, 208, 100 % ); + background: rgba ( 245, 245, 245, 100 % ); + bordercolor: rgba ( 68, 68, 68, 100 % ); + alternate-normal-foreground: @foreground; + normal-background: rgba ( 95, 95, 32, 6 % ); + lightfg: rgba ( 88, 104, 117, 100 % ); + selected-normal-background: rgba ( 66, 113, 174, 100 % ); + border-color: @foreground; + spacing: 2; + separatorcolor: rgba ( 68, 68, 68, 100 % ); + urgent-background: rgba ( 245, 245, 245, 100 % ); + selected-urgent-background: rgba ( 215, 95, 0, 100 % ); + alternate-urgent-foreground: @urgent-foreground; + background-color: rgba ( 0, 0, 0, 0 % ); + alternate-active-foreground: @active-foreground; + active-background: rgba ( 245, 245, 245, 100 % ); + selected-active-background: rgba ( 0, 95, 135, 100 % ); +} +window { + background-color: @background; + border: 1; + padding: 5; +} +mainbox { + border: 0; + padding: 0; +} +message { + border: 2px 0px 0px ; + border-color: @separatorcolor; + padding: 1px ; +} +textbox { + text-color: @foreground; +} +listview { + fixed-height: 0; + border: 2px 0px 0px ; + border-color: @separatorcolor; + spacing: 2px ; + scrollbar: true; + padding: 2px 0px 0px ; +} +element { + border: 0; + padding: 1px ; +} +element-text { + background-color: inherit; + text-color: inherit; +} +element.normal.normal { + background-color: @normal-background; + text-color: @normal-foreground; +} +element.normal.urgent { + background-color: @urgent-background; + text-color: @urgent-foreground; +} +element.normal.active { + background-color: @active-background; + text-color: @active-foreground; +} +element.selected.normal { + background-color: @selected-normal-background; + text-color: @selected-normal-foreground; +} +element.selected.urgent { + background-color: @selected-urgent-background; + text-color: @selected-urgent-foreground; +} +element.selected.active { + background-color: @selected-active-background; + text-color: @selected-active-foreground; +} +element.alternate.normal { + background-color: @alternate-normal-background; + text-color: @alternate-normal-foreground; +} +element.alternate.urgent { + background-color: @alternate-urgent-background; + text-color: @alternate-urgent-foreground; +} +element.alternate.active { + background-color: @alternate-active-background; + text-color: @alternate-active-foreground; +} +scrollbar { + width: 4px ; + border: 0; + handle-width: 8px ; + padding: 0; +} +mode-switcher { + border: 2px 0px 0px ; + border-color: @separatorcolor; +} +button.selected { + background-color: @selected-normal-background; + text-color: @selected-normal-foreground; +} +inputbar { + spacing: 0; + text-color: @normal-foreground; + padding: 1px ; +} +case-indicator { + spacing: 0; + text-color: @normal-foreground; +} +entry { + spacing: 0; + text-color: @normal-foreground; +} +prompt { + spacing: 0; + text-color: @normal-foreground; +} +inputbar { + children: [ prompt,textbox-prompt-colon,entry,case-indicator ]; +} +textbox-prompt-colon { + expand: false; + str: ":"; + margin: 0px 0.3em 0em 0em ; + text-color: @normal-foreground; +} diff --git a/desktop/.config/rofi/config.rasi b/desktop/.config/rofi/config.rasi index 9ca5789..aebcc09 100644 --- a/desktop/.config/rofi/config.rasi +++ b/desktop/.config/rofi/config.rasi @@ -1,4 +1,4 @@ configuration { font: "Noto Sans 20"; } -@theme "/usr/share/rofi/themes/Paper.rasi" +@theme "Paper.rasi" diff --git a/emacs/.doom.d/config.el b/emacs/.doom.d/config.el index 163b2c7..0aeb010 100644 --- a/emacs/.doom.d/config.el +++ b/emacs/.doom.d/config.el @@ -241,6 +241,7 @@ (setq org-capture-templates `(("g" "Go to current journal entry" plain (function kj/org-journal-find-location) "%i%?" :jump-to-captured t :immediate-finish t) +<<<<<<< HEAD ("t" "Create a TODO in current journal entry" plain (function kj/org-journal-narrowed-location) "** TODO %?\n%i\n%a") ("w" "Log bodyweight" table-line @@ -248,6 +249,13 @@ "Body weight log") "| %t | %^{Weight} | |" :prepend t :immediate-finish t))) +||||||| parent of e40f80f (config) + ("t" "Create a TODO in current journal entry" plain (function kj/org-journal-narrowed-location) + "** TODO %?\n%i\n%a"))) +======= + ("t" "Create a TODO" entry (file+headline "~/org/roam/tasks.org" "Inbox") + "** TODO %?\n%i\n%a"))) +>>>>>>> e40f80f (config) (defun kj/find-agenda-files-containing-tag (tag) (setq org-agenda-archives-mode nil) -- cgit v1.2.3 From 798d1a520f5f6f38fadf1b8027d3131f50f5c2f1 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Fri, 13 May 2022 11:07:37 -0400 Subject: fix config --- emacs/.doom.d/config.el | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/emacs/.doom.d/config.el b/emacs/.doom.d/config.el index 0aeb010..fbace34 100644 --- a/emacs/.doom.d/config.el +++ b/emacs/.doom.d/config.el @@ -241,21 +241,13 @@ (setq org-capture-templates `(("g" "Go to current journal entry" plain (function kj/org-journal-find-location) "%i%?" :jump-to-captured t :immediate-finish t) -<<<<<<< HEAD - ("t" "Create a TODO in current journal entry" plain (function kj/org-journal-narrowed-location) + ("t" "Create a TODO" entry (file+headline "~/org/roam/tasks.org" "Inbox") "** TODO %?\n%i\n%a") ("w" "Log bodyweight" table-line (file+headline ,(concat org-roam-directory "bodyweight.org") "Body weight log") "| %t | %^{Weight} | |" :prepend t :immediate-finish t))) -||||||| parent of e40f80f (config) - ("t" "Create a TODO in current journal entry" plain (function kj/org-journal-narrowed-location) - "** TODO %?\n%i\n%a"))) -======= - ("t" "Create a TODO" entry (file+headline "~/org/roam/tasks.org" "Inbox") - "** TODO %?\n%i\n%a"))) ->>>>>>> e40f80f (config) (defun kj/find-agenda-files-containing-tag (tag) (setq org-agenda-archives-mode nil) -- cgit v1.2.3