diff options
| -rw-r--r-- | .config/emacs/bd-development.el | 42 | ||||
| -rw-r--r-- | .config/emacs/init.el | 5 | ||||
| -rw-r--r-- | src/guix-config/bdunahu-config.scm | 72 | ||||
| -rw-r--r-- | src/guix-config/bdunahu-config.scm~ | 81 | ||||
| -rw-r--r-- | src/guix-config/home-configuration.scm | 39 | ||||
| -rw-r--r-- | src/guix-config/system-config.scm | 8 | ||||
| -rw-r--r-- | src/guix-config/system-config.scm~ | 89 |
7 files changed, 239 insertions, 97 deletions
diff --git a/.config/emacs/bd-development.el b/.config/emacs/bd-development.el index 18bc6d5..0e9ae03 100644 --- a/.config/emacs/bd-development.el +++ b/.config/emacs/bd-development.el @@ -22,22 +22,22 @@ Exempt major modes are defined in `display-line-numbers-exempt-modes'." (member major-mode display-line-numbers-exempt-modes)) (display-line-numbers-mode))) -(use-package tex - :ensure auctex - :hook - ((latex-mode) - (text-mode . (lambda() (setq ispell-parser 'tex)))) ; improves ispell in LaTeX - :custom - (TeX-auto-save t) - ;; better support for latex packages - (TeX-parse-self t) - (TeX-view-program-selection '(((output-dvi has-no-display-manager) - "dvi2tty") - ((output-dvi style-pstricks) - "dvips and gv") - (output-dvi "xdvi") - (output-pdf "Zathura") - (output-html "xdg-open")))) +;; (use-package tex +;; :ensure auctex +;; :hook +;; ((latex-mode) +;; (text-mode . (lambda() (setq ispell-parser 'tex)))) ; improves ispell in LaTeX +;; :custom +;; (TeX-auto-save t) +;; ;; better support for latex packages +;; (TeX-parse-self t) +;; (TeX-view-program-selection '(((output-dvi has-no-display-manager) +;; "dvi2tty") +;; ((output-dvi style-pstricks) +;; "dvips and gv") +;; (output-dvi "xdvi") +;; (output-pdf "Zathura") +;; (output-html "xdg-open")))) (use-package company :hook (prog-mode text-mode) @@ -79,15 +79,5 @@ Exempt major modes are defined in `display-line-numbers-exempt-modes'." (use-package python :mode (("\\.py\\'" . python-ts-mode))) -(use-package conda - :after python - :config - (conda-env-initialize-interactive-shells) - (custom-set-variables '(conda-anaconda-home "/home/bdunahu/miniforge3/")) - ;; kind of bad - (when (executable-find "ipython") - (setq python-shell-interpreter "ipython" - python-shell-interpreter-args "--simple-prompt"))) - ;; compilation mode (setq compilation-always-kill t) diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 348cbc8..b06bde0 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -76,13 +76,14 @@ in-place, the old list reference does not remain valid." (global-unset-key (kbd "C-z")) (require 'package) +(add-to-list 'load-path "/home/bdunahu/.guix-profile/share/emacs/site-lisp") +(guix-emacs-autoload-packages) (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/")) (package-initialize) (package-refresh-contents) -;; (setq use-package-verbose t) ; for debugging - (require 'use-package-ensure) (setq use-package-always-ensure t) +;; (setq use-package-verbose t) ; for debugging (load "/home/bdunahu/.config/emacs/bd-org.el") (load "/home/bdunahu/.config/emacs/bd-emms.el") diff --git a/src/guix-config/bdunahu-config.scm b/src/guix-config/bdunahu-config.scm index ddf62bd..303e2d6 100644 --- a/src/guix-config/bdunahu-config.scm +++ b/src/guix-config/bdunahu-config.scm @@ -6,39 +6,53 @@ (use-modules (gnu home) (gnu packages) + (gnu packages gnupg) (gnu services) (guix gexp) + (gnu home services shepherd) (gnu home services shells) - (gnu home services shepherd) + (gnu home services gnupg) + (gnu home services pm) (gnu home services ssh)) (home-environment ;; Below is the list of packages that will show up in your ;; Home profile, under ~/.guix-home/profile. - (packages (specifications->packages (list "dmenu" - "feh" - "flameshot" - "gimp" - "icecat" - "libnotify" - ;; "mpc" - "password-store" - "pass-otp" - "rsync" - "sbcl" - "slock" - ;; "texlive" - "xset" - "yt-dlp" - "zathura" - "zathura-pdf-poppler"))) + (packages (specifications->packages (list ;; "dmenu" + "emacs-all-the-icons" + "emacs-auctex" + "emacs-company" + "emacs-emms" + "emacs-exwm" + "emacs-magit" + "emacs-org-roam" + "emacs-slime" + "feh" + "flameshot" + ;; "gimp" + ;; "htop" + "icecat" + ;; "libnotify" + ;; "mpc" + ;; "mpv" + "password-store" + "pass-otp" + "pinentry-emacs" + "rsync" + "sbcl" + ;; "slock" + ;; "texlive" + "xset" + "yt-dlp" + "zathura" + "zathura-pdf-poppler"))) ;; Below is the list of Home services. To search for available ;; services, run 'guix home search KEYWORD' in a terminal. (services (list (service home-bash-service-type (home-bash-configuration - (aliases '(("c" . "clear") ("cp" . "cp -i") + (aliases '(("cp" . "cp -i") ("grep" . "grep --color=auto") ("ll" . "ls -l") ("ls" . "ls -p --color=auto") @@ -49,8 +63,13 @@ ("ytta" . "yt-dlp --paths /home/bdunahu/Media/Audio --extract-audio --format bestaudio/best") ("yttv" . "yt-dlp --paths /home/bdunahu/Media/Videos -f b"))) (bashrc (list (local-file - "/home/bdunahu/src/guix-config//.bashrc" + "/home/bdunahu/.config/guix-builds//.bashrc" "bashrc"))))) + ;; (service home-batsignal-service-type + ;; (home-batsignal-configuration + ;; (warning-level 25) + ;; (critical-level 10) + ;; (danger-level 5))) (service home-openssh-service-type (home-openssh-configuration (hosts @@ -59,8 +78,13 @@ (user "bdunahu")) (openssh-host (name "vali") (host-name "192.168.1.64") + (user "bdunahu")) + (openssh-host (name "perch") + (host-name "perch.cs.colostate.edu") (user "bdunahu")))))) - (service home-shepherd-service-type) - ;; (service home-xdg-configuration-files-service-type - ;; `(("emacs/init.el" ,(local-file "init.el")))) - ))) + ;; (service home-gpg-agent-service-type + ;; (home-gpg-agent-configuration + ;; (pinentry-program + ;; (file-append pinentry-emacs "/bin/pinentry-emacs")) + ;; (ssh-support? #t))) + (service home-shepherd-service-type)))) diff --git a/src/guix-config/bdunahu-config.scm~ b/src/guix-config/bdunahu-config.scm~ new file mode 100644 index 0000000..d059bb5 --- /dev/null +++ b/src/guix-config/bdunahu-config.scm~ @@ -0,0 +1,81 @@ +;; This "home-environment" file can be passed to 'guix home reconfigure' +;; to reproduce the content of your profile. This is "symbolic": it only +;; specifies package names. To reproduce the exact same profile, you also +;; need to capture the channels being used, as returned by "guix describe". +;; See the "Replicating Guix" section in the manual. + +(use-modules (gnu home) + (gnu packages) + (gnu packages gnupg) + (gnu services) + (guix gexp) + (gnu home services shepherd) + (gnu home services shells) + (gnu home services gnupg) + (gnu home services pm) + (gnu home services ssh)) + +(home-environment + ;; Below is the list of packages that will show up in your + ;; Home profile, under ~/.guix-home/profile. + (packages (specifications->packages (list "dmenu" + "feh" + "flameshot" + "gimp" + "icecat" + "libnotify" + ;; "mpc" + "password-store" + "pass-otp" + "pinentry-emacs" + "rsync" + "sbcl" + "slock" + ;; "texlive" + "xset" + "yt-dlp" + "zathura" + "zathura-pdf-poppler"))) + + ;; Below is the list of Home services. To search for available + ;; services, run 'guix home search KEYWORD' in a terminal. + (services + (list (service home-bash-service-type + (home-bash-configuration + (aliases '(("c" . "clear") ("cp" . "cp -i") + ("grep" . "grep --color=auto") + ("ll" . "ls -l") + ("ls" . "ls -p --color=auto") + ("mkd" . "mkdir -pv") + ("mv" . "mv -i") + ("rm" . "rm -i") + ("vi" . "vim") + ("ytta" . "yt-dlp --paths /home/bdunahu/Media/Audio --extract-audio --format bestaudio/best") + ("yttv" . "yt-dlp --paths /home/bdunahu/Media/Videos -f b"))) + (bashrc (list (local-file + "/home/bdunahu/src/guix-config//.bashrc" + "bashrc"))))) + (service home-batsignal-service-type + (home-batsignal-configuration + (warning-level 25) + (critical-level 10) + (danger-level 5))) + (service home-openssh-service-type + (home-openssh-configuration + (hosts + (list (openssh-host (name "desk") + (host-name "192.168.1.68") + (user "bdunahu")) + (openssh-host (name "vali") + (host-name "192.168.1.64") + (user "bdunahu")) + (openssh-host (name "perch") + (host-name "perch.cs.colostate.edu") + (user "bdunahu")))))) + (service home-gpg-agent-service-type + (home-gpg-agent-configuration + (pinentry-program + (file-append pinentry-emacs "/bin/pinentry-emacs")) + (ssh-support? #t))) + (service home-shepherd-service-type) + ))) diff --git a/src/guix-config/home-configuration.scm b/src/guix-config/home-configuration.scm deleted file mode 100644 index d817f36..0000000 --- a/src/guix-config/home-configuration.scm +++ /dev/null @@ -1,39 +0,0 @@ -;; This "home-environment" file can be passed to 'guix home reconfigure' -;; to reproduce the content of your profile. This is "symbolic": it only -;; specifies package names. To reproduce the exact same profile, you also -;; need to capture the channels being used, as returned by "guix describe". -;; See the "Replicating Guix" section in the manual. - -(use-modules (gnu home) - (gnu packages) - (gnu services) - (guix gexp) - (gnu home services shells)) - -(home-environment - ;; Below is the list of packages that will show up in your - ;; Home profile, under ~/.guix-home/profile. - (packages (specifications->packages (list "netcat" "password-store" "dmenu" - "xset"))) - - ;; Below is the list of Home services. To search for available - ;; services, run 'guix home search KEYWORD' in a terminal. - (services - (list (service home-bash-service-type - (home-bash-configuration - (aliases '(("c" . "clear") ("cp" . "cp -i") - ("grep" . "grep --color=auto") - ("ip" . "ip -color=auto") - ("ll" . "ls -l") - ("ls" . "ls -p --color=auto") - ("mkd" . "mkdir -pv") - ("mv" . "mv -i") - ("rm" . "rm -i") - ("vi" . "vim") - ("ytta" . "yt-dlp --paths /home/bdunahu/Media/Audio --extract-audio --format bestaudio/best") - ("yttv" . "yt-dlp --paths /home/bdunahu/Media/Videos -f b"))) - (bashrc (list (local-file "src/guix-config//.bashrc" - "bashrc"))) - (bash-profile (list (local-file - "src/guix-config//.bash_profile" - "bash_profile")))))))) diff --git a/src/guix-config/system-config.scm b/src/guix-config/system-config.scm index 539411f..4603b32 100644 --- a/src/guix-config/system-config.scm +++ b/src/guix-config/system-config.scm @@ -31,14 +31,10 @@ "emacs-exwm" "emacs-desktop-environment" "git" - "htop" "imagemagick" "mpd" - "mpv" "nss-certs" "picom" - "pinentry" - "stow" "vim" "xmodmap")) %base-packages)) @@ -74,7 +70,7 @@ ;; by running 'blkid' in a terminal. (file-systems (cons* (file-system (mount-point "/boot/efi") - (device (uuid "445A-BE61" + (device (uuid "8A13-7018" 'fat32)) (type "vfat")) (file-system @@ -84,6 +80,6 @@ (file-system (mount-point "/") (device (uuid - "98a6a953-1689-4a0f-a43b-f73c5a5d3e51" + "69a3593b-12bd-40ad-a932-007674a8cfe8" 'ext4)) (type "ext4")) %base-file-systems))) diff --git a/src/guix-config/system-config.scm~ b/src/guix-config/system-config.scm~ new file mode 100644 index 0000000..539411f --- /dev/null +++ b/src/guix-config/system-config.scm~ @@ -0,0 +1,89 @@ +;; Indicate which modules to import to access the variables +;; used in this configuration. +(use-modules (gnu)) +(use-service-modules audio desktop networking ssh xorg) + +(define username "bdunahu") +(define host-name "vali") + +(define user (user-account + (name username) + (comment username) + (group "users") + (home-directory (string-append "/home/" username)) + (supplementary-groups '("wheel" "netdev" "audio" "video")))) + +(operating-system + (locale "en_US.utf8") + (timezone "America/Denver") + (keyboard-layout (keyboard-layout "us")) + (host-name host-name) + + ;; The list of user accounts ('root' is implicit). + (users (cons* user + %base-user-accounts)) + + ;; Packages installed system-wide. Users can also install packages + ;; under their own account: use 'guix search KEYWORD' to search + ;; for packages and 'guix install PACKAGE' to install a package. + (packages (append (map specification->package + '("emacs" + "emacs-exwm" + "emacs-desktop-environment" + "git" + "htop" + "imagemagick" + "mpd" + "mpv" + "nss-certs" + "picom" + "pinentry" + "stow" + "vim" + "xmodmap")) + %base-packages)) + + ;; Below is the list of system services. To search for available + ;; services, run 'guix system search KEYWORD' in a terminal. + (services + (append (list + + ;; To configure OpenSSH, pass an 'openssh-configuration' + ;; record as a second argument to 'service' below. + (service openssh-service-type) + (service tor-service-type) + (service mpd-service-type + (mpd-configuration + (user user) + (music-directory "~/Personal/mpd/music") + (playlist-directory "~/Personal/mpd/playlist") + (default-port 6600))) + (set-xorg-configuration + (xorg-configuration (keyboard-layout keyboard-layout)))) + + ;; This is the default list of services we + ;; are appending to. + %desktop-services)) + (bootloader (bootloader-configuration + (bootloader grub-efi-bootloader) + (targets (list "/boot/efi")) + (keyboard-layout keyboard-layout))) + + ;; The list of file systems that get "mounted". The unique + ;; file system identifiers there ("UUIDs") can be obtained + ;; by running 'blkid' in a terminal. + (file-systems (cons* (file-system + (mount-point "/boot/efi") + (device (uuid "445A-BE61" + 'fat32)) + (type "vfat")) + (file-system + (mount-point "/home/bdunahu/Personal") + (device (uuid "020b73df-3991-4271-9d3f-dba00ad260ec")) + (type "ext4")) + (file-system + (mount-point "/") + (device (uuid + "98a6a953-1689-4a0f-a43b-f73c5a5d3e51" + 'ext4)) + (type "ext4")) %base-file-systems))) |