yeah

8 files changed, 76 insertions, 24 deletions

diff --git a/.config/.emacs b/.config/.emacs
index bf680b1..8b1b58c 100644
--- a/.config/.emacs
+++ b/.config/.emacs
@@ -2,7 +2,6 @@
 (menu-bar-mode 0)
 (tool-bar-mode 0)
 (scroll-bar-mode 0)
-(ido-mode)
 
 ;; visual
 (setq inhibit-startup-screen t)
@@ -11,3 +10,16 @@
 
 ;; keymaps
 (keymap-global-set "C-c c" 'compile)
+
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; 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.
+ '(custom-enabled-themes '(wheatgrass)))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; 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.
+ )
diff --git a/.config/.emacs~ b/.config/.emacs~
new file mode 100644
index 0000000..9dc1b32
--- /dev/null
+++ b/.config/.emacs~
@@ -0,0 +1,24 @@
+;; modes
+(menu-bar-mode 0)
+(tool-bar-mode 0)
+(scroll-bar-mode 0)
+
+;; visual
+(setq inhibit-startup-screen t)
+(set-default 'truncate-lines t)
+(add-to-list 'default-frame-alist '(font . "Iosevka-14"))
+
+;; keymaps
+(keymap-global-set "C-c c" 'compile)
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; 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.
+ '(custom-enabled-themes '(wheatgrass)))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; 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.
+ )
diff --git a/.config/.tmux.conf b/.config/.tmux.conf
index aa03783..77f32f1 100644
--- a/.config/.tmux.conf
+++ b/.config/.tmux.conf
@@ -2,8 +2,5 @@ set-option -g prefix M-a
 unbind-key C-b
 bind-key M-a send-prefix
 
-set -g default-terminal "screen-256color"
-
 set -g @plugin 'tmux-plugins/tpm'
-
 run '~/.tmux/plugins/tpm/tpm'
diff --git a/.config/.vimrc b/.config/.vimrc
index 0d8bc46..73356ae 100644
--- a/.config/.vimrc
+++ b/.config/.vimrc
@@ -1,31 +1,44 @@
-"Visual
+"visual
 syntax on
 let g:netrw_banner=0
+set number
+set relativenumber
+set termguicolors
+set background=dark
+colorscheme quiet
+hi normal       guifg=#dcd7d7 guibg=#242829
+hi constant     guifg=#dcade6
+hi character    guifg=#dcade6
+hi number       guifg=#dcade6
+hi boolean      guifg=#dcade6
+hi float        guifg=#dcade6
+hi visual       guifg=#dcade6 guibg=#242829
+hi incsearch    guifg=#dcade6 guibg=#242829
+hi MatchParen   guifg=#dcade6 guibg=#242829
 
-"Formatting
-set textwidth=80
+"formatting
+"set textwidth=80
 set nowrap
-set cindent
-set cinoptions=:0,l1,t0,g0,(0
+autocmd BufRead,BufNewFile *.c {
+	set cindent
+	set cinoptions=:0,l1,t0,g0,(0
+}
 
-"Functional
+"functional
 set clipboard+=unnamedplus
 set nohls
+set is
 
-"Bindings
+"bindings
 let mapleader=","
 
 map <leader>e	:Ex<cr>
-map <leader>ve	:vs<bar>wincmd l<bar>Ex<cr>
-map <leader>t	:vertical rightbelow terminal<space>
+map <leader>v	:Vex<cr>
+map <leader>s	:Sex<cr>
 map <leader>q	:q<cr>
 
 set makeprg=./build.sh
-map <leader>m	:make!<cr>:vertical rightbelow copen<cr><cr>:wincmd =<cr>
+map <leader>m	:make!<cr>:cope<cr>
 map <leader>n	:cnext<cr>
-
+map <leader>n	:cfirst<cr>
 map <leader>g	:grep!<space>-rn<space><space>.<left><left>''<left>
-
-"Comments
-map <leader>cm	I/*<space><esc>A<space>*/<esc>0
-map <leader>cd	^dwA<backspace><backspace><backspace><esc>0
diff --git a/scripts/changecpufreq b/scripts/changecpufreq
index 5945487..fc4cb49 100755
--- a/scripts/changecpufreq
+++ b/scripts/changecpufreq
@@ -1,3 +1,3 @@
 #!/bin/sh
-sudo cpupower frequency-set -g performance
-sudo cpupower frequency-set -u 1.40GHz
+cpupower frequency-set -g performance
+cpupower frequency-set -u 1.40GHz
diff --git a/scripts/dwmbar b/scripts/dwmbar
index 761ad85..8d90b57 100755
--- a/scripts/dwmbar
+++ b/scripts/dwmbar
@@ -4,6 +4,10 @@ while true ; do
 	# if [ -n "${MUSIC}" ] ; then
 	# 	MUSIC="Playing: ${MUSIC}  "
 	# fi
+	MUSIC=$(mpc current)
+	if [ -n "${MUSIC}" ] ; then
+		MUSIC="Playing: ${MUSIC} "
+	fi
 
 	BAT="$(cat /sys/class/power_supply/BAT0/capacity)"
 	if [ ${BAT} -ge 50 ] ; then
diff --git a/scripts/startdwmvoid b/scripts/startdwmvoid
index 25b9219..3998f8e 100755
--- a/scripts/startdwmvoid
+++ b/scripts/startdwmvoid
@@ -1,7 +1,7 @@
 #!/bin/sh
-feh --bg-scale $HOME/pictures/wallpapers/aika.jpg
-pkill tmux
-tmuxprojects
+feh --bg-scale $HOME/pictures/wallpapers/vocaloid.png
+# pkill tmux
+# tmuxprojects
 # xsreensaver &
 dwmbar &
 runsvdir ~/.runit/runsvdir &
diff --git a/web b/web
index 45e89bc..a01f80d 100644
--- a/web
+++ b/web
@@ -3,3 +3,5 @@ uneex.org
 simplevibe.ru
 projecteuler.net
 lainchan.org
+https://www.susanjfowler.com/blog/2016/8/13/so-you-want-to-learn-physics
+badplace.eu