Fix wanaheim, migrate alacritty to toml

configs/home-manager/alacritty/alacritty.toml

@@ -0,0 +1,77 @@
+[[colors.indexed_colors]]
+color = "#FAB387"
+index = 16
+
+[[colors.indexed_colors]]
+color = "#F5E0DC"
+index = 17
+
+[colors.bright]
+black = "#585B70"
+blue = "#89B4FA"
+cyan = "#94E2D5"
+green = "#A6E3A1"
+magenta = "#F5C2E7"
+red = "#F38BA8"
+white = "#A6ADC8"
+yellow = "#F9E2AF"
+
+[colors.cursor]
+cursor = "#F5E0DC"
+text = "#1E1E2E"
+
+[colors.dim]
+black = "#45475A"
+blue = "#89B4FA"
+cyan = "#94E2D5"
+green = "#A6E3A1"
+magenta = "#F5C2E7"
+red = "#F38BA8"
+white = "#BAC2DE"
+yellow = "#F9E2AF"
+
+[colors.hints.end]
+background = "#A6ADC8"
+foreground = "#1E1E2E"
+
+[colors.hints.start]
+background = "#F9E2AF"
+foreground = "#1E1E2E"
+
+[colors.normal]
+black = "#45475A"
+blue = "#89B4FA"
+cyan = "#94E2D5"
+green = "#A6E3A1"
+magenta = "#F5C2E7"
+red = "#F38BA8"
+white = "#BAC2DE"
+yellow = "#F9E2AF"
+
+[colors.primary]
+background = "#1E1E2E"
+bright_foreground = "#CDD6F4"
+dim_foreground = "#CDD6F4"
+foreground = "#CDD6F4"
+
+[colors.search.focused_match]
+background = "#A6E3A1"
+foreground = "#1E1E2E"
+
+[colors.search.matches]
+background = "#A6ADC8"
+foreground = "#1E1E2E"
+
+[colors.selection]
+background = "#F5E0DC"
+text = "#1E1E2E"
+
+[colors.vi_mode_cursor]
+cursor = "#B4BEFE"
+text = "#1E1E2E"
+
+[env]
+TERM = "xterm-256color"
+
+[font]
+size = 10

configs/home-manager/alacritty/alacritty.yml

@@ -1,82 +0,0 @@
-env:
-  TERM: xterm-256color
-history: 30000
-font:
-  normal:
-    family: monospace
-  bold:
-    family: monospace
-  italic:
-    family: monospace
-  bold_italic:
-    family: monospace
-  size: 9.5
-cursor:
-  text: CellBackground
-  cursor: CellForeground
-vi_mode_cursor:
-  text: CellBackground
-  cursor: CellForeground
-colors:
-    primary:
-        background: "#1E1E2E" # base
-        foreground: "#CDD6F4" # text
-        # Bright and dim foreground colors
-        dim_foreground: "#CDD6F4" # text
-        bright_foreground: "#CDD6F4" # text
-    cursor:
-        text: "#1E1E2E" # base
-        cursor: "#F5E0DC" # rosewater
-    vi_mode_cursor:
-        text: "#1E1E2E" # base
-        cursor: "#B4BEFE" # lavender
-    search:
-        matches:
-            foreground: "#1E1E2E" # base
-            background: "#A6ADC8" # subtext0
-        focused_match:
-            foreground: "#1E1E2E" # base
-            background: "#A6E3A1" # green
-        footer_bar:
-            foreground: "#1E1E2E" # base
-            background: "#A6ADC8" # subtext0
-    hints:
-        start:
-            foreground: "#1E1E2E" # base
-            background: "#F9E2AF" # yellow
-        end:
-            foreground: "#1E1E2E" # base
-            background: "#A6ADC8" # subtext0
-    selection:
-        text: "#1E1E2E" # base
-        background: "#F5E0DC" # rosewater
-    normal:
-        black: "#45475A" # surface1
-        red: "#F38BA8" # red
-        green: "#A6E3A1" # green
-        yellow: "#F9E2AF" # yellow
-        blue: "#89B4FA" # blue
-        magenta: "#F5C2E7" # pink
-        cyan: "#94E2D5" # teal
-        white: "#BAC2DE" # subtext1
-    bright:
-        black: "#585B70" # surface2
-        red: "#F38BA8" # red
-        green: "#A6E3A1" # green
-        yellow: "#F9E2AF" # yellow
-        blue: "#89B4FA" # blue
-        magenta: "#F5C2E7" # pink
-        cyan: "#94E2D5" # teal
-        white: "#A6ADC8" # subtext0
-    dim:
-        black: "#45475A" # surface1
-        red: "#F38BA8" # red
-        green: "#A6E3A1" # green
-        yellow: "#F9E2AF" # yellow
-        blue: "#89B4FA" # blue
-        magenta: "#F5C2E7" # pink
-        cyan: "#94E2D5" # teal
-        white: "#BAC2DE" # subtext1
-    indexed_colors:
-        - { index: 16, color: "#FAB387" }
-        - { index: 17, color: "#F5E0DC" }

