aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Schanzenbacher <ryan@rschanz.org>2026-08-23 21:43:33 -0400
committerRyan Schanzenbacher <ryan@rschanz.org>2026-08-23 21:43:33 -0400
commitd40a56ec99137942d4c4058800d71743cb390be5 (patch)
tree4c1194441f2619b0a4e2489103a896e0d48a8e90
parent044a02a12449d8dbfd2f5e5e93319865372624a6 (diff)
move more packages and prep for migration
Diffstat
-rw-r--r--home-config/home-configuration.scm306
-rw-r--r--modules/ryan-config/base-system.scm92
2 files changed, 200 insertions, 198 deletions
diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index e7627d5..1436167 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -27,123 +27,123 @@
27 (rosenthal packages binaries) 27 (rosenthal packages binaries)
28 (ryan-packages mozilla)) 28 (ryan-packages mozilla))
29 29
30(define my-neovim 30; (define my-neovim
31 (package 31; (package
32 (inherit neovim) 32; (inherit neovim)
33 (native-inputs 33; (native-inputs
34 (modify-inputs (package-native-inputs neovim) 34; (modify-inputs (package-native-inputs neovim)
35 (prepend gcc-13))))) 35; (prepend gcc-13)))))
36 36
37(define %home-symlinks 37 (define %home-symlinks
38 `((".config/guix/home-config/fish" ".config/fish") 38; `((".config/guix/home-config/fish" ".config/fish")
39 (".config/guix/home-config/nix-config" ".config/nix") 39; (".config/guix/home-config/nix-config" ".config/nix")
40 (".config/guix/home-config/nix-combined" ".config/home-manager"))) 40 (".config/guix/home-config/nix-combined" ".config/home-manager")))
41 41
42(home-symlinks %home-symlinks) 42(home-symlinks %home-symlinks)
43 43
44(home-environment 44(home-environment
45 ;; Below is the list of packages that will show up in your 45 ;; Below is the list of packages that will show up in your
46 ;; Home profile, under ~/.guix-home/profile. 46 ;; Home profile, under ~/.guix-home/profile.
47 (packages (append (specifications->packages (list "bat" 47 ;(packages (append (specifications->packages (list ;"bat"
48 "fd" 48 ;"fd"
49 ;"fish" 49 ;"fish"
50 "xdg-utils" 50 ;"xdg-utils"
51 ;"abook" 51 ;"abook"
52 "libnotify" 52 ;"libnotify"
53 "fzf" 53 ;"fzf"
54 ;"waypipe" 54 ;"waypipe"
55 "foot" 55 ;"foot"
56 "pulseaudio" ;only for pactl 56 ;"pulseaudio" ;only for pactl
57 "qpwgraph" 57 ;"qpwgraph"
58 "gnunet" 58 ;"gnunet"
59 ;"ffmpeg" ; removed for mpv prop input 59 ;"ffmpeg" ; removed for mpv prop input
60 "qrencode" 60 ;"qrencode"
61 "tmux" 61 ;"tmux"
62 "binutils" 62 ;"binutils"
63 "gcc-toolchain" 63 ;"gcc-toolchain"
64 "borg" 64 ;"borg"
65 ;"restic" 65 ;"restic"
66 "rsync" 66 ;"rsync"
67 "cloc" 67 ;"cloc"
68 "sc-im" 68 ;"sc-im"
69 "pv" 69 ;"pv"
70 "jq" 70 ;"jq"
71 "gpgme" 71 ;"gpgme"
72 "bombadillo" 72 ;"bombadillo"
73 "python-msgpack" 73 ;"python-msgpack"
74 "wdisplays" 74 ;"wdisplays"
75 "kanshi" 75 ;"kanshi"
76 "libreoffice" 76 ;"libreoffice"
77 "flatpak" 77 ;"flatpak"
78 "gnupg" 78 ;"gnupg"
79 ;"spotifyd" 79 ;"spotifyd"
80 "lsof" 80 ;"lsof"
81 "pavucontrol" 81 ;"pavucontrol"
82 "netcat" 82 ;"netcat"
83 "bind:utils" 83 ;"bind:utils"
84 "font-cns11643-swjz" 84 ;"font-cns11643-swjz"
85 "font-google-noto-emoji" 85 ;"font-google-noto-emoji"
86 "syncthing" 86 ;"syncthing"
87 ;"taskwarrior" 87 ;"taskwarrior"
88 ;"tasksh" 88 ;"tasksh"
89 ;"imv" ; Nix pkg now for MESA stuff 89 ;"imv" ; Nix pkg now for MESA stuff
90 "perl" 90 ;"perl"
91 "tor" 91 ;"tor"
92 "unzip" 92 ;"unzip"
93 "htop" 93 ;"htop"
94 "curl" 94 ;"curl"
95 "pandoc" 95 ;"pandoc"
96 "texlive-bin" 96 ;"texlive-bin"
97 "texlive-scheme-basic" 97 ;"texlive-scheme-basic"
98 "texlive-txfonts" 98 ;"texlive-txfonts"
99 "texlive-amsfonts" 99 ;"texlive-amsfonts"
100 "texlive-lm" 100 ;"texlive-lm"
101 "texlive-lm-math" 101 ;"texlive-lm-math"
102 "texlive-iftex" 102 ;"texlive-iftex"
103 "texlive-unicode-math" 103 ;"texlive-unicode-math"
104 "texlive-fontspec" 104 ;"texlive-fontspec"
105 "texlive-xcolor" 105 ;"texlive-xcolor"
106 "texlive-geometry" 106 ;"texlive-geometry"
107 "texlive-hyperref" 107 ;"texlive-hyperref"
108 "texlive-parskip" 108 ;"texlive-parskip"
109 "texlive-etoolbox" 109 ;"texlive-etoolbox"
110 "texlive-setspace" 110 ;"texlive-setspace"
111 "texlive-booktabs" 111 ;"texlive-booktabs"
112 "texlive-mdwtools" 112 ;"texlive-mdwtools"
113 "texlive-caption" 113 ;"texlive-caption"
114 "texlive-diagbox" 114 ;"texlive-diagbox"
115 "texlive-pict2e" 115 ;"texlive-pict2e"
116 "texlive-ulem" 116 ;"texlive-ulem"
117 "texlive-pgf" 117 ;"texlive-pgf"
118 "zathura" 118 ;"zathura"
119 "zathura-pdf-mupdf" 119 ;"zathura-pdf-mupdf"
120 "go" 120 ;"go"
121 "fzf" 121 ;"fzf"
122 "weechat" 122 ;"weechat"
123 "gimp" 123 ;"gimp"
124 "python" 124 ;"python"
125 "python:tk" 125 ;"python:tk"
126 "file" 126 ;"file"
127 "python-lsp-server" 127 ;"python-lsp-server"
128 ;"kdenlive" 128 ;"kdenlive"
129 "sqlite" 129 ;"sqlite"
130 ;"mpv" ; Now a nix pkg for MESA stuff 130 ;"mpv" ; Now a nix pkg for MESA stuff
131 "qbittorrent" 131 ;"qbittorrent"
132 "playerctl" 132 ;"playerctl"
133 ;"aerc" 133 ;"aerc"
134 "tcpdump" 134 ;"tcpdump"
135 "pamixer" 135 ;"pamixer"
136 "git" 136 ;"git"
137 "git:send-email" 137 ;"git:send-email"
138 "password-store" 138 ;"password-store"
139 "node" 139 ;"node"
140 "kanshi" 140 ;"kanshi"
141 ;"firefox" 141 ;"firefox"
142 "signal-desktop" 142 ;"signal-desktop"
143 "sc-im" 143 ;"sc-im"
144 "tree-sitter-cli" 144 ;"tree-sitter-cli"
145 "git-lfs")) 145 ;"git-lfs"))
146 (list calcurse-fixed ))) 146 ;(list calcurse-fixed )))
147 147
148 ;; Below is the list of Home services. To search for available 148 ;; Below is the list of Home services. To search for available
149 ;; services, run 'guix home search KEYWORD' in a terminal. 149 ;; services, run 'guix home search KEYWORD' in a terminal.
@@ -158,64 +158,65 @@
158 "bashrc"))) 158 "bashrc")))
159 (bash-profile (list (local-file 159 (bash-profile (list (local-file
160 "bash_profile"))))) 160 "bash_profile")))))
161 (service home-xdg-configuration-files-service-type 161 ;(service home-xdg-configuration-files-service-type
162 `(("nvim/init.vim" ,(local-file "nvim/config/init.vim")) 162 ; Migrated to nix
163 ("nvim/after/ftplugin/markdown/custom.vim" ,(local-file "nvim/config/after/ftplugin/markdown/custom.vim")) 163 ;`(("nvim/init.vim" ,(local-file "nvim/config/init.vim"))
164 ("nvim/after/ftplugin/mail/custom.vim" ,(local-file "nvim/config/after/ftplugin/mail/custom.vim")) 164 ;("nvim/after/ftplugin/markdown/custom.vim" ,(local-file "nvim/config/after/ftplugin/markdown/custom.vim"))
165 ("sway" ,(local-file "sway" #:recursive? #t)) 165 ;("nvim/after/ftplugin/mail/custom.vim" ,(local-file "nvim/config/after/ftplugin/mail/custom.vim"))
166 ;("sway" ,(local-file "sway" #:recursive? #t))
166 ;("hypr" ,(local-file "hypr" #:recursive? #t)) 167 ;("hypr" ,(local-file "hypr" #:recursive? #t))
167 ("hypr/monitors.conf", (local-file "hypr/monitors.conf")) 168 ;("hypr/monitors.conf", (local-file "hypr/monitors.conf"))
168 ("hypr/pyprland.toml", (local-file "hypr/pyprland.toml")) 169 ;("hypr/pyprland.toml", (local-file "hypr/pyprland.toml"))
169 ("hypr/family_guy.mp4", (local-file "hypr/family_guy.mp4")) 170 ;("hypr/family_guy.mp4", (local-file "hypr/family_guy.mp4"))
170 ("hypr/hyprlock.conf", (local-file "hypr/hyprlock.conf")) 171 ;("hypr/hyprlock.conf", (local-file "hypr/hyprlock.conf"))
171 ("hypr/hypridle.conf", (local-file "hypr/hypridle.conf")) 172 ;("hypr/hypridle.conf", (local-file "hypr/hypridle.conf"))
172 ("hypr/kanshi.conf", (local-file "hypr/kanshi.conf")) 173 ;("hypr/kanshi.conf", (local-file "hypr/kanshi.conf"))
173 ("hypr/subwaysurfer.webm", (local-file "hypr/subwaysurfer.webm")) 174 ;("hypr/subwaysurfer.webm", (local-file "hypr/subwaysurfer.webm"))
174 ("hypr/Wallpapers", (local-file "hypr/Wallpapers" #:recursive? #t)) 175 ;("hypr/Wallpapers", (local-file "hypr/Wallpapers" #:recursive? #t))
175 ("hypr/scripts", (local-file "hypr/scripts" #:recursive? #t)) 176 ;("hypr/scripts", (local-file "hypr/scripts" #:recursive? #t))
176 ("wpaperd" ,(local-file "wpaperd" #:recursive? #t)) 177 ;("wpaperd" ,(local-file "wpaperd" #:recursive? #t))
177 ("mpv" ,(local-file "mpv" #:recursive? #t)) 178 ;("mpv" ,(local-file "mpv" #:recursive? #t))
178 ("foot" ,(local-file "foot" #:recursive? #t)) 179 ;("foot" ,(local-file "foot" #:recursive? #t))
179 ("pulse/client.conf" ,(local-file "pulseaudio/client.conf")) 180 ;("pulse/client.conf" ,(local-file "pulseaudio/client.conf"))
180 ("waybar" ,(local-file "waybar" #:recursive? #t)) 181 ;("waybar" ,(local-file "waybar" #:recursive? #t))
181 ("alacritty" ,(local-file "alacritty" #:recursive? #t)) 182 ;("alacritty" ,(local-file "alacritty" #:recursive? #t))
182 ("aerc" ,(local-file "aerc" #:recursive? #t)) )) 183 ;("aerc" ,(local-file "aerc" #:recursive? #t)) ))
183 (service home-files-service-type 184 ;(service home-files-service-type
184 `((".local/share/nvim/site/autoload/plug.vim" ,(local-file "nvim/plugin-manager/plug.vim")) 185 ;l`(;(".local/share/nvim/site/autoload/plug.vim" ,(local-file "nvim/plugin-manager/plug.vim"))
185 (".ssh/config" ,(local-file "ssh/config")) 186 ;(".ssh/config" ,(local-file "ssh/config"))
186 (".icons" ,(local-file "icons" #:recursive? #t)) 187 ;(".icons" ,(local-file "icons" #:recursive? #t))
187 ;(".mozilla/native-messaging-hosts/gpgmejson.json" ,(local-file "mailvelope/gpgmejson.json")) 188 ;(".mozilla/native-messaging-hosts/gpgmejson.json" ,(local-file "mailvelope/gpgmejson.json"))
188 (".local/share/mailvelope" ,(local-file "mailvelope" #:recursive? #t)) 189 ;(".local/share/mailvelope" ,(local-file "mailvelope" #:recursive? #t))
189 (".mozilla/native-messaging-hosts/tridactyl.json" ,(local-file "tridactyl/tridactyl.json")) 190 ;(".mozilla/native-messaging-hosts/tridactyl.json" ,(local-file "tridactyl/tridactyl.json"))
190 (".local/share/tridactyl" ,(local-file "tridactyl" #:recursive? #t)) 191 ;(".local/share/tridactyl" ,(local-file "tridactyl" #:recursive? #t))
191 ;(".gnupg/sshcontrol" ,(local-file "gnupg/sshcontrol")) 192 ;(".gnupg/sshcontrol" ,(local-file "gnupg/sshcontrol"))
192 ;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf")) 193 ;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf"))
193 ;(".gnupg/gpg.conf" ,(local-file "gnupg/gpg.conf")) 194 ;(".gnupg/gpg.conf" ,(local-file "gnupg/gpg.conf"))
194 (".local/share/fonts" ,(local-file "fonts" #:recursive? #t)) 195 ;(".local/share/fonts" ,(local-file "fonts" #:recursive? #t))
195 (".gitconfig" ,(local-file "gitconfig")) 196 ;(".gitconfig" ,(local-file "gitconfig"))
196 (".docker/cli-plugins" ,(local-file "docker/cli-plugins" #:recursive? #t)) 197 ;(".docker/cli-plugins" ,(local-file "docker/cli-plugins" #:recursive? #t))
197 (".nix-channels" ,(local-file "nix-channels")))) 198 ;(".nix-channels" ,(local-file "nix-channels"))))
198 (service home-pipewire-service-type) 199 (service home-pipewire-service-type)
199 ;(service home-spotifyd-service-type) 200 ;(service home-spotifyd-service-type)
200 ; font things for nix to play nice 201 ; font things for nix to play nice
201 (simple-service 'additional-fonts-service 202 ; (simple-service 'additional-fonts-service
202 home-fontconfig-service-type 203 ; home-fontconfig-service-type
203 (list "~/.nix-profile/share/fonts" 204 ; (list "~/.nix-profile/share/fonts"
204 '(match (@ (target "pattern")) 205 ; '(match (@ (target "pattern"))
205 (edit (@ (name "family") (mode "prepend")) 206 ; (edit (@ (name "family") (mode "prepend"))
206 (string "DejaVu Sans"))) 207 ; (string "DejaVu Sans")))
207 '(alias 208 ; '(alias
208 (family "serif") 209 ; (family "serif")
209 (prefer 210 ; (prefer
210 (family "DejaVu Serif"))) 211 ; (family "DejaVu Serif")))
211 '(alias 212 ; '(alias
212 (family "sans") 213 ; (family "sans")
213 (prefer 214 ; (prefer
214 (family "DejaVu Sans"))) 215 ; (family "DejaVu Sans")))
215 '(alias 216 ; '(alias
216 (family "monospace") 217 ; (family "monospace")
217 (prefer 218 ; (prefer
218 (family "DejaVu Sans Mono"))))) 219 ; (family "DejaVu Sans Mono")))))
219 (service home-dbus-service-type) 220 (service home-dbus-service-type)
220 (service downloads-garbage-collector-service-type 221 (service downloads-garbage-collector-service-type
221 (downloads-garbage-collector-configuration 222 (downloads-garbage-collector-configuration
@@ -224,8 +225,9 @@
224 ;(template-files "." 225 ;(template-files "."
225 ;'("spotify-player/app.toml" 226 ;'("spotify-player/app.toml"
226 ;;; 227 ;;;
227 (service home-gpg-agent-service-type 228 ;(service home-gpg-agent-service-type
228 (home-gpg-agent-configuration 229 ; (home-gpg-agent-configuration
229 (pinentry-program 230 ; (pinentry-program
230 (file-append pinentry "/bin/pinentry")) 231 ; (file-append pinentry "/bin/pinentry"))
231 (ssh-support? #t))) ))) 232 ; (ssh-support? #t))) )))
233)))
diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm
index c75ab7c..d84744b 100644
--- a/modules/ryan-config/base-system.scm
+++ b/modules/ryan-config/base-system.scm
@@ -118,7 +118,7 @@
118 (name "ryan") 118 (name "ryan")
119 (comment "Ryan") 119 (comment "Ryan")
120 (group "users") 120 (group "users")
121 ;(shell (file-append zsh "/bin/zsh")) 121 (shell (file-append zsh "/bin/zsh"))
122 (home-directory "/home/ryan") 122 (home-directory "/home/ryan")
123 (supplementary-groups '("wheel" "netdev" "audio" "video" "lp" "plugdev" "docker" "libvirt" "kvm" "dialout"))) 123 (supplementary-groups '("wheel" "netdev" "audio" "video" "lp" "plugdev" "docker" "libvirt" "kvm" "dialout")))
124 %base-user-accounts)) 124 %base-user-accounts))
@@ -126,27 +126,27 @@
126 ;; Packages installed system-wide. Users can also install packages 126 ;; Packages installed system-wide. Users can also install packages
127 ;; under their own account: use 'guix search KEYWORD' to search 127 ;; under their own account: use 'guix search KEYWORD' to search
128 ;; for packages and 'guix install PACKAGE' to install a package. 128 ;; for packages and 'guix install PACKAGE' to install a package.
129 (packages (append (map specification->package (list "sway" 129 (packages (append (map specification->package (list ;"sway"
130 ;"hyprland" 130 ;"hyprland"
131 "swaybg" 131 ;"swaybg"
132 ;"swayidle" 132 ;"swayidle"
133 ;"swaylock-effects" 133 ;"swaylock-effects"
134 "fuzzel" 134 ;"fuzzel"
135 "foot" 135 ;"foot"
136 "linux-pam" ; installed directly to get libs in profile directly 136 "linux-pam" ; installed directly to get libs in profile directly
137 "pinentry-qt" 137 ;"pinentry-qt"
138 "adwaita-icon-theme" 138 "adwaita-icon-theme"
139 "hicolor-icon-theme" 139 "hicolor-icon-theme"
140 "git" 140 ;"git"
141 "waybar-experimental" 141 ;"waybar-experimental"
142 "gnupg" 142 ;"gnupg"
143 "light" 143 "light"
144 "avahi" 144 "avahi"
145 "mako" 145 ;"mako"
146 "grim" 146 ;"grim"
147 "grimblast" 147 ;"grimblast"
148 "slurp" 148 ;"slurp"
149 "wl-clipboard" 149 ;"wl-clipboard"
150 ;"bluez" 150 ;"bluez"
151 ;"blueman" 151 ;"blueman"
152 "ldacbt" 152 "ldacbt"
@@ -166,9 +166,9 @@
166 "wireshark" 166 "wireshark"
167 ;"openconnect" 167 ;"openconnect"
168 ;"openconnect-sso" 168 ;"openconnect-sso"
169 "webkitgtk-with-libsoup2" ; Needed for Go wails development 169 ;"webkitgtk-with-libsoup2" ; Needed for Go wails development
170 "zsh")) 170 "zsh"))
171 (list my-ca-certs virt-manager-ovmf bluez-ryan netbird-bin neovim-ryan) 171 (list my-ca-certs virt-manager-ovmf bluez-ryan netbird-bin) ;neovim-ryan)
172 %my-base-packages )) 172 %my-base-packages ))
173 173
174 ;; Below is the list of system services. To search for available 174 ;; Below is the list of system services. To search for available
@@ -190,9 +190,9 @@
190 (publish-workstation? #f))) ;; do not advertise, I want this to be as silent as possible 190 (publish-workstation? #f))) ;; do not advertise, I want this to be as silent as possible
191 (service docker-service-type) 191 (service docker-service-type)
192 ; Tailscale daemon from rosenthal 192 ; Tailscale daemon from rosenthal
193 (service tailscale-service-type 193 ; (service tailscale-service-type
194 (tailscale-configuration 194 ; (tailscale-configuration
195 (socket "/var/run/tailscale/tailscaled.sock"))) 195 ; (socket "/var/run/tailscale/tailscaled.sock")))
196 (service netbird-service-type) 196 (service netbird-service-type)
197 (service containerd-service-type) 197 (service containerd-service-type)
198 (service nix-service-type 198 (service nix-service-type
@@ -206,32 +206,32 @@
206 (list 206 (list
207 (pam-entry (control "include") 207 (pam-entry (control "include")
208 (module "login"))))))) 208 (module "login")))))))
209 (simple-service 'ly-pam pam-root-service-type 209 ; (simple-service 'ly-pam pam-root-service-type
210 (list 210 ; (list
211 (pam-service 211 ; (pam-service
212 (name "ly") 212 ; (name "ly")
213 (account 213 ; (account
214 (list 214 ; (list
215 (pam-entry (control "required") 215 ; (pam-entry (control "required")
216 (module "pam_unix.so")))) 216 ; (module "pam_unix.so"))))
217 (auth 217 ; (auth
218 (list 218 ; (list
219 (pam-entry (control "required") 219 ; (pam-entry (control "required")
220 (module "pam_unix.so")))) 220 ; (module "pam_unix.so"))))
221 (password 221 ; (password
222 (list 222 ; (list
223 (pam-entry (control "required") 223 ; (pam-entry (control "required")
224 (module "pam_unix.so") 224 ; (module "pam_unix.so")
225 (arguments (list "sha512" "shadow"))))) 225 ; (arguments (list "sha512" "shadow")))))
226 (session 226 ; (session
227 (list 227 ; (list
228 (pam-entry (control "required") 228 ; (pam-entry (control "required")
229 (module "/gnu/store/4lhhf88iz9pdr624z5hnq2avlk1ny4ga-elogind-255.17/lib/security/pam_elogind.so") 229 ; (module "/gnu/store/4lhhf88iz9pdr624z5hnq2avlk1ny4ga-elogind-255.17/lib/security/pam_elogind.so")
230 (arguments (list "debug=yes"))) 230 ; (arguments (list "debug=yes")))
231 (pam-entry (control "required") 231 ; (pam-entry (control "required")
232 (module "pam_env.so")) 232 ; (module "pam_env.so"))
233 (pam-entry (control "required") 233 ; (pam-entry (control "required")
234 (module "pam_unix.so"))))))) 234 ; (module "pam_unix.so")))))))
235 (service kmscon-service-type 235 (service kmscon-service-type
236 (kmscon-configuration 236 (kmscon-configuration
237 (virtual-terminal "tty7") 237 (virtual-terminal "tty7")
@@ -263,7 +263,7 @@
263 (guix-configuration 263 (guix-configuration
264 (inherit config) 264 (inherit config)
265 (substitute-urls 265 (substitute-urls
266 (append (list "https://nonguix-proxy.ditigal.xyz/") 266 (append (list "https://substitutes.nonguix.org")
267 %default-substitute-urls)) 267 %default-substitute-urls))
268 (authorized-keys 268 (authorized-keys
269 (cons* (plain-file "non-guix.pub" 269 (cons* (plain-file "non-guix.pub"
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-25 05:59:25 +0000