1 files changed, 154 insertions, 152 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 @@
             (rosenthal packages binaries)
             (ryan-packages mozilla))
-(define my-neovim
+; (define my-neovim
-  (package
+;   (package
-    (inherit neovim)
+;     (inherit neovim)
-    (native-inputs
+;     (native-inputs
-      (modify-inputs (package-native-inputs neovim)
+;       (modify-inputs (package-native-inputs neovim)
-                     (prepend gcc-13)))))
+;                      (prepend gcc-13)))))
-(define %home-symlinks
+ (define %home-symlinks
-  `((".config/guix/home-config/fish" ".config/fish")
+;   `((".config/guix/home-config/fish" ".config/fish")
-    (".config/guix/home-config/nix-config" ".config/nix")
+;     (".config/guix/home-config/nix-config" ".config/nix")
-    (".config/guix/home-config/nix-combined" ".config/home-manager")))
+     (".config/guix/home-config/nix-combined" ".config/home-manager")))
 (home-symlinks %home-symlinks)
 (home-environment
  ;; Below is the list of packages that will show up in your
  ;; Home profile, under ~/.guix-home/profile.
-  (packages (append (specifications->packages (list "bat"
+  ;(packages (append (specifications->packages (list ;"bat"
-                                                    "fd"
+                                                    ;"fd"
                                                    ;"fish"
-                                                    "xdg-utils"
+                                                    ;"xdg-utils"
                                                    ;"abook"
-                                                    "libnotify"
+                                                    ;"libnotify"
-                                                    "fzf"
+                                                    ;"fzf"
                                                    ;"waypipe"
-                                                    "foot"
+                                                    ;"foot"
-                                                    "pulseaudio" ;only for pactl
+                                                    ;"pulseaudio" ;only for pactl
-                                                    "qpwgraph"
+                                                    ;"qpwgraph"
-                                                    "gnunet"
+                                                    ;"gnunet"
                                                    ;"ffmpeg" ; removed for mpv prop input
-                                                    "qrencode"
+                                                    ;"qrencode"
-                                                    "tmux"
+                                                    ;"tmux"
-                                                    "binutils"
+                                                    ;"binutils"
-                                                    "gcc-toolchain"
+                                                    ;"gcc-toolchain"
-                                                    "borg"
+                                                    ;"borg"
                                                    ;"restic"
-                                                    "rsync"
+                                                    ;"rsync"
-                                                    "cloc"
+                                                    ;"cloc"
-                                                    "sc-im"
+                                                    ;"sc-im"
-                                                    "pv"
+                                                    ;"pv"
-                                                    "jq"
+                                                    ;"jq"
-                                                    "gpgme"
+                                                    ;"gpgme"
-                                                    "bombadillo"
+                                                    ;"bombadillo"
-                                                    "python-msgpack"
+                                                    ;"python-msgpack"
-                                                    "wdisplays"
+                                                    ;"wdisplays"
-                                                    "kanshi"
+                                                    ;"kanshi"
-                                                    "libreoffice"
+                                                    ;"libreoffice"
-                                                    "flatpak"
+                                                    ;"flatpak"
-                                                    "gnupg"
+                                                    ;"gnupg"
                                                    ;"spotifyd"
-                                                    "lsof"
+                                                    ;"lsof"
-                                                    "pavucontrol"
+                                                    ;"pavucontrol"
-                                                    "netcat"
+                                                    ;"netcat"
-                                                    "bind:utils"
+                                                    ;"bind:utils"
-                                                    "font-cns11643-swjz"
+                                                    ;"font-cns11643-swjz"
-                                                    "font-google-noto-emoji"
+                                                    ;"font-google-noto-emoji"
-                                                    "syncthing"
+                                                    ;"syncthing"
                                                    ;"taskwarrior"
                                                    ;"tasksh"
                                                    ;"imv" ; Nix pkg now for MESA stuff
-                                                    "perl"
+                                                    ;"perl"
-                                                    "tor"
+                                                    ;"tor"
-                                                    "unzip"
+                                                    ;"unzip"
-                                                    "htop"
+                                                    ;"htop"
-                                                    "curl"
+                                                    ;"curl"
-                                                    "pandoc"
+                                                    ;"pandoc"
-                                                    "texlive-bin"
+                                                    ;"texlive-bin"
-                                                    "texlive-scheme-basic"
+                                                    ;"texlive-scheme-basic"
-                                                    "texlive-txfonts"
+                                                    ;"texlive-txfonts"
-                                                    "texlive-amsfonts"
+                                                    ;"texlive-amsfonts"
-                                                    "texlive-lm"
+                                                    ;"texlive-lm"
-                                                    "texlive-lm-math"
+                                                    ;"texlive-lm-math"
-                                                    "texlive-iftex"
+                                                    ;"texlive-iftex"
-                                                    "texlive-unicode-math"
+                                                    ;"texlive-unicode-math"
-                                                    "texlive-fontspec"
+                                                    ;"texlive-fontspec"
-                                                    "texlive-xcolor"
+                                                    ;"texlive-xcolor"
-                                                    "texlive-geometry"
+                                                    ;"texlive-geometry"
-                                                    "texlive-hyperref"
+                                                    ;"texlive-hyperref"
-                                                    "texlive-parskip"
+                                                    ;"texlive-parskip"
-                                                    "texlive-etoolbox"
+                                                    ;"texlive-etoolbox"
-                                                    "texlive-setspace"
+                                                    ;"texlive-setspace"
-                                                    "texlive-booktabs"
+                                                    ;"texlive-booktabs"
-                                                    "texlive-mdwtools"
+                                                    ;"texlive-mdwtools"
-                                                    "texlive-caption"
+                                                    ;"texlive-caption"
-                                                    "texlive-diagbox"
+                                                    ;"texlive-diagbox"
-                                                    "texlive-pict2e"
+                                                    ;"texlive-pict2e"
-                                                    "texlive-ulem"
+                                                    ;"texlive-ulem"
-                                                    "texlive-pgf"
+                                                    ;"texlive-pgf"
-                                                    "zathura"
+                                                    ;"zathura"
-                                                    "zathura-pdf-mupdf"
+                                                    ;"zathura-pdf-mupdf"
-                                                    "go"
+                                                    ;"go"
-                                                    "fzf"
+                                                    ;"fzf"
-                                                    "weechat"
+                                                    ;"weechat"
-                                                    "gimp"
+                                                    ;"gimp"
-                                                    "python"
+                                                    ;"python"
-                                                    "python:tk"
+                                                    ;"python:tk"
-                                                    "file"
+                                                    ;"file"
-                                                    "python-lsp-server"
+                                                    ;"python-lsp-server"
                                                    ;"kdenlive"
-                                                    "sqlite"
+                                                    ;"sqlite"
                                                    ;"mpv" ; Now a nix pkg for MESA stuff
-                                                    "qbittorrent"
+                                                    ;"qbittorrent"
-                                                    "playerctl"
+                                                    ;"playerctl"
                                                    ;"aerc"
-                                                    "tcpdump"
+                                                    ;"tcpdump"
-                                                    "pamixer"
+                                                    ;"pamixer"
-                                                    "git"
+                                                    ;"git"
-                                                    "git:send-email"
+                                                    ;"git:send-email"
-                                                    "password-store"
+                                                    ;"password-store"
-                                                    "node"
+                                                    ;"node"
-                                                    "kanshi"
+                                                    ;"kanshi"
                                                    ;"firefox"
-                                                    "signal-desktop"
+                                                    ;"signal-desktop"
-                                                    "sc-im"
+                                                    ;"sc-im"
-                                                    "tree-sitter-cli"
+                                                    ;"tree-sitter-cli"
-                                                    "git-lfs"))
+                                                    ;"git-lfs"))
-                    (list calcurse-fixed )))
+                    ;(list calcurse-fixed )))
  ;; Below is the list of Home services.  To search for available
  ;; services, run 'guix home search KEYWORD' in a terminal.
@@ -158,64 +158,65 @@
                                  "bashrc")))
                   (bash-profile (list (local-file
                                        "bash_profile")))))
