From 22828ca7cdc851ae61e34a6f6ed4ceac82af4242 Mon Sep 17 00:00:00 2001
From: tavo-wasd <gustavo@gustavocalvo.xyz>
Date: Mon, 15 Jul 2024 18:29:24 -0600
Subject: [PATCH] java devel

---
 .gitignore    |  1 +
 emacs/init.el |  4 ++--
 sway/config   | 31 +++++++++++--------------------
 vim/vimrc     | 16 ++++++++--------
 4 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8e23a0b..61e4084 100644
--- a/.gitignore
+++ b/.gitignore
@@ -234,3 +234,4 @@ isync/
 notmuch/
 mathematica/
 godot/
+firmadorlibre/
diff --git a/emacs/init.el b/emacs/init.el
index a200506..233065c 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -272,8 +272,8 @@
   (make-directory "~/.local/share/emacs/ltximg/"))
 (setq org-preview-latex-image-directory "~/.local/share/emacs/ltximg/")
 
-(setq org-agenda-files (quote ("~/Documents/agenda/archive.org"
-                               "~/Documents/agenda/agenda.org")))
+;; (setq org-agenda-files (quote ("~/Documents/agenda/archive.org"
+;;                                "~/Documents/agenda/agenda.org")))
 
 ;; --- Keybinds ---
 (use-package general
diff --git a/sway/config b/sway/config
index 6f491e1..086162c 100644
--- a/sway/config
+++ b/sway/config
@@ -36,16 +36,6 @@ set $browserh firefox-hardened
 set $menu ~/.config/scripts/menu/menu "Run:" run | xargs swaymsg exec --
 set $passmgr ~/.config/scripts/sway/swaypass
 set $passotp ~/.config/scripts/sway/swayotp
-set $volup ~/.config/scripts/volup
-set $voldown ~/.config/scripts/voldown
-set $mute ~/.config/scripts/mute
-set $micup ~/.config/scripts/micup
-set $micdown ~/.config/scripts/micdown
-set $micmute ~/.config/scripts/micmute
-set $brightup ~/.config/scripts/brightup
-set $brightdown ~/.config/scripts/brightdown
-set $powermenu ~/.config/scripts/menu/menu-power
-set $bookmenu ~/.config/scripts/menu/menu-bookmarks
 # -
 set $col_fg #fabd2f
 set $col_bg #121212
@@ -61,19 +51,20 @@ bindsym $mod+Shift+o exec $passotp
 bindsym $mod+e exec $filemgr
 bindsym $mod+w exec $browser
 bindsym $mod+Shift+w exec $browserh
-bindsym $mod+b exec $bookmenu
-bindsym XF86AudioRaiseVolume exec $volup
-bindsym XF86AudioLowerVolume exec $voldown
-bindsym XF86AudioMute exec $mute
-bindsym Shift+XF86AudioRaiseVolume exec $micup
-bindsym Shift+XF86AudioLowerVolume exec $micdown
-bindsym Shift+XF86AudioMute exec $micmute
-bindsym XF86MonBrightnessUp exec $brightup
-bindsym XF86MonBrightnessDown exec $brightdown
+bindsym $mod+i exec menu-input
+bindsym $mod+o exec menu-output
+bindsym XF86AudioRaiseVolume exec volup
+bindsym XF86AudioLowerVolume exec voldown
+bindsym XF86AudioMute exec mute
+bindsym Shift+XF86AudioRaiseVolume exec micup
+bindsym Shift+XF86AudioLowerVolume exec micdown
+bindsym Shift+XF86AudioMute exec micmute
+bindsym XF86MonBrightnessUp exec brightup
+bindsym XF86MonBrightnessDown exec brightdown
 bindsym Print exec grim -g "$(slurp -d)" - | wl-copy
 # -
 bindsym $mod+Shift+q reload
-bindsym $mod+p exec $powermenu
+bindsym $mod+p exec menu-power
 bindsym $mod+c kill
 # -
 bindsym $mod+$left focus left
diff --git a/vim/vimrc b/vim/vimrc
index 2a04954..9acc3b4 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -83,14 +83,6 @@ nnoremap <silent> <Leader>p :call WrapQuickfixPrev()<CR>
 nnoremap <leader>m :make<CR><CR>
 nnoremap <F9> :make<CR><CR>
 
-function! SetMakeprg()
-    if filereadable('Makefile')
-        set makeprg=make
-    else
-    endif
-endfunction
-autocmd VimEnter * call SetMakeprg()
-
 " c/c++
 autocmd FileType c :compiler gcc | setlocal makeprg=gcc\ -Wall\ -c\ %
 autocmd FileType cpp :compiler gcc | setlocal makeprg=g++\ -Wall\ -c\ %
@@ -102,6 +94,14 @@ autocmd FileType troff noremap <buffer> <C-s> :w<CR> :!grofftex %<CR><CR>
 " Python
 autocmd FileType python noremap <buffer> <F9> :!python %<CR>
 
+function! SetMakeprg()
+    if filereadable('Makefile')
+        set makeprg=make
+    else
+    endif
+endfunction
+autocmd VimEnter * call SetMakeprg()
+
 " Functions
 
 "Open a shell on a vertical split