Variablize username more

modules/home/programs/gui/librewolf/default.nix

@@ -5,7 +5,7 @@ let
     --tab-font: '${config.look.fonts.main}';
     --urlbar-font: '${config.look.fonts.main}';
   '';
-  themeJim = ''
+  themeMain = ''
     :root {
       --tab-active-bg-color: #${config.look.colors.prime};
       --tab-hover-bg-color: #${config.look.colors.accent};
@@ -114,8 +114,8 @@ in {
     };
     commonBookmarks = [
       {
-        name = "Jimbo";
-        url = "https://jimbosfiles.com";
+        name = "NixFox";
+        url = "https://nixfox.ca";
       }
       {
         name = "Corn";
@@ -252,7 +252,7 @@ in {
 	bookmarks = commonBookmarks;
         settings = commonSettings;
         userChrome = ''
-          ${themeJim}
+          ${themeMain}
           ${themeFont}
           ${builtins.readFile ./quteFox.css}
         '';

modules/home/programs/terminal/ranger/default.nix

@@ -98,20 +98,20 @@
     file = {
       ".local/share/ranger/bookmarks".text = ''
         # Local files
-        h:/home/${config.home.username}/
-        k:/home/${config.home.username}/Keepers
-        j:/home/${config.home.username}/Downloads
-        v:/home/${config.home.username}/Videos
-        c:/home/${config.home.username}/.config
-        l:/home/${config.home.username}/.local
+        h:/home/${config.sysusers.main}/
+        k:/home/${config.sysusers.main}/Keepers
+        j:/home/${config.sysusers.main}/Downloads
+        v:/home/${config.sysusers.main}/Videos
+        c:/home/${config.sysusers.main}/.config
+        l:/home/${config.sysusers.main}/.local
         d:/mnt
         n:/etc/nixos
 
         # Remote files
-        J:/home/${config.home.username}/JimboNFS
-        K:/home/${config.home.username}/JimboNFS/Files
-        V:/home/${config.home.username}/JimboNFS/Media
-        M:/home/${config.home.username}/JimboNFS/Music
+        J:/home/${config.sysusers.main}/JimboNFS
+        K:/home/${config.sysusers.main}/JimboNFS/Files
+        V:/home/${config.sysusers.main}/JimboNFS/Media
+        M:/home/${config.sysusers.main}/JimboNFS/Music
       '';
     };
     packages = with pkgs; [