From 7e7ad30379b6994ee185f5d7042d42f52e232b53 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Sun, 6 Aug 2023 09:39:34 -0500
Subject: [PATCH] Fix swaylock colors

---
 common/fish/config.fish           |  8 ++++++--
 os/linux/nix/daniel.nix           | 16 +++++++++++-----
 os/linux/nix/machines/thinker.nix | 10 ++++++----
 os/linux/sway/lock                |  9 +++++++--
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/common/fish/config.fish b/common/fish/config.fish
index f4c8387..2f5fb60 100755
--- a/common/fish/config.fish
+++ b/common/fish/config.fish
@@ -42,13 +42,17 @@ if test -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
 	set --prepend --export --global fish_user_paths $HOME/.nix-profile/bin /nix/var/nix/profiles/default/bin
 end
 
-if has_command nnn
-	source $DOTFILES_PATH/common/nnn/config.fish
+if has_command direnv
+	direnv hook fish | source
 end
 
 # everything after this is ONLY relevant to interactive shells
 status --is-interactive || exit
 
+if has_command nnn
+	source $DOTFILES_PATH/common/nnn/config.fish
+end
+
 for f in prompt key-bindings
 	source $FISH_PATH/$f.fish
 end
diff --git a/os/linux/nix/daniel.nix b/os/linux/nix/daniel.nix
index 0e04ac4..905d8f2 100644
--- a/os/linux/nix/daniel.nix
+++ b/os/linux/nix/daniel.nix
@@ -3,6 +3,13 @@
   home.homeDirectory = "/home/daniel/.home";
   home.stateVersion = "23.05";
 
+  programs.home-manager.enable = true;
+
+  programs.direnv.enable = true;
+  programs.nix-direnv.enable = true;
+
+  programs.fish.enable = true;
+
   programs.nix-index = {
     enable = true;
     enableFishIntegration = true;
@@ -11,11 +18,9 @@
   home.pointerCursor = {
     name = "Catppuccin-Mocha-Sapphire-Cursors";
     package = pkgs.catppuccin-cursors.mochaSapphire;
-    size = 64;
+    size = 64; # TODO: this doesn't seem to work -- at least in Sway
   };
 
-  programs.home-manager.enable = true;
-
   programs.firefox = {
     enable = true;
 
@@ -23,7 +28,7 @@
 
     # extensions = with pkgs.nur.repos.rycee.firefox-addons; [
     #   ublock-origin
-    # ];
+    # ]; # TODO: would be nice to have _all_ my firefox stuff managed here instead of Firefox Sync maybe?
 
     profiles = {
       daniel = {
@@ -65,5 +70,6 @@
 
   # wayland.windowManager.sway = {
   #   enable = true;
-  # };
+  # }; # TODO: would be nice to have my sway config declared here instead of symlinked in by dotfiles scripts?
+  # maybe we can share somehow so things for nix-y systems and non-nix-y systems alike
 }
diff --git a/os/linux/nix/machines/thinker.nix b/os/linux/nix/machines/thinker.nix
index 93e0954..bf4e6ee 100644
--- a/os/linux/nix/machines/thinker.nix
+++ b/os/linux/nix/machines/thinker.nix
@@ -169,7 +169,6 @@ in
     fd
     feh
     file
-    (firefox.override { extraNativeMessagingHosts = [ passff-host ]; })
     fwupd
     gcc
     gimp
@@ -180,6 +179,7 @@ in
     hexyl
     htop
     inkscape
+    inotify-tools
     iputils
     killall
     kitty
@@ -200,6 +200,7 @@ in
     (pass.withExtensions (exts: [ exts.pass-otp ]))
     pavucontrol
     pciutils
+    pgcli
     playerctl
     pulseaudio
     pulsemixer
@@ -287,12 +288,13 @@ in
 
     authentication = pkgs.lib.mkOverride 10 ''
       #type database  DBuser    auth-method
-      local all       postgres  peer map=superuser_map        
-      local all       daniel    peer map=superuser_map        
-      local sameuser  all       peer map=superuser_map        
+      local all       postgres  peer map=superuser_map
+      local all       daniel    peer map=superuser_map
+      local sameuser  all       peer map=superuser_map
 
       # lan ipv4
       host  all       all     10.0.0.0/24   trust
+      host  all       all     127.0.0.1/32  trust
 
       # tailnet ipv4
       host       all       all     100.64.0.0/10 trust
diff --git a/os/linux/sway/lock b/os/linux/sway/lock
index 1029830..d424e42 100644
--- a/os/linux/sway/lock
+++ b/os/linux/sway/lock
@@ -19,6 +19,11 @@ line-color=111111cc
 line-uses-ring
 
 ring-color=111111cc
-ring-clear-color=f4bf75
+ring-clear-color=f9e2af
 ring-ver-color=66d9ef
-ring-wrong-color=f92672
+ring-wrong-color=f38ba8
+
+text-color=ffffff
+text-clear-color=ffffff
+text-ver-color=ffffff
+text-wrong-color=f38ba8