summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Coquand <marc@mccd.space>2024-07-24 09:53:06 -0500
committerMarc Coquand <marc@mccd.space>2024-07-24 09:53:06 -0500
commitf61cc0a13a8a691ea152d73d7fc27dd67e2480f1 (patch)
tree42668080125a7eba64bedbedce877553d3542527
parent8cb6876cb11711169d93e1f82f534c0feba56906 (diff)
downloadbsd-f61cc0a13a8a691ea152d73d7fc27dd67e2480f1.tar.gz
bsd-f61cc0a13a8a691ea152d73d7fc27dd67e2480f1.tar.bz2
bsd-f61cc0a13a8a691ea152d73d7fc27dd67e2480f1.zip
config updates
-rw-r--r--Xresources5
-rw-r--r--config/aerc/accounts.conf18
-rw-r--r--cwmrc7
-rwxr-xr-xlocal/bin/pfetch12
-rw-r--r--profile1
-rw-r--r--vim/pack/downloads/opt/snippets/snippets.vim4
-rw-r--r--vimrc2
-rwxr-xr-xxsession6
8 files changed, 34 insertions, 21 deletions
diff --git a/Xresources b/Xresources
index 6d4cd83..a7ca01d 100644
--- a/Xresources
+++ b/Xresources
@@ -2,11 +2,12 @@ Xcursor*theme: Adwaita
Xcursor*size: 64
XTerm*faceSize: 14
XTerm*selectToClipboard: true
-XTerm*faceName: Iosevka SS13 Extended:style=regular:antialias=true:hinting=false
+XTerm*faceName: GoMono:style=regular:antialias=true:hinting=false
xterm*scrollBar: false
xterm*rightScrollbar: false
XTerm.termName: xterm-256color
XTerm*Background: #FEFFFA
-XTerm*Foreground: black
+XTerm*Foreground: #000000
XTerm*HiBackColor: #FEFFFA
+XTerm*scaleHeight: 1.2
diff --git a/config/aerc/accounts.conf b/config/aerc/accounts.conf
index 50ca8dc..7167eb6 100644
--- a/config/aerc/accounts.conf
+++ b/config/aerc/accounts.conf
@@ -1,7 +1,15 @@
[Personal]
-source = maildir://~/mail-home
-outgoing = smtps+plain://marcc%40fastmail.fr@smtp.fastmail.com:465
-default = INBOX
+source = maildir://~/mail-home
+outgoing = smtps+plain://marcc%40fastmail.fr@smtp.fastmail.com:465
+default = INBOX
outgoing-cred-cmd = pass fastmail/marcc
-from = "Marc Coquand" <marc@mccd.space>
-copy-to = Sent
+from = "Marc Coquand" <marc@mccd.space>
+copy-to = Sent
+
+[Work]
+source = maildir://~/mail-work
+outgoing = smtps+plain://marc.coquand%40sustainably.app@smtp.gmail.com:465
+default = INBOX
+outgoing-cred-cmd = pass sustainably/gmail
+default = INBOX
+from = "Marc Coquand" <marc.coquand@sustainably.app>
diff --git a/cwmrc b/cwmrc
index f2775a7..7528ea8 100644
--- a/cwmrc
+++ b/cwmrc
@@ -5,8 +5,8 @@ autogroup 0 xclock,XClock
autogroup 0 xarclock, XClock
autogroup 0 clock, clock
autogroup 0 xclock, xterm
-ignore xclock
vtile 55
+ignore xclock
unbind-key all
color menufg "#FFFFFF" #black
@@ -14,7 +14,10 @@ color font "#000000" #black
color menubg "#DDDDDD" "#000000"
color selfont #white #white
color activeborder "#58a9ad"
-color inactiveborder "#AAAAAA"
+color inactiveborder "#999999"
+
+bind-key 0-XF86MonBrightnessUp "backlight incr 10"
+bind-key 0-XF86MonBrightnessDown "backlight decr 10"
bind-mouse 4-3 window-resize
bind-mouse 4-1 window-move
diff --git a/local/bin/pfetch b/local/bin/pfetch
index 21673dd..bfc58b6 100755
--- a/local/bin/pfetch
+++ b/local/bin/pfetch
@@ -1593,13 +1593,11 @@ get_ascii() {
([Nn]et[Bb][Ss][Dd]*)
read_ascii 3 <<-EOF
- ${c7}\\\\${c3}\`-______,----__
- ${c7} \\\\ ${c3}__,---\`_
- ${c7} \\\\ ${c3}\`.____
- ${c7} \\\\${c3}-______,----\`-
- ${c7} \\\\
- ${c7} \\\\
- ${c7} \\\\
+ ${c7}\\${c3}\`-__,----__
+ ${c7} \\ ${c3}__\`_
+ ${c7} \\${c3}-__,----\`-
+ ${c7} \\
+ ${c7} \\
EOF
;;
diff --git a/profile b/profile
index 730bcbf..dfb7e23 100644
--- a/profile
+++ b/profile
@@ -32,7 +32,6 @@ export HISTFILE=$HOME/.history
export STITCH_DIRECTORY=/home/mccd/notes
export STITCH_GREP_CMD=ugrep
-if [ -e /home/mccd/.nix-profile/etc/profile.d/nix.sh ]; then . /home/mccd/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
# opam configuration
test -r /home/mccd/.opam/opam-init/init.sh && . /home/mccd/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
diff --git a/vim/pack/downloads/opt/snippets/snippets.vim b/vim/pack/downloads/opt/snippets/snippets.vim
index 40743b2..c4362f5 100644
--- a/vim/pack/downloads/opt/snippets/snippets.vim
+++ b/vim/pack/downloads/opt/snippets/snippets.vim
@@ -7,6 +7,10 @@ autocmd FileType go
autocmd FileType go
\ :iabbrev <buffer> t@ <Backspace><Esc>^ifunc <Esc>A(t *testing.T) {<CR><CR>}<Left><Up><tab>
+
+autocmd FileType go
+ \ :iabbrev <buffer> for@ <Backspace><Esc>^ifor _, <Esc>A {<CR><CR>}<Left><Up><tab>
+
autocmd FileType go
\ :iabbrev <buffer> s@ <Backspace><Esc>^itype <Esc>A struct {<CR><CR>}<Up><tab>
diff --git a/vimrc b/vimrc
index 23193e9..60efe96 100644
--- a/vimrc
+++ b/vimrc
@@ -26,7 +26,7 @@ set t_Co=256
set tgc
hi Normal guifg=black guibg=#FEFFFA
"hi String guifg=blue
-"hi Comment guifg=gray cterm=italic
+hi Comment guifg=blue cterm=italic
hi SpellBad term=reverse term=underline guibg=#FEFFFA
hi SpellCap term=reverse term=underline guibg=#FEFFFA
hi SpellRare term=reverse term=underline guibg=#FEFFFA
diff --git a/xsession b/xsession
index b444260..299a268 100755
--- a/xsession
+++ b/xsession
@@ -1,12 +1,12 @@
. /home/mccd/.profile
xrdb -load ~/.Xresources &
xset fp+ /usr/pkg/share/fonts/X11/uni-vga &
-xsetroot -solid '#DDDDDD' &
-xclock -digital -geometry +7+1400 -face "Iosevka Aile:pixelsize=18:style=Semibold Italic" -bg \#DDDDDD -fg \#444444 -strftime "%a %d %b %H:%M" &
+xsetroot -solid '#333333' &
+xclock -geometry +2373+20 -bg \#FEFFFFA -fg \#444444 &
gsettings set org.gnome.desktop.interface document-font-name 'Iosevka Aile' &
gsettings set org.gnome.desktop.interface font-name 'Iosevka Aile' &
gsettings set org.gnome.desktop.interface cursor-size 32 &
gsettings set org.gnome.desktop.interface cursor-theme Adwaita &
-xinput set-prop 6 271 0.3 & #Speed up cursor
+#xinput set-prop 6 271 0.3 & #Speed up cursor
setxkbmap -layout us -variant colemak -option "caps:swapescape" &
dbus-run-session cwm