diff --git a/desktop.org b/desktop.org index 98627ff..3430789 100644 --- a/desktop.org +++ b/desktop.org @@ -10,6 +10,9 @@ I prefer to use programs that I can extend the functionality of via configuratio # Background exec_always --no-startup-id feh --bg-scale ~/dotfiles/guix/home/files/wallpapers/fog-wallpaper.jpg +# Redshift +exec_always --no-startup-id redshift + # Picom exec_always --no-startup-id picom & @@ -844,13 +847,6 @@ alias pull="guix pull" alias upgrade="guix package -u" alias hreconfig="guix home reconfigure ~/dotfiles/guix/home/guix-home.scm" -# ~ Search history with up and down arrows ~ # -# Up Arrow -bind '"\e[A": history-search-backward' -# Down Arrow -bind '"\e[B": history-search-forward' - - # ~ Commands ~ # alias ip="ip -c" alias rm="rm -i" @@ -876,6 +872,9 @@ mk () { mkdir -p -- "$1" && cd -P -- "$1" } #+end_src ** zprofile #+begin_src shell :tangle ~/dotfiles/guix/home/files/zsh/zprofile :mkdirp yes +HOME_ENVIRONMENT=$HOME/.guix-home +. $HOME_ENVIRONMENT/setup-environment +$HOME_ENVIRONMENT/on-first-login # Each new shell auto-imports all environment variables. # Hence exporting needs to be done only once. # Also, all non-login shells are descendants of a login shell. @@ -987,6 +986,20 @@ frame_color = "#bf616a" timeout = 0 #+end_src +* Redshift +#+begin_src shell :tangle ~/dotfiles/guix/home/files/redshift/redshift.conf :mkdirp yes +[redshift] +temp-day=5700 +temp-night=3400 +fade=1 +location-provider=manual +adjustment-method=randr + +[manual] +lat=47.6 +lon=-122.3 +#+end_src + * XDG User Directories #+begin_src shell :tangle ~/dotfiles/guix/home/files/user-dirs.dirs :mkdirp yes # This file is written by xdg-user-dirs-update diff --git a/guix.org b/guix.org index 22f2923..3dc4dc4 100644 --- a/guix.org +++ b/guix.org @@ -70,6 +70,7 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper (gnu packages base) (gnu packages xorg) (gnu packages dns) + (gnu packages kde-frameworks) (gnu services) (guix gexp)) @@ -93,10 +94,13 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper ;; Admin (list inetutils - bind wget curl - zip) + zip + seahorse + network-manager + networkmanager-qt + network-manager-applet) ;; Tools/Libraries (list unzip @@ -256,6 +260,13 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper ,(local-file (string-append (getenv "HOME") "/dotfiles/guix/home/files/zsh/zsh_functions"))))) + (simple-service 'redshift-config + home-files-service-type + (list + `("config/redshift/redshift.conf" + ,(local-file + (string-append (getenv "HOME") + "/dotfiles/guix/home/files/redshift/redshift.conf"))))) (simple-service 'xmodmap-config home-files-service-type (list @@ -332,6 +343,7 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper (gnu packages gnome) (gnu packages shells) (gnu packages emacs) + (gnu packages kde-frameworks) (gnu system setuid) (nongnu packages linux)) @@ -354,6 +366,8 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper (setuid-program (program (file-append package file)))))) (cons* (from i3lock "/bin/i3lock") (from network-manager "/bin/nmtui") + (from networkmanager-qt "/bin/nm-connection-editor") + (from network-manager-applet "/bin/nm-applet") %setuid-programs))) (users (cons* (user-account (name "opal") @@ -373,6 +387,8 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper i3status git network-manager + networkmanager-qt + network-manager-applet icecat emacs bluez @@ -385,6 +401,7 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper (services (append (list (service gnome-desktop-service-type) + (service gnome-keyring-service-type) (service openssh-service-type) (service tor-service-type) (service cups-service-type) diff --git a/guix/home/files/i3/config b/guix/home/files/i3/config index 180a715..45c3f2d 100644 --- a/guix/home/files/i3/config +++ b/guix/home/files/i3/config @@ -2,6 +2,9 @@ # Background exec_always --no-startup-id feh --bg-scale ~/dotfiles/guix/home/files/wallpapers/fog-wallpaper.jpg +# Redshift +exec_always --no-startup-id redshift + # Picom exec_always --no-startup-id picom & diff --git a/guix/home/files/zsh/zprofile b/guix/home/files/zsh/zprofile index 85f089e..7f1f08c 100644 --- a/guix/home/files/zsh/zprofile +++ b/guix/home/files/zsh/zprofile @@ -1,3 +1,6 @@ +HOME_ENVIRONMENT=$HOME/.guix-home +. $HOME_ENVIRONMENT/setup-environment +$HOME_ENVIRONMENT/on-first-login # Each new shell auto-imports all environment variables. # Hence exporting needs to be done only once. # Also, all non-login shells are descendants of a login shell. diff --git a/guix/home/files/zsh/zsh_aliases b/guix/home/files/zsh/zsh_aliases index 24730ca..27af134 100644 --- a/guix/home/files/zsh/zsh_aliases +++ b/guix/home/files/zsh/zsh_aliases @@ -6,13 +6,6 @@ alias pull="guix pull" alias upgrade="guix package -u" alias hreconfig="guix home reconfigure ~/dotfiles/guix/home/guix-home.scm" -# ~ Search history with up and down arrows ~ # -# Up Arrow -bind '"\e[A": history-search-backward' -# Down Arrow -bind '"\e[B": history-search-forward' - - # ~ Commands ~ # alias ip="ip -c" alias rm="rm -i" @@ -22,6 +15,8 @@ alias ols="ls-with-file-mode-bits.sh" alias unmount="umount" alias please="sudo" alias yeet="rm -rf" +alias :q='echo This aint a file, dingus.' +alias :wq='echo This aint a file, dingus.' # ~ Source Zsh Configuration ~ # alias zshrcsource="source ~/dotfiles/guix/home/files/zsh/zshrc" diff --git a/guix/home/guix-home.scm b/guix/home/guix-home.scm index 81a51bc..c1a0e9a 100644 --- a/guix/home/guix-home.scm +++ b/guix/home/guix-home.scm @@ -43,6 +43,7 @@ (gnu packages base) (gnu packages xorg) (gnu packages dns) + (gnu packages kde-frameworks) (gnu services) (guix gexp)) @@ -66,10 +67,13 @@ ;; Admin (list inetutils - \bind wget curl - zip) + zip + seahorse + network-manager + networkmanager-qt + network-manager-applet) ;; Tools/Libraries (list unzip @@ -137,6 +141,7 @@ ;; Languages (list ruby + picolisp python guile-3.0 sbcl @@ -228,6 +233,13 @@ ,(local-file (string-append (getenv "HOME") "/dotfiles/guix/home/files/zsh/zsh_functions"))))) + (simple-service 'redshift-config + home-files-service-type + (list + `("config/redshift/redshift.conf" + ,(local-file + (string-append (getenv "HOME") + "/dotfiles/guix/home/files/redshift/redshift.conf"))))) (simple-service 'xmodmap-config home-files-service-type (list diff --git a/guix/system/apollyon.scm b/guix/system/apollyon.scm index 473f638..8a4dff0 100644 --- a/guix/system/apollyon.scm +++ b/guix/system/apollyon.scm @@ -13,6 +13,7 @@ (gnu packages gnome) (gnu packages shells) (gnu packages emacs) + (gnu packages kde-frameworks) (gnu system setuid) (nongnu packages linux)) @@ -35,6 +36,8 @@ (setuid-program (program (file-append package file)))))) (cons* (from i3lock "/bin/i3lock") (from network-manager "/bin/nmtui") + (from networkmanager-qt "/bin/nm-connection-editor") + (from network-manager-applet "/bin/nm-applet") %setuid-programs))) (users (cons* (user-account (name "opal") @@ -54,6 +57,8 @@ i3status git network-manager + networkmanager-qt + network-manager-applet icecat emacs bluez @@ -66,6 +71,7 @@ (services (append (list (service gnome-desktop-service-type) + (service gnome-keyring-service-type) (service openssh-service-type) (service tor-service-type) (service cups-service-type)