From 75d10e2b7e00e6d8f20b54cf6c922a906fae1865 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Thu, 5 Oct 2023 10:41:31 -0500
Subject: [PATCH] Cleanup, color scheme fixes

---
 flake.nix                       | 24 ++++++--------
 home/default.nix                | 59 ++++++++++++++++-----------------
 home/linux.nix                  |  6 ++++
 home/work.nix                   |  4 +--
 modules/nixos/common.nix        | 40 +++++++++++-----------
 modules/nixos/desktop-usage.nix |  6 ++--
 modules/nixos/sway.nix          |  1 -
 modules/nixos/wifi.nix          |  8 ++---
 nixos/beefcake/default.nix      |  2 +-
 readme.md                       | 11 +++++-
 10 files changed, 84 insertions(+), 77 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0679478..6039f63 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,12 +51,11 @@
         # pink,
         purple,
         red,
-        # orange,
+        orange,
         yellow,
         green,
-        teal,
+        # teal,
         blue,
-        ...
       }: let
         base =
           {
@@ -73,14 +72,14 @@
             "9" = red;
             "2" = green;
             "10" = green;
-            "3" = yellow;
-            "11" = yellow;
+            "3" = orange;
+            "11" = orange;
             "4" = blue;
             "12" = blue;
             "5" = purple;
             "13" = purple;
-            "6" = teal;
-            "14" = teal;
+            "6" = yellow;
+            "14" = yellow;
 
             # whites
             "7" = fg2;
@@ -111,8 +110,8 @@
         yellow = "f4bf75";
         blue = "66d9ef";
         purple = "ae81ff";
-        teal = "a1efe4";
-        # orange = "fab387";
+        # teal = "a1efe4";
+        orange = "fab387";
       };
       catppuccin-mocha-sapphire = mkColorScheme {
         scheme-name = "catppuccin-mocha-sapphire";
@@ -130,11 +129,10 @@
         # pink = "f5e0dc";
         purple = "cba6f7";
         red = "f38ba8";
-        # orange = "fab387";
-        # yellow = "f9e2af";
-        yellow = "fab387";
+        orange = "fab387";
+        yellow = "f9e2af";
         green = "a6e3a1";
-        teal = "94e2d5";
+        # teal = "94e2d5";
         blue = "74c7ec";
       };
     };
