diff options
-rw-r--r-- | .config/emacs/init.el | 2 | ||||
-rw-r--r-- | .config/emacs/modules/bd--emms.el | 6 | ||||
-rw-r--r-- | .config/emacs/modules/bd--org.el | 4 | ||||
-rw-r--r-- | .config/emacs/modules/bd--roam.el | 2 | ||||
-rw-r--r-- | .config/emacs/modules/bd--shells.el | 2 | ||||
-rw-r--r-- | .config/guix/hati.scm | 4 | ||||
-rw-r--r-- | .config/guix/modules/base.scm | 10 | ||||
-rw-r--r-- | .config/guix/modules/dwm/config.def.h | 2 | ||||
-rw-r--r-- | .config/guix/modules/mpd.scm | 4 | ||||
-rw-r--r-- | .config/guix/vali.scm | 7 |
10 files changed, 24 insertions, 19 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 13fddc4..203e9dd 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -16,7 +16,7 @@ ;;;; path -(setenv "PATH" (format "%s:%s" (expand-file-name "~/Personal/scripts/") (getenv "PATH"))) +(setenv "PATH" (format "%s:%s" (expand-file-name "~/.local/bin/") (getenv "PATH"))) ;;;; warnings (setopt warning-minimum-level :error) diff --git a/.config/emacs/modules/bd--emms.el b/.config/emacs/modules/bd--emms.el index d16a8ac..f29e672 100644 --- a/.config/emacs/modules/bd--emms.el +++ b/.config/emacs/modules/bd--emms.el @@ -8,7 +8,7 @@ playback." (emms-stop) (when (bufferp emms-playlist-buffer-name) (kill-buffer emms-playlist-buffer-name)) - (emms-play-directory-tree (expand-file-name "~/Personal/mpd/music/")) + (emms-play-directory-tree (expand-file-name "~/ik/music/")) (emms-shuffle)) @@ -30,8 +30,8 @@ playback." (emms-player-mpd-server-name "localhost") (emms-player-mod-server-port "6600") ;; set dir and volume keys - (emms-player-mpd-music-directory (expand-file-name "~/Personal/mpd/music/")) - (emms-source-file-default-directory (expand-file-name "~/Personal/mpd/playlists/")) + (emms-player-mpd-music-directory (expand-file-name "~/ik/music/")) + (emms-source-file-default-directory (expand-file-name "~/ik/playlists/")) (emms-volume-change-function 'emms-volume-mpd-change) ;; misc (emms-mode-line-format "%s ") diff --git a/.config/emacs/modules/bd--org.el b/.config/emacs/modules/bd--org.el index 40bf643..36b4632 100644 --- a/.config/emacs/modules/bd--org.el +++ b/.config/emacs/modules/bd--org.el @@ -1,7 +1,7 @@ ;; -*- lexical-binding: t; -*- -(defvar-local agenda-file "~/Personal/roam/agenda/agenda_tasks.org") +(defvar-local agenda-file "~/dc/agenda/agenda_tasks.org") (use-package visual-fill-column :hook (org-mode . visual-fill-column-mode) @@ -46,7 +46,7 @@ each org file open." (advice-add 'org-refile :after 'org-save-all-org-buffers) ; after refiling tasks, save all buffers (setopt org-agenda-files - `(,agenda-file "~/Personal/roam/agenda/archived_tasks.org") + `(,agenda-file "~/dc/agenda/archived_tasks.org") org-deadline-warning-days 7 org-log-done 'time diff --git a/.config/emacs/modules/bd--roam.el b/.config/emacs/modules/bd--roam.el index 21cf573..3e4714c 100644 --- a/.config/emacs/modules/bd--roam.el +++ b/.config/emacs/modules/bd--roam.el @@ -23,7 +23,7 @@ file." :config (org-roam-db-autosync-mode) :custom - (org-roam-directory (expand-file-name "~/Personal/roam/")) + (org-roam-directory (expand-file-name "~/dc/")) (org-roam-dailies-directory "logs/") (org-roam-complete-everywhere t) (org-roam-capture-templates '(("e" "extend" plain diff --git a/.config/emacs/modules/bd--shells.el b/.config/emacs/modules/bd--shells.el index c857f4c..94c81ab 100644 --- a/.config/emacs/modules/bd--shells.el +++ b/.config/emacs/modules/bd--shells.el @@ -9,7 +9,7 @@ ;;;; eshell ;; path -(add-to-list 'exec-path "/home/bdunahu/Personal/scripts") +(add-to-list 'exec-path "/home/bdunahu/.local/bin") ;; alias diff --git a/.config/guix/hati.scm b/.config/guix/hati.scm index ba27501..0c76722 100644 --- a/.config/guix/hati.scm +++ b/.config/guix/hati.scm @@ -9,6 +9,7 @@ #:use-module (gnu) #:use-module (gnu home) #:use-module (gnu home services) + #:use-module (gnu home services syncthing) #:use-module (gnu packages) #:use-module (gnu services) #:use-module (gnu services guix) @@ -21,7 +22,8 @@ (home-environment (services `(,@bd-base-home-services - ,@bd-desktop-home-services)))) + ,@bd-desktop-home-services + ,(service home-syncthing-service-type))))) (operating-system diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm index 6704959..c7559ed 100644 --- a/.config/guix/modules/base.scm +++ b/.config/guix/modules/base.scm @@ -140,7 +140,7 @@ alias | sed -E \"s/^alias ([^=]+)='(.*)'$/alias \\1 \\2 \\$*/g; s/'\\\\\\''/'/g;\" >~/.config/emacs/eshell/alias # add my scripts to path -PATH=${HOME}/Personal/scripts:$PATH"))) +PATH=${HOME}/.local/bin:$PATH"))) (environment-variables '(("BROWSER" . "icecat"))))) @@ -163,13 +163,13 @@ PATH=${HOME}/Personal/scripts:$PATH"))) (service home-xdg-user-directories-service-type (home-xdg-user-directories-configuration (desktop "$HOME") - (documents "$HOME") + (documents "$HOME/dc") (download "$HOME/dl") - (music "$HOME/media") - (pictures "$HOME/media") + (music "$HOME/ik") + (pictures "$HOME/wf") (publicshare "$HOME") (templates "$HOME") - (videos "$HOME/media"))) + (videos "$HOME/md"))) (service home-xdg-mime-applications-service-type (home-xdg-mime-applications-configuration diff --git a/.config/guix/modules/dwm/config.def.h b/.config/guix/modules/dwm/config.def.h index d588338..0f24d2d 100644 --- a/.config/guix/modules/dwm/config.def.h +++ b/.config/guix/modules/dwm/config.def.h @@ -103,7 +103,7 @@ static const Key keys[] = { { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { MODKEY|ShiftMask, XK_b, spawn, {.v = icecmd } }, { MODKEY|ShiftMask, XK_c, spawn, {.v = wolfcmd } }, - { MODKEY|ShiftMask, XK_o, spawn, SHCMD("xdotool type $(grep -v '^#' /home/bdunahu/Personal/scripts/bookmarks.txt | dmenu -i -l 4 | awk '{print $NF}')") }, + { MODKEY|ShiftMask, XK_o, spawn, SHCMD("xdotool type $(grep -v '^#' /home/bdunahu/.local/bin/bookmarks.txt | dmenu -i -l 4 | awk '{print $NF}')") }, { MODKEY|ShiftMask, XK_p, spawn, SHCMD("passmenu --type") }, { 0, XK_F2, spawn, {.v = lowerbgt } }, { 0, XK_F3, spawn, {.v = upperbgt } }, diff --git a/.config/guix/modules/mpd.scm b/.config/guix/modules/mpd.scm index d27fa90..ce70dfb 100644 --- a/.config/guix/modules/mpd.scm +++ b/.config/guix/modules/mpd.scm @@ -16,6 +16,6 @@ (service mpd-service-type (mpd-configuration (user user) - (music-directory "~/Personal/mpd/music") - (playlist-directory "~/Personal/mpd/playlist") + (music-directory "~/ik/music") + (playlist-directory "~/ik/playlist") (default-port 6600))))) diff --git a/.config/guix/vali.scm b/.config/guix/vali.scm index f4e34a4..0bd88b2 100644 --- a/.config/guix/vali.scm +++ b/.config/guix/vali.scm @@ -9,9 +9,11 @@ #:use-module (gnu) #:use-module (gnu home) #:use-module (gnu home services) + #:use-module (gnu home services syncthing) #:use-module (gnu packages) #:use-module (gnu services) #:use-module (gnu services guix) + #:use-module (gnu services syncthing) #:use-module (guix gexp) #:use-module (mpd) #:use-module (ymir)) @@ -21,7 +23,8 @@ (home-environment (services `(,@bd-base-home-services - ,@bd-desktop-home-services)))) + ,@bd-desktop-home-services + ,(service home-syncthing-service-type))))) (operating-system @@ -57,7 +60,7 @@ 'fat32)) (type "vfat")) (file-system - (mount-point "/home/bdunahu/Personal") + (mount-point "/home") (device "/dev/mapper/hidden") (type "ext4") (dependencies mapped-devices)) |