commit de9d7d110e1dbaefcd631573bf90e27bcad010a6
parent 2fbe8b3a0eab80746c103cb528b8e88449a440a2
Author: Christos Margiolis <christos@FreeBSD.org>
Date: Wed, 4 Dec 2024 00:51:22 +0100
updates
Diffstat:
12 files changed, 85 insertions(+), 127 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -7,5 +7,4 @@ mutt/
ncmpcpp/.config/ncmpcpp/*
!ncmpcpp/.config/ncmpcpp/config
sfeed/
-freebsd/hosts
homedir/
diff --git a/X/.config/X11/Xresources b/X/.config/X11/Xresources
@@ -1,98 +0,0 @@
-*.alpha: 0.95
-
-!! Set a default font and font size as below:
-!*.font: monospace:size=14
-
-!*.background: #2c2c2c
-!*.foreground: #99b7d5
-
-!name dark light
-!black 0 8
-!red 1 9
-!green 2 10
-!yellow 3 11
-!blue 4 12
-!purple 5 13
-!cyan 6 14
-!white 7 15
-
-!! xterm
-*.color0: #000000
-*.color1: #cd0000
-*.color2: #00cd00
-*.color3: #cdcd00
-*.color4: #0000cd
-*.color5: #cd00cd
-*.color6: #00cdcd
-*.color7: #e5e5e5
-*.color8: #4d4d4d
-*.color9: #ff0000
-*.color10: #00ff00
-*.color11: #ffff00
-*.color12: #0000ff
-*.color13: #ff00ff
-*.color14: #00ffff
-*.color15: #aabac8
-*.background: #000000
-
-!! gruvbox:
-!*.color0: #1d2021
-!*.color1: #cc241d
-!*.color2: #98971a
-!*.color3: #d79921
-!*.color4: #458588
-!*.color5: #b16286
-!*.color6: #689d6a
-!*.color7: #a89984
-!*.color8: #928374
-!*.color9: #fb4934
-!*.color10: #b8bb26
-!*.color11: #fabd2f
-!*.color12: #83a598
-!*.color13: #d3869b
-!*.color14: #8ec07c
-!*.color15: #ebdbb2
-!*.color256: #1d2021
-!*.color257: #ebdbb2
-
-! base16
-!*.color0: #181818
-!*.color1: #ab4642
-!*.color2: #a1b56c
-!*.color3: #f7ca88
-!*.color4: #7cafc2
-!*.color5: #ba8baf
-!*.color6: #86c1b9
-!*.color7: #d8d8d8
-!*.color8: #585858
-!*.color9: #ab4642
-!*.color10: #a1b56c
-!*.color11: #f7ca88
-!*.color12: #7cafc2
-!*.color13: #ba8baf
-!*.color14: #86c1b9
-!*.color15: #f8f8f8
-
-! Dracula */
-!*.foreground: #F8F8F2
-!*.background: #282A36
-!*.color0: #000000
-!*.color8: #4D4D4D
-!*.color1: #FF5555
-!*.color9: #FF6E67
-!*.color2: #50FA7B
-!*.color10: #5AF78E
-!*.color3: #F1FA8C
-!*.color11: #F4F99D
-!*.color4: #BD93F9
-!*.color12: #CAA9FA
-!*.color5: #FF79C6
-!*.color13: #FF92D0
-!*.color6: #8BE9FD
-!*.color14: #9AEDFE
-!*.color7: #BFBFBF
-!*.color15: #E6E6E6
-
-!*.background: .color0
-!*.color256: #1d2021
-!*.color257: #ebdbb2
diff --git a/X/.xprofile b/X/.xprofile
@@ -1,9 +1,7 @@
#!/bin/sh
doas ntpdate -v -b 'in.pool.ntp.org' &
-xset r rate 300 50 &
slstatus &
-setxkbmap -layout 'ca(multix),gr' -option 'grp:shift_caps_toggle' &
musicpd &
-setscreens &
-mixer -d8
+xset r rate 300 50
+setxkbmap -layout 'ca(multix),gr' -option 'grp:shift_caps_toggle'
diff --git a/autoinstall b/autoinstall
@@ -14,10 +14,8 @@ for h in ${homestuff}; do
done
cp -v \
- freebsd/hosts \
freebsd/src-env.conf \
/etc/
cp -v freebsd/rc.conf.desktop /etc/rc.conf
-cp -v freebsd/rc.local /etc/rc.local
cp -v freebsd/loader.conf.desktop /boot/loader.conf
cp -v freebsd/.login_conf ${HOME}/ && cap_mkdb ${HOME}/.login_conf
diff --git a/freebsd/rc.conf.laptop b/freebsd/rc.conf.laptop
@@ -1,4 +1,5 @@
hostname="tpad"
+#ifconfig_em0="up DHCP"
wlans_iwm0="wlan0"
synchronous_dhclient="YES"
ifconfig_wlan0="up WPA DHCP"
@@ -16,6 +17,7 @@ if_epair_load="YES"
cloned_interfaces="bridge0 epair0 tap0"
ifconfig_bridge0="addm wlan0 addm epair0a addm tap0 up"
+#ifconfig_bridge0="addm em0 addm epair0a addm tap0 up"
rpcbind_enable="YES"
rpc_lockd_enable="YES"
diff --git a/freebsd/rc.local b/freebsd/rc.local
@@ -1 +0,0 @@
-service nfsd restart
diff --git a/git/.gitconfig b/git/.gitconfig
@@ -1,6 +1,6 @@
[user]
name = Christos Margiolis
- email = christos@margiolis.net
+ email = christos@FreeBSD.org
[http]
postBuffer = 157286400
[sendemail]
@@ -10,3 +10,5 @@
smtpserverport = 587
[pull]
ff = only
+[safe]
+ directory = /usr/src
diff --git a/mpd/.config/mpd/mpd.conf b/mpd/.config/mpd/mpd.conf
@@ -1,6 +1,6 @@
+music_directory "/backup/music"
db_file "~/.config/mpd/database"
log_file "~/.config/mpd/log"
-music_directory "~/.config/mpd/music"
playlist_directory "~/.config/mpd/playlists"
pid_file "~/.config/mpd/pid"
state_file "~/.config/mpd/state"
@@ -17,10 +17,3 @@ audio_output {
mixer_type "software"
mixer_device "/dev/mixer"
}
-
-audio_output {
- type "fifo"
- name "toggle_visualizer"
- path "/tmp/mpd.fifo"
- format "44100:16:2"
-}
diff --git a/ncmpcpp/.config/ncmpcpp/config b/ncmpcpp/.config/ncmpcpp/config
@@ -4,13 +4,6 @@ mpd_music_dir = "~/.config/mpd/music"
mpd_crossfade_time = "2"
mpd_port = "6600"
-# Visualizer
-visualizer_fifo_path = "/tmp/mpd.fifo"
-visualizer_output_name = "fifo"
-visualizer_sync_interval= "30"
-visualizer_in_stereo = yes
-visualizer_look = "xx"
-
# Playlist
song_columns_list_format = "(6f)[blue]{l} (25)[red]{a} (40)[green]{t|f} (30)[yellow]{b}"
now_playing_prefix = "$b$5»$7»$1» "
diff --git a/nvim/.config/nvim/colors/christos.vim b/nvim/.config/nvim/colors/christos.vim
@@ -20,7 +20,7 @@ let s:fg3=s:bg
let s:fg4=s:bg
let s:visbg="#1d27e0"
-let s:match="#EF8F8F"
+let s:match="#FF8F8F"
let s:keyword="#cffff3"
let s:builtin="#9cffe5"
@@ -83,7 +83,7 @@ exe 'hi Structure guifg='s:keyword
exe 'hi Tag guifg='s:keyword
exe 'hi Title guifg='s:fg
exe 'hi Todo guifg='s:fg2' gui=inverse,bold'
-exe 'hi Type guifg='s:type
+exe 'hi Type guifg='s:type' gui=bold'
exe 'hi Underlined gui=underline'
exe 'hi Macro guifg='s:keyword
@@ -110,5 +110,8 @@ exe 'hi htmlLink guifg='s:var' gui=underline'
exe 'hi htmlStatement guifg='s:keyword
exe 'hi htmlSpecialTagName guifg='s:keyword
+set cursorline
+highlight CursorLine guibg=#444444
+
" Markdown Highlighting
exe 'hi mkdCode guifg='s:builtin
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
@@ -52,5 +52,77 @@ Plugin 'VundleVim/Vundle.vim'
Plugin 'preservim/nerdtree'
Plugin 'scrooloose/nerdcommenter'
Plugin 'ap/vim-css-color'
+Plugin 'markjdb/nvim-cscope'
+Plugin 'vimwiki/vimwiki'
call vundle#end() " required
filetype plugin indent on " required
+
+let g:vimwiki_list = [{'path': '~/n/vimwiki/', 'syntax': 'markdown', 'ext': 'md'}]
+let g:vimwiki_markdown_link_ext = 1
+
+"""""""""""""""""""""""""" cscope stuff
+
+"set cscopetag
+" Suppress an error if .vimrc is sourced after the DB is added.
+"set nocscopeverbose
+"if $CSCOPE_DB != ""
+" cs add $CSCOPE_DB
+"endif
+"set cscopeverbose
+
+nnoremap <leader>cnew :Cscope add<CR>
+nnoremap <leader>creg :Cscope regen<CR>
+nnoremap <leader>csel :Cscope select<CR>
+
+command -nargs=1 Ca Cscope find a <args>
+nnoremap <C-\>a :Cscope find a <C-R>=expand("<cword>")<CR><CR>
+nnoremap <C-\>la :Cscope find a <C-R>=tolower(expand("<cword>"))<CR><CR>
+nnoremap <C-\>ua :Cscope find a <C-R>=toupper(expand("<cword>"))<CR><CR>
+"nnoremap <C-@>a :scs find a <C-R>=expand("<cword>")<CR><CR>
+"nnoremap <C-@><C-@>a :vert scs find a <C-R>=expand("<cword>")<CR><CR>
+
+command -nargs=1 Cc Cscope find c <args>
+nnoremap <C-\>c :Cscope find c <C-R>=expand("<cword>")<CR><CR>
+nnoremap <C-\>lc :Cscope find c <C-R>=tolower(expand("<cword>"))<CR><CR>
+nnoremap <C-\>uc :Cscope find c <C-R>=toupper(expand("<cword>"))<CR><CR>
+"nnoremap <C-@>c :scs find c <C-R>=expand("<cword>")<CR><CR>
+"nnoremap <C-@><C-@>c :vert scs find c <C-R>=expand("<cword>")<CR><CR>
+
+command -nargs=1 Cd Cscope find d <args>
+nnoremap <C-\>d :Cscope find d <C-R>=expand("<cword>")<CR><CR>
+nnoremap <C-\>ld :Cscope find d <C-R>=tolower(expand("<cword>"))<CR><CR>
+nnoremap <C-\>ud :Cscope find d <C-R>=toupper(expand("<cword>"))<CR><CR>
+"nnoremap <C-@>d :Cscope find d <C-R>=expand("<cword>")<CR><CR>
+"nnoremap <C-@><C-@>d :vert cs find d <C-R>=expand("<cword>")<CR><CR>
+
+command -nargs=1 Ce Cscope find e <args>
+nnoremap <C-\>e :Cscope find e <C-R>=expand("<cword>")<CR><CR>
+nnoremap <C-\>le :Cscope find e <C-R>=tolower(expand("<cword>"))<CR><CR>
+nnoremap <C-\>ue :Cscope find e <C-R>=toupper(expand("<cword>"))<CR><CR>
+"nnoremap <C-@>e :Cscope find e <C-R>=expand("<cword>")<CR><CR>
+"nnoremap <C-@><C-@>e :vert cs find e <C-R>=expand("<cword>")<CR><CR>
+
+command -nargs=1 Cf Cscope find f <args>
+nnoremap <C-\>f :Cscope find f <C-R>=expand("<cfile>")<CR><CR>
+nnoremap <C-\>lf :Cscope find f <C-R>=tolower(expand("<cfile>"))<CR><CR>
+nnoremap <C-\>uf :Cscope find f <C-R>=toupper(expand("<cfile>"))<CR><CR>
+"nnoremap <C-@>f :Cscope find f <C-R>=expand("<cfile>")<CR><CR>
+"nnoremap <C-@><C-@>f :vert cs find f <C-R>=expand("<cfile>")<CR><CR>
+
+command -nargs=1 Cg Cscope find g <args>
+nnoremap <C-\>g :Cscope find g <C-R>=expand("<cword>")<CR><CR>
+nnoremap <C-\>lg :Cscope find g <C-R>=tolower(expand("<cword>"))<CR><CR>
+nnoremap <C-\>ug :Cscope find g <C-R>=toupper(expand("<cword>"))<CR><CR>
+"nnoremap <C-@>g :Cscope find g <C-R>=expand("<cword>")<CR><CR>
+"nnoremap <C-@><C-@>g :vert cs find g <C-R>=expand("<cword>")<CR><CR>
+nnoremap <C-]> :Cscope find g <C-R>=expand("<cword>")<CR><CR>
+
+command -nargs=1 Cs Cscope find s <args>
+nnoremap <C-\>s :Cscope find s <C-R>=expand("<cword>")<CR><CR>
+nnoremap <C-\>ls :Cscope find s <C-R>=tolower(expand("<cword>"))<CR><CR>
+nnoremap <C-\>us :Cscope find s <C-R>=toupper(expand("<cword>"))<CR><CR>
+"nnoremap <C-@>s :Cscope find s <C-R>=expand("<cword>")<CR><CR>
+"nnoremap <C-@><C-@>s :vert cs find s <C-R>=expand("<cword>")<CR><CR>
+
+" Reset the cscope connection.
+nnoremap <leader>cr :Cscope reset<CR>
diff --git a/xbindkeys/.xbindkeysrc.scm b/xbindkeys/.xbindkeysrc.scm
@@ -1,3 +0,0 @@
-(xbindkey '("XF86AudioMute") "mixer_prog vol.mute=^")
-(xbindkey '("XF86AudioRaiseVolume") "mixer_prog vol.volume=+0.1")
-(xbindkey '("XF86AudioLowerVolume") "mixer_prog vol.volume=-0.1")