diff --git a/home/default.nix b/home/default.nix
index c3de5b7..83f2e22 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -10,15 +10,6 @@
   email = "daniel@lyte.dev";
   name = "Daniel Flanagan";
 in {
-  # TODO: email access?
-  /*
-  accounts.email.accounts = {
-    google = {
-      address = "wraithx2@gmail.com";
-    };
-  };
-  */
-
   # TODO: fonts? right now they are only handled at the nixos-level (desktop-usage module)
   # TODO: wallpaper?
 
@@ -35,12 +26,13 @@ in {
       # I use gawk for my fish prompt
       pkgs.gawk
 
+      # text editor
       inputs.helix.packages.${system}.helix
 
+      # tools I use when editing nix code
       pkgs.nil
       pkgs.alejandra
 
-      # TODO: os-specific scripts? macOS versus Linux (arch or nixos? do I need to distinguish at that point?)
       (pkgs.buildEnv {
         name = "my-scripts-common";
         paths = [./scripts/common];
@@ -391,17 +383,17 @@ in {
 
     themes = with colors.withHashPrefix; {
       custom = {
-        "type" = yellow;
+        "type" = orange;
 
         "constructor" = blue;
 
-        "constant" = yellow;
-        "constant.builtin" = yellow;
-        "constant.character" = teal;
-        "constant.character.escape" = yellow;
+        "constant" = orange;
+        "constant.builtin" = orange;
+        "constant.character" = yellow;
+        "constant.character.escape" = orange;
 
         "string" = green;
-        "string.regexp" = yellow;
+        "string.regexp" = orange;
         "string.special" = blue;
 
         "comment" = {
@@ -423,7 +415,7 @@ in {
         "punctuation.special" = blue;
 
         "keyword" = purple;
-        "keyword.storage.modifier.ref" = teal;
+        "keyword.storage.modifier.ref" = yellow;
         "keyword.control.conditional" = {
           fg = purple;
           modifiers = ["italic"];
@@ -445,13 +437,13 @@ in {
         "special" = blue;
 
         "markup.heading.marker" = {
-          fg = yellow;
+          fg = orange;
           modifiers = ["bold"];
         };
         "markup.heading.1" = blue;
-        "markup.heading.2" = teal;
+        "markup.heading.2" = yellow;
         "markup.heading.3" = green;
-        "markup.heading.4" = yellow;
+        "markup.heading.4" = orange;
         "markup.heading.5" = red;
         "markup.heading.6" = fg3;
         "markup.list" = purple;
@@ -500,7 +492,7 @@ in {
           fg = text;
           bg = bg2;
         };
-        "ui.window" = {fg = fg3;};
+        "ui.window" = {fg = fgdim;};
         "ui.help" = {
           fg = fg2;
           bg = bg2;
@@ -514,8 +506,8 @@ in {
 
         "ui.text" = text;
         "ui.text.focus" = {
-          fg = "text";
-          bg = "surface0";
+          fg = text;
+          bg = bg3;
           modifiers = ["bold"];
         };
         "ui.text.inactive" = {fg = fg2;};
@@ -528,7 +520,7 @@ in {
           bg = bg;
         };
 
-        "ui.selection" = {bg = bg5;};
+        "ui.selection" = {bg = bg3;};
 
         "ui.cursor" = {
           fg = bg;
@@ -539,7 +531,7 @@ in {
           bg = red;
         };
         "ui.cursor.match" = {
-          fg = yellow;
+          fg = orange;
           modifiers = ["bold"];
         };
 
@@ -572,7 +564,8 @@ in {
         "ui.cursorline.primary" = {bg = bg3;};
 
         "ui.highlight" = {
-          bg = fg2;
+          bg = primary;
+          fg = bg;
           modifiers = ["bold"];
         };
 
@@ -582,7 +575,7 @@ in {
         };
         "ui.menu.selected" = {
           fg = text;
-          bg = bg4;
+          bg = bg3;
           modifiers = ["bold"];
         };
 
@@ -594,7 +587,7 @@ in {
         };
         "diagnostic.warning" = {
           underline = {
-            color = yellow;
+            color = orange;
             style = "curl";
           };
         };
@@ -612,10 +605,13 @@ in {
         };
 
         error = red;
-        warning = yellow;
+        warning = orange;
         info = blue;
-        hint = teal;
-        "ui.background" = bg;
+        hint = yellow;
+        "ui.background" = {
+          bg = bg;
+          fg = fgdim;
+        };
 
         # "ui.cursorline.primary" = { bg = "default" }
         # "ui.cursorline.secondary" = { bg = "default" }
@@ -957,6 +953,7 @@ in {
     enable = false;
     enableFishIntegration = true;
     settings = {
+      pane_frames = false;
       # TODO: port config
     };
   };
diff --git a/home/linux.nix b/home/linux.nix
index 4ffa3c3..41743d6 100644
--- a/home/linux.nix
+++ b/home/linux.nix
@@ -434,6 +434,12 @@
         "*" = {
           background = "$HOME/.wallpaper fill";
         };
+
+        "Dell Inc. DELL U2720Q D3TM623" = {
+          # desktop left vertical monitor
+          transform = "90";
+          scale = "1.5";
+        };
       };
 
       # TODO: popup_during_fullscreen smart
diff --git a/home/work.nix b/home/work.nix
index 56bf1b3..231e7c3 100644
--- a/home/work.nix
+++ b/home/work.nix
@@ -1,5 +1,5 @@
-{lib, ...}: let
-  username = "daniel.flanagan@divvypay.com";
+{...}: let
+  username = "daniel.flanagan@hq.bill.com";
 in {
   home.username = username;
   home.homeDirectory = "/Users/${username}";
diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix
index 51e7e22..a78d355 100644
--- a/modules/nixos/common.nix
+++ b/modules/nixos/common.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   inputs,
+  colors,
   # outputs,
   system,
   ...
@@ -112,8 +113,7 @@ in {
         PasswordAuthentication = false;
       };
 
-      # TODO: tailscale can handle this I think...?
-      openFirewall = lib.mkDefault true;
+      openFirewall = lib.mkDefault false;
 
       # listenAddresses = [
       #   { addr = "0.0.0.0"; port = 22; }
@@ -134,23 +134,23 @@ in {
     useXkbConfig = true;
     earlySetup = true;
 
-    colors = [
-      "111111"
-      "f92672"
-      "a6e22e"
-      "f4bf75"
-      "66d9ef"
-      "ae81ff"
-      "a1efe4"
-      "f8f8f2"
-      "75715e"
-      "f92672"
-      "a6e22e"
-      "f4bf75"
-      "66d9ef"
-      "ae81ff"
-      "a1efe4"
-      "f9f8f5"
+    colors = with colors; [
+      bg
+      red
+      green
+      orange
+      blue
+      purple
+      yellow
+      fg3
+      fgdim
+      red
+      green
+      orange
+      blue
+      purple
+      yellow
+      fg
     ];
   };
 
@@ -160,7 +160,7 @@ in {
     firewall = {
       enable = lib.mkDefault true;
       allowPing = lib.mkDefault true;
-      allowedTCPPorts = lib.mkDefault [22];
+      allowedTCPPorts = lib.mkDefault [];
       allowedUDPPorts = lib.mkDefault [];
     };
   };
diff --git a/modules/nixos/desktop-usage.nix b/modules/nixos/desktop-usage.nix
index 4b4ed16..13b86f1 100644
--- a/modules/nixos/desktop-usage.nix
+++ b/modules/nixos/desktop-usage.nix
@@ -4,13 +4,11 @@
   system,
   ...
 }: {
-  # TODO: add a DE?
-  # and include either plasma or gnome as a fallback?
-
   imports = [
     ./sway.nix
     ./hyprland.nix
-    ./plasma.nix
+    # ./plasma.nix
+    # ./gnome.nix
     ./user-installed-applications.nix
   ];
 
diff --git a/modules/nixos/sway.nix b/modules/nixos/sway.nix
index 3ab61e5..b97c2e4 100644
--- a/modules/nixos/sway.nix
+++ b/modules/nixos/sway.nix
@@ -45,7 +45,6 @@
     };
 
     systemPackages = with pkgs; [
-      # TODO: converge with home manager/sway stuff?
       brightnessctl
       feh
       gimp
diff --git a/modules/nixos/wifi.nix b/modules/nixos/wifi.nix
index 7e88caf..e15dddf 100644
--- a/modules/nixos/wifi.nix
+++ b/modules/nixos/wifi.nix
@@ -1,9 +1,9 @@
 {...}: {
+  # TODO: would like to move away from network manager to iwd
   networking.networkmanager.enable = true;
   systemd.services.NetworkManager-wait-online.enable = false;
 
-  # iwd?
-  # powersave?
-  # TODO: can I pre-configure my usual wifi networks with SSIDs and PSKs loaded
-  # from secrets?
+  # TODO: powersave?
+
+  # TODO: can I pre-configure my usual wifi networks with SSIDs and PSKs loaded from secrets?
 }
diff --git a/nixos/beefcake/default.nix b/nixos/beefcake/default.nix
index b9e72ea..773ed3e 100644
--- a/nixos/beefcake/default.nix
+++ b/nixos/beefcake/default.nix
@@ -86,7 +86,7 @@
 
       "api.lyte.dev" = {
         path = "${config.services.api-lyte-dev.stateDir}/secrets.json";
-        # TODO: would be cool to assert that it's correctly-formatted JSON?
+        # TODO: would be cool to assert that it's correctly-formatted JSON? probably should be done in a pre-commit hook?
         mode = "0440";
         owner = config.services.api-lyte-dev.user;
         group = config.services.api-lyte-dev.group;
diff --git a/readme.md b/readme.md
index c983912..b7d3b3b 100644
--- a/readme.md
+++ b/readme.md
@@ -81,7 +81,6 @@ nix run nixpkgs#nixos-rebuild -- --flake "git+https://git.lyte.dev/lytedev/nix#$
 
 # if we still have ssh access and the machine fails testing, just rollback
 # instead of waiting for the reboot
-# TODO: this is not tested yet
 ssh "root@$host" nixos-rebuild --rollback switch
 ```
 
@@ -120,6 +119,16 @@ nix-shell --packages git \
 
 # To Do
 
+## Short Term
+
+- Fix Helix UI (picker borders gone)
+- Remove all work-specific config and stick that in its own flake that uses my main flake as input
+- Fonts installed by home manager instead of nixos module
+- Zellij config
+- Broot theme
+
+## Long Term
+
 - I don't understand Nix well enough to know why stuff is being compiled even when I have a binary cache
   - Maybe it detects different CPUs and will recompile certain packages for per-CPU optimizations?
     - How does this factor in with "pureness"?