Devariable domains

modules/home/default.nix

@@ -5,8 +5,9 @@
     ./programs
     ./services
     ./settings
-    ./wms
     ./user
+    ./variables
+    ./wms
     ../variables
 
     # Imports

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

@@ -1,9 +1,9 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 {
   programs.git = {
     enable = true;
     userName = "Jimbo";
-    userEmail = "jimbo@${config.domains.p2}";
+    userEmail = "jimbo@nixfox.ca";
   };
   
   programs.lazygit.enable = true;

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

@@ -98,20 +98,20 @@
     file = {
       ".local/share/ranger/bookmarks".text = ''
         # Local files
-        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
+        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
         d:/mnt
         n:/etc/nixos
 
         # Remote files
-        J:/home/${config.sysusers.main}/KittyNFS
-        K:/home/${config.sysusers.main}/KittyNFS/Files
-        V:/home/${config.sysusers.main}/KittyNFS/Media
-        M:/home/${config.sysusers.main}/KittyNFS/Music
+        J:/home/${config.home.username}/KittyNFS
+        K:/home/${config.home.username}/KittyNFS/Files
+        V:/home/${config.home.username}/KittyNFS/Media
+        M:/home/${config.home.username}/KittyNFS/Music
       '';
     };
     packages = with pkgs; [

modules/home/services/mpd/default.nix

@@ -3,8 +3,8 @@
   services.mpd = {
     enable = config.home.desktop.enable;
     network.startWhenNeeded = true;
-    musicDirectory = "/home/${config.sysusers.main}/KittyNFS/Music/JimBops";
-    playlistDirectory = "/home/${config.sysusers.main}/KittyNFS/Music/JimBops/Playlists";
+    musicDirectory = "/home/${config.home.username}/KittyNFS/Music/JimBops";
+    playlistDirectory = "/home/${config.home.username}/KittyNFS/Music/JimBops/Playlists";
     extraConfig = ''
       audio_output {
         type "pipewire"

modules/home/user/default.nix

@@ -2,7 +2,7 @@
 {
   home = {
     username = "${config.sysusers.main}";
-    homeDirectory = "/home/${config.sysusers.main}";
+    homeDirectory = "/home/${config.home.username}";
     sessionVariables = {
       EDITOR = "nvim";
       MANPAGER = "nvim +Man!";

modules/home/variables/default.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  imports = [
+    ./displays
+    ./look
+    ./workspaces
+  ];
+}

modules/home/variables/displays/default.nix

@@ -0,0 +1,15 @@
+{ config, lib, ... }:
+{
+  options.displays = lib.mkOption {
+    type = lib.types.attrs;
+    default = {};
+  };
+
+  config.displays = {
+    d1 = "DP-1";
+    d2 = "DP-2";
+    d3 = "DP-3";
+    d4 = "HDMI-A-1";
+    dI = "eDP-1";
+  };
+}

modules/home/variables/look/border/default.nix

@@ -0,0 +1,12 @@
+{ config, lib, ... }:
+{
+  options.look.border = lib.mkOption {
+    type = lib.types.attrs;
+    default = {};
+  };
+
+  config.look.border = rec {
+    int = 3;
+    string = toString int;
+  };
+}

modules/home/variables/look/colors/default.nix

@@ -0,0 +1,20 @@
+{ config, lib, ... }:
+{
+  options.look.colors = lib.mkOption {
+    type = lib.types.attrs;
+    default = {};
+  };
+
+  config.look.colors = {
+    prime = "3823C4"; #3823C4
+    accent = "1B1F59"; #1B1F59
+    split = "555B9E"; #555B9E
+    actSplit = "5980B7"; #5980B7
+    dark = "101419"; #101419
+    mid = "171C23"; #171C23
+    light = "272b33"; #272B33
+    urgent = "C43823"; #C43823
+    text = "C7D3E3"; #C7D3E3
+    folder = "indigo";
+  };
+}

modules/home/variables/look/default.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  imports = [
+    ./border
+    ./colors
+    ./fonts
+  ];
+}

modules/home/variables/look/fonts/default.nix

@@ -0,0 +1,12 @@
+{ config, lib, ... }:
+{
+  options.look.fonts = lib.mkOption {
+    type = lib.types.attrs;
+    default = {};
+  };
+
+  config.look.fonts = {
+    main = "Ubuntu";
+    nerd = "UbuntuMono Nerd Font";
+  };
+}

modules/home/variables/workspaces/default.nix

@@ -0,0 +1,29 @@
+{ config, lib, ... }:
+{
+  options.ws = lib.mkOption {
+    type = lib.types.attrs;
+    default = {};
+  };
+
+  config.ws = {
+    w0 = "0";
+    w1 = "1";
+    w2 = "2";
+    w3 = "3";
+    w4 = "4";
+    w5 = "5";
+    w6 = "6";
+    w7 = "7";
+    w8 = "8";
+    w9 = "9";
+    w1a = "I";
+    w2a = "II";
+    w3a = "III";
+    w4a = "IV";
+    w5a = "V";
+    w6a = "VI";
+    w7a = "VII";
+    w8a = "VIII";
+    w9a = "IX";
+  };
+}