-         (service home-xdg-configuration-files-service-type
+         ;(service home-xdg-configuration-files-service-type
-                  `(("nvim/init.vim" ,(local-file "nvim/config/init.vim"))
+                  ; Migrated to nix
-                    ("nvim/after/ftplugin/markdown/custom.vim" ,(local-file "nvim/config/after/ftplugin/markdown/custom.vim"))
+                  ;`(("nvim/init.vim" ,(local-file "nvim/config/init.vim"))
-                    ("nvim/after/ftplugin/mail/custom.vim" ,(local-file "nvim/config/after/ftplugin/mail/custom.vim"))
+                    ;("nvim/after/ftplugin/markdown/custom.vim" ,(local-file "nvim/config/after/ftplugin/markdown/custom.vim"))
-                    ("sway" ,(local-file "sway" #:recursive? #t))
+                    ;("nvim/after/ftplugin/mail/custom.vim" ,(local-file "nvim/config/after/ftplugin/mail/custom.vim"))
+                    ;("sway" ,(local-file "sway" #:recursive? #t))
                    ;("hypr" ,(local-file "hypr" #:recursive? #t))
-                    ("hypr/monitors.conf", (local-file "hypr/monitors.conf"))
+                    ;("hypr/monitors.conf", (local-file "hypr/monitors.conf"))
-                    ("hypr/pyprland.toml", (local-file "hypr/pyprland.toml"))
+                    ;("hypr/pyprland.toml", (local-file "hypr/pyprland.toml"))
-                    ("hypr/family_guy.mp4", (local-file "hypr/family_guy.mp4"))
+                    ;("hypr/family_guy.mp4", (local-file "hypr/family_guy.mp4"))
-                    ("hypr/hyprlock.conf", (local-file "hypr/hyprlock.conf"))
+                    ;("hypr/hyprlock.conf", (local-file "hypr/hyprlock.conf"))
-                    ("hypr/hypridle.conf", (local-file "hypr/hypridle.conf"))
+                    ;("hypr/hypridle.conf", (local-file "hypr/hypridle.conf"))
-                    ("hypr/kanshi.conf", (local-file "hypr/kanshi.conf"))
+                    ;("hypr/kanshi.conf", (local-file "hypr/kanshi.conf"))
-                    ("hypr/subwaysurfer.webm", (local-file "hypr/subwaysurfer.webm"))
+                    ;("hypr/subwaysurfer.webm", (local-file "hypr/subwaysurfer.webm"))
-                    ("hypr/Wallpapers", (local-file "hypr/Wallpapers" #:recursive? #t))
+                    ;("hypr/Wallpapers", (local-file "hypr/Wallpapers" #:recursive? #t))
-                    ("hypr/scripts", (local-file "hypr/scripts" #:recursive? #t))
+                    ;("hypr/scripts", (local-file "hypr/scripts" #:recursive? #t))
-                    ("wpaperd" ,(local-file "wpaperd" #:recursive? #t))
+                    ;("wpaperd" ,(local-file "wpaperd" #:recursive? #t))
-                    ("mpv" ,(local-file "mpv" #:recursive? #t))
+                    ;("mpv" ,(local-file "mpv" #:recursive? #t))
-                    ("foot" ,(local-file "foot" #:recursive? #t))
+                    ;("foot" ,(local-file "foot" #:recursive? #t))
-                    ("pulse/client.conf" ,(local-file "pulseaudio/client.conf"))
+                    ;("pulse/client.conf" ,(local-file "pulseaudio/client.conf"))
-                    ("waybar" ,(local-file "waybar" #:recursive? #t))
+                    ;("waybar" ,(local-file "waybar" #:recursive? #t))
-                    ("alacritty" ,(local-file "alacritty" #:recursive? #t))
+                    ;("alacritty" ,(local-file "alacritty" #:recursive? #t))
-                    ("aerc" ,(local-file "aerc" #:recursive? #t)) ))
+                    ;("aerc" ,(local-file "aerc" #:recursive? #t)) ))
-         (service home-files-service-type
+         ;(service home-files-service-type
-                  `((".local/share/nvim/site/autoload/plug.vim" ,(local-file "nvim/plugin-manager/plug.vim"))
+                  ;l`(;(".local/share/nvim/site/autoload/plug.vim" ,(local-file "nvim/plugin-manager/plug.vim"))
-                    (".ssh/config" ,(local-file "ssh/config"))
+                    ;(".ssh/config" ,(local-file "ssh/config"))
-                    (".icons" ,(local-file "icons" #:recursive? #t))
+                    ;(".icons" ,(local-file "icons" #:recursive? #t))
                    ;(".mozilla/native-messaging-hosts/gpgmejson.json" ,(local-file "mailvelope/gpgmejson.json"))
-                    (".local/share/mailvelope" ,(local-file "mailvelope" #:recursive? #t))
+                    ;(".local/share/mailvelope" ,(local-file "mailvelope" #:recursive? #t))
-                    (".mozilla/native-messaging-hosts/tridactyl.json" ,(local-file "tridactyl/tridactyl.json"))
+                    ;(".mozilla/native-messaging-hosts/tridactyl.json" ,(local-file "tridactyl/tridactyl.json"))
-                    (".local/share/tridactyl" ,(local-file "tridactyl" #:recursive? #t))
+                    ;(".local/share/tridactyl" ,(local-file "tridactyl" #:recursive? #t))
                    ;(".gnupg/sshcontrol" ,(local-file "gnupg/sshcontrol"))
                    ;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf"))
                    ;(".gnupg/gpg.conf" ,(local-file "gnupg/gpg.conf"))
-                    (".local/share/fonts" ,(local-file "fonts" #:recursive? #t))
+                    ;(".local/share/fonts" ,(local-file "fonts" #:recursive? #t))
-                    (".gitconfig" ,(local-file "gitconfig"))
+                    ;(".gitconfig" ,(local-file "gitconfig"))
-                    (".docker/cli-plugins" ,(local-file "docker/cli-plugins" #:recursive? #t))
+                    ;(".docker/cli-plugins" ,(local-file "docker/cli-plugins" #:recursive? #t))
-                    (".nix-channels" ,(local-file "nix-channels"))))
+                    ;(".nix-channels" ,(local-file "nix-channels"))))
         (service home-pipewire-service-type)
         ;(service home-spotifyd-service-type)
         ; font things for nix to play nice
-         (simple-service 'additional-fonts-service
+         ; (simple-service 'additional-fonts-service
-                         home-fontconfig-service-type
+         ;                 home-fontconfig-service-type
-                         (list "~/.nix-profile/share/fonts"
+         ;                 (list "~/.nix-profile/share/fonts"
-                               '(match (@ (target "pattern"))
+         ;                       '(match (@ (target "pattern"))
-                                       (edit (@ (name "family") (mode "prepend"))
+         ;                               (edit (@ (name "family") (mode "prepend"))
-                                             (string "DejaVu Sans")))
+         ;                                     (string "DejaVu Sans")))
-                               '(alias
+         ;                       '(alias
-                                  (family "serif")
+         ;                          (family "serif")
-                                  (prefer
+         ;                          (prefer
-                                    (family "DejaVu Serif")))
+         ;                            (family "DejaVu Serif")))
-                               '(alias
+         ;                       '(alias
-                                  (family "sans")
+         ;                          (family "sans")
-                                  (prefer
+         ;                          (prefer
-                                    (family "DejaVu Sans")))
+         ;                            (family "DejaVu Sans")))
-                               '(alias
+         ;                       '(alias
-                                  (family "monospace")
+         ;                          (family "monospace")
-                                  (prefer
+         ;                          (prefer
-                                    (family "DejaVu Sans Mono")))))
+         ;                            (family "DejaVu Sans Mono")))))
         (service home-dbus-service-type)
         (service downloads-garbage-collector-service-type
                  (downloads-garbage-collector-configuration
@@ -224,8 +225,9 @@
         ;(template-files "."
         ;'("spotify-player/app.toml"
         ;;;
-         (service home-gpg-agent-service-type
+         ;(service home-gpg-agent-service-type
-                  (home-gpg-agent-configuration
+         ;         (home-gpg-agent-configuration
-                    (pinentry-program
+         ;           (pinentry-program
-                      (file-append pinentry "/bin/pinentry"))
+         ;             (file-append pinentry "/bin/pinentry"))
-                    (ssh-support? #t))) )))
+         ;           (ssh-support? #t))) )))
+)))

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	)))