Removed determinate nix, prep for ubersicht, fix gpg

1 files changed, 20 insertions, 5 deletions

diff --git a/hosts/RyanMac/configuration.nix b/hosts/RyanMac/configuration.nix
index 8bd7131..bb6bafc 100644
--- a/hosts/RyanMac/configuration.nix
+++ b/hosts/RyanMac/configuration.nix
@@ -56,6 +56,9 @@ in {
 
   system.primaryUser = "${username}";
 
+  # Set the hostname for this machine
+  networking.hostName = "RyanMac";
+
   # Install the wallpaper engine
   local.randomWallpaper = {
     enable = true;
@@ -83,10 +86,20 @@ in {
     };
     extraConfig = ''
       yabai -m rule --add app='System Settings' manage=off
-      borders style=round active_color='gradient(top_left=0xee33ccff,bottom_right=0xee00ff99)' inactive_color=0xaa595959 width=6.0
     '';
   };
 
+  # Configure JankyBorders
+  services.jankyborders = {
+    enable = true;
+    style = "round";
+    width = 6.0;
+    hidpi = true;
+    ax_focus = true;
+    active_color = "gradient(top_left=0xee33ccff,bottom_right=0xee00ff99)";
+    inactive_color = "0xaa595959";
+  };
+
   # Install the /etc/nix/flake-registry.json file we made above
   environment.etc."nix/flake-registry.json".source = pinnedNixpkgs;
 
@@ -95,11 +108,11 @@ in {
     ../../files/CACerts/RyanCA.crt
   ];
 
-  # Need to disable native nix handling because of Determinate nix
-  determinateNix = {
+  nix = {
     enable = true;
-    customSettings = {
+    settings = {
       flake-registry = "/etc/nix/flake-registry.json";
+      "extra-experimental-features" = [ "nix-command" "flakes" ];
     };
   };
 
@@ -134,7 +147,6 @@ in {
     taps = builtins.attrNames thirdPartyTaps;
 
     brews = [
-    "borders"
     "mqttx-cli"
     ];
 
@@ -301,6 +313,9 @@ in {
         # Always show menu bar
         AppleMenuBarVisibleInFullscreen = true;
 
+        # Hide the menubar by default
+        "_HIHideMenuBar" = true;
+
         # Option + L lock
         NSUserKeyEquivalents = {
           "Lock Screen" = "~l";