modules/home-manager/base/default.nix

@@ -7,4 +7,19 @@
   home.packages = with pkgs; [
     home-manager
   ];
+
+nix = {
+    package = pkgs.nix;
+  settings = {
+      substituters = [
+        "http://nixcache.odie.intranet"
+        "https://nix-community.cachix.org"
+        "https://cache.nixos.org/"
+      ];
+      trusted-public-keys = [
+        "nixcache.odie.intranet:2j5qAVmtBUSZMPWlIRS8Gn0Il9tbotJ9c2y43N0RLKU="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      ];
+    };
+    };
 }

modules/home-manager/desktop/alacritty/alacritty.nix

@@ -5,8 +5,8 @@
       alacritty
     ];
     file.alacritty = {
-      target = ".config/alacritty/alacritty.yml";
-      source = ../../../../configs/home-manager/alacritty/alacritty.yml;
+      target = ".config/alacritty/alacritty.toml";
+      source = ../../../../configs/home-manager/alacritty/alacritty.toml;
     };
   };
 }

modules/nixos/base/binary-cache/default.nix

@@ -8,7 +8,7 @@
         "https://cache.nixos.org/"
       ];
       trusted-public-keys = [
-        "nixcache.odie.intranet:hGgFL/QIgirwA8h+FZdwPZKuW/J1xNzH6PEu5CL/OKI="
+        "nixcache.odie.intranet:2j5qAVmtBUSZMPWlIRS8Gn0Il9tbotJ9c2y43N0RLKU="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
     };

profiles/home-manager/odie@wanaheim/home.nix

@@ -3,7 +3,7 @@
   outputs,
   ...
 }: {
-  modules = [
+  imports = [
     inputs.csleeptimer.homeManagerModules.default
     outputs.homeManagerModules.base
     outputs.homeManagerModules.shell
@@ -11,7 +11,7 @@
     outputs.homeManagerModules.development
     outputs.homeManagerModules.games
     outputs.homeManagerModules.user
-    {
+    ];
       home.stateVersion = "23.11";
       desktop = {
         enable = true;
@@ -25,5 +25,3 @@
       services.picom.enable = false;
       programs.rofi.enable = true;
 }
-  ];
-}

profiles/nixos/wanaheim/configuration.nix

@@ -6,6 +6,8 @@
     inputs.nur.nixosModules.nur
     outputs.nixosModules.base
     outputs.nixosModules.desktop
+    outputs.nixosModules.wsl
+    ./hardware-configuration.nix
   ];
 
   networking = {
@@ -19,6 +21,8 @@
     ];
   };
 
+  boot.loader.systemd-boot.enable = false;
+
   programs.zsh.enable = true;
 
   nixpkgs.hostPlatform = "x86_64-linux";