diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 2097e6d..f4ee5e9 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -47,6 +47,11 @@ :init (doom-modeline-mode 1) :custom ((doom-modeline-height 15))) +;; install all-the-icons when first loading the emacs conf +;; remember to run M-x all-the-icons-install-fonts +(when (display-graphic-p) + (use-package all-the-icons :straight t)) + (use-package which-key :straight t :defer 0 @@ -77,7 +82,7 @@ (use-package super-save :straight t - :config + :config (super-save-mode +1)) ;; Auto reverting Changed Files diff --git a/.config/guix/system.scm b/.config/guix/system.scm deleted file mode 100644 index d5ebd0d..0000000 --- a/.config/guix/system.scm +++ /dev/null @@ -1,75 +0,0 @@ -;; This is an operating system configuration generated -;; by the graphical installer. - -(use-modules (gnu) - (nongnu packages linux)) - -(use-service-modules - cups - desktop - networking - ssh - xorg) - -(operating-system - (kernel linux) - (firmware (list linux-firmware)) - (locale "en_US.utf8") - (timezone "America/Los_Angeles") - (keyboard-layout (keyboard-layout "us")) - (host-name "borges") - (users (cons* (user-account - (name "opal") - (comment "opal") - (group "users") - (home-directory "/home/opal") - (supplementary-groups - '("wheel" - "netdev" - "audio" - "video"))) - %base-user-accounts)) - (packages - (append - (list (specification->package "awesome") - (specification->package "nss-certs") - (specification->package "xterm") - (specification->package "emacs") - (specification->package "git") - (specification->package "bluez") - (specification->package "bluez-alsa") - (specification->package "pulseaudio") - (specification->package "vim") - (specification->package "exfat-utils") - (specification->package "stow") - (specification->package "stumpwm")) - %base-packages)) - (services - (append - (list (service gnome-desktop-service-type) - (set-xorg-configuration - (xorg-configuration - (keyboard-layout keyboard-layout)))) - %desktop-services)) - (bootloader - (bootloader-configuration - (bootloader grub-efi-bootloader) - (targets (list "/boot/efi")) - (keyboard-layout keyboard-layout))) - (mapped-devices - (list (mapped-device - (source - (uuid "40aa6387-e935-4f70-8e7d-1975678a5a32")) - (target "cryptroot") - (type luks-device-mapping)))) - (file-systems - (cons* (file-system - (mount-point "/") - (device "/dev/mapper/cryptroot") - (type "btrfs") - (dependencies mapped-devices)) - (file-system - (mount-point "/boot/efi") - (device (uuid "1C3B-10F5" 'fat32)) - (type "vfat")) - %base-file-systems))) diff --git a/.gitignore b/.gitignore index 44e81ee..df5610b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ !.config/guix !.config/stumpwm !.config/mbsync +!.config/nyxt !.config/nvim/init.vim !.config/zsh/.zshrc !.config/zsh/.zprofile diff --git a/Emacs.org b/Emacs.org index e82e1cb..21c30f6 100644 --- a/Emacs.org +++ b/Emacs.org @@ -66,6 +66,11 @@ Doom's modeline is excellent, and much less cluttered than the default Emacs mod :straight t :init (doom-modeline-mode 1) :custom ((doom-modeline-height 15))) + +;; install all-the-icons when first loading the emacs conf +;; remember to run M-x all-the-icons-install-fonts +(when (display-graphic-p) + (use-package all-the-icons :straight t)) #+end_src *** Keybinding display @@ -116,7 +121,7 @@ Helpful.el is a package that reformats the describe-X functions to be much more #+begin_src emacs-lisp (use-package super-save :straight t - :config + :config (super-save-mode +1)) ;; Auto reverting Changed Files diff --git a/Guix.org b/Guix.org index efa72aa..2612231 100644 --- a/Guix.org +++ b/Guix.org @@ -1,10 +1,31 @@ #+TITLE: Guix Configuration -Disclaimer: I use the nonguix channel only for the use of Firefox (which I hope to replace with Nyxt Browser in the future). I do not use non-free software or non-free drivers/firmware on any machine I own, nor do I advocate for the use of the nonguix channel. +I use GNU Guix as my operating system. I'm able to declare the state of the operating system in a series of configuration files in a similar way to Puppet. Eventually I would like to integrate Guix Home into this configuration. -I use GNU Guix as my operating system. I'm able to declare the state of the operating system in a series of configuration files in a similar way to Puppet. Eventually I would like to integrate Guix Home into this configuration. +* Channels +Disclaimer: I use the nonguix channel only for the use of building Firefox from source easily. #+begin_src scheme +(list (channel + (name 'guix) + (url "https://git.savannah.gnu.org/git/guix.git") + (introduction + (make-channel-introduction + "9edb3f66fd807b096b48283debdcddccfea34bad" + (openpgp-fingerprint + "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))) + (channel + (name 'nonguix) + (url "https://gitlab.com/nonguix/nonguix") + (introduction + (make-channel-introduction + "897c1a470da759236cc11798f4e0a5f7d4d59fbc" + (openpgp-fingerprint + "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))) +#+end_src + +* Home Desktop +#+begin_src scheme :tangle ~/Dotfiles/.config/guix/home-desk.scm :mkdirp yes (use-modules (gnu) (nongnu packages linux)) @@ -35,19 +56,25 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper %base-user-accounts)) (packages (append - (list (specification->package "awesome") - (specification->package "nss-certs") - (specification->package "xterm") - (specification->package "emacs") - (specification->package "git") - (specification->package "bluez") - (specification->package "bluez-alsa") - (specification->package "pulseaudio") - (specification->package "vim") - (specification->package "exfat-utils") - (specification->package "stow") - (specification->package "stumpwm")) - %base-packages)) + (list + (specification->package "git") + (specification->package "xclip") + (specification->package "vim") + (specification->package "nss-certs") + (specification->package "stow") + (specification->package "exfat-utils") + (specification->package "emacs") + (specification->package "emacs-exwm") + (specification->package "bluez") + (specification->package "bluez-alsa") + (specification->package "pulseaudio") + (specification->package "nyxt") + (specification->package "keepassxc") + (specification->package "font-fira-mono") + (specification->package "font-fira-sans") + (specification->package "font-fira-code") + (specification->package "gnome-tweaks")) + %base-packages)) (services (append (list (service gnome-desktop-service-type) @@ -78,3 +105,83 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper (type "vfat")) %base-file-systems))) #+end_src + +* Work Laptop + +#+begin_src scheme :tangle ~/Dotfiles/.config/guix/work-laptop.scm :mkdirp yes +(use-modules (gnu) + (nongnu packages linux)) +(use-service-modules + cups + desktop + networking + ssh + xorg) + +(operating-system + (kernel linux) + (firmware (list linux-firmware)) + (locale "en_US.utf8") + (timezone "America/Los_Angeles") + (keyboard-layout (keyboard-layout "us")) + (host-name "work") + (users (cons* (user-account + (name "opal") + (comment "Opal") + (group "users") + (home-directory "/home/opal") + (supplementary-groups + '("wheel" "netdev" "audio" "video"))) + %base-user-accounts)) + (packages + (append + (list + (specification->package "git") + (specification->package "xclip") + (specification->package "vim") + (specification->package "nss-certs") + (specification->package "stow") + (specification->package "exfat-utils") + (specification->package "emacs") + (specification->package "emacs-exwm") + (specification->package "bluez") + (specification->package "bluez-alsa") + (specification->package "pulseaudio") + (specification->package "nyxt") + (specification->package "keepassxc") + (specification->package "font-fira-mono") + (specification->package "font-fira-sans") + (specification->package "font-fira-code") + (specification->package "gnome-tweaks")) + %base-packages)) + (services + (append + (list (service gnome-desktop-service-type) + (service cups-service-type) + (set-xorg-configuration + (xorg-configuration + (keyboard-layout keyboard-layout)))) + %desktop-services)) + (bootloader + (bootloader-configuration + (bootloader grub-efi-bootloader) + (targets (list "/boot/efi")) + (keyboard-layout keyboard-layout))) + (mapped-devices + (list (mapped-device + (source + (uuid "abe760e2-4ba5-4f43-81a2-1c3f16eb62a8")) + (target "cryptroot") + (type luks-device-mapping)))) + (file-systems + (cons* (file-system + (mount-point "/") + (device "/dev/mapper/cryptroot") + (type "btrfs") + (dependencies mapped-devices)) + (file-system + (mount-point "/boot/efi") + (device (uuid "15B3-5DE5" 'fat32)) + (type "vfat")) + %base-file-systems))) +#+end_src diff --git a/Nyxt.org b/Nyxt.org index d8abf56..b952e3d 100644 --- a/Nyxt.org +++ b/Nyxt.org @@ -15,7 +15,7 @@ Nyxt is a browser written in Common Lisp that follows the same philosophy of ext ((override-map (define-key %slot-default% "C-x s" 'nyxt/web-mode:search-buffers "C-x u" 'copy-username - "c-x p" 'copy-password)))) + "C-x p" 'copy-password)))) #+end_src * Theme @@ -128,7 +128,7 @@ Nyxt is a browser written in Common Lisp that follows the same philosophy of ext Password managers are an essential feature and thankfully Nyxt allows me to integrate KeepassXC which I use regularly. #+begin_src lisp (define-configuration password:keepassxc-interface - ((password:password-file "/home/opal/Documents/opal.kdbx"))) + ((password:password-file "/home/opal/.config/keepassxc/.kdbx-store/opal.kdbx"))) (define-configuration buffer ((password-interface (make-instance 'password:user-keepassxc-interface))))