From 78690d5e544616e73562e13d0c27bd910480111c Mon Sep 17 00:00:00 2001 From: Ryan Schanzenbacher Date: Mon, 6 Jul 2026 20:41:17 -0400 Subject: Removed determinate nix, prep for ubersicht, fix gpg --- flake.lock | 204 +--------------------------------------- flake.nix | 2 - hosts/RyanMac/configuration.nix | 25 ++++- users/ryan/home.nix | 10 +- 4 files changed, 30 insertions(+), 211 deletions(-) diff --git a/flake.lock b/flake.lock index fad022e..09985fe 100644 --- a/flake.lock +++ b/flake.lock @@ -38,126 +38,6 @@ "type": "github" } }, - "determinate": { - "inputs": { - "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", - "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", - "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", - "nix": "nix", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1780941588, - "narHash": "sha256-cXxaBtTSYEYVtSxw4IH0hPa+p+VFxS0i+66GwxVFk7o=", - "rev": "70c28bcdd4dde10d04f39e7accb5738a1f5d5298", - "revCount": 421, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.21.1/019ea867-5568-7d03-9579-e943ed6d4cef/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/determinate/3" - } - }, - "determinate-nixd-aarch64-darwin": { - "flake": false, - "locked": { - "narHash": "sha256-ctwRrPKWBSFkTqlCHRGz6MHBSWRkbSAEVGoelsxdr2g=", - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/macOS" - }, - "original": { - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/macOS" - } - }, - "determinate-nixd-aarch64-linux": { - "flake": false, - "locked": { - "narHash": "sha256-qYFrMN6lSMRYV87D/uK5L2CUBvOpoLZAAfSYXvcp9cc=", - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/aarch64-linux" - }, - "original": { - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/aarch64-linux" - } - }, - "determinate-nixd-x86_64-linux": { - "flake": false, - "locked": { - "narHash": "sha256-BxzPf6fT1ekyvD5JA0vvDJOTPtIyjrzVg3Puuo0ftbg=", - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/x86_64-linux" - }, - "original": { - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/x86_64-linux" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "determinate", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748821116, - "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", - "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", - "revCount": 377, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.377%2Brev-49f0870db23e8c1ca0b5259734a02cd9e1e371a1/01972f28-554a-73f8-91f4-d488cc502f08/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1" - } - }, - "git-hooks-nix": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": [ - "determinate", - "nix" - ], - "nixpkgs": [ - "determinate", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", - "revCount": 1026, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1026%2Brev-80479b6ec16fefd9c1db3ea13aeb038c60530f46/0196d79a-1b35-7b8e-a021-c894fb62163d/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -210,27 +90,6 @@ "type": "github" } }, - "nix": { - "inputs": { - "flake-parts": "flake-parts", - "git-hooks-nix": "git-hooks-nix", - "nixpkgs": "nixpkgs", - "nixpkgs-23-11": "nixpkgs-23-11", - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1780939209, - "narHash": "sha256-/JuW5C6sWuC836Y9b7hga3ZvhRiY4k4Zs73RRg5KVWM=", - "rev": "952beffe9c45ed245d30209d4f17cf1d26654a2a", - "revCount": 26044, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.21.1/019ea860-2acd-7680-ae61-10f9574b2694/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A" - } - }, "nix-homebrew": { "inputs": { "brew-src": "brew-src" @@ -250,66 +109,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1773222311, - "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=", - "rev": "0590cd39f728e129122770c029970378a79d076a", - "revCount": 909248, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.909248%2Brev-0590cd39f728e129122770c029970378a79d076a/019ce32b-8ace-7339-b129-cceaa8dd10c6/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2511" - } - }, - "nixpkgs-23-11": { - "locked": { - "lastModified": 1717159533, - "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - } - }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1780336545, - "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", - "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f", - "revCount": 1008784, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.1008784%2Brev-4df1b885d76a54e1aa1a318f8d16fd6005b6401f/019e8725-c925-7ec1-8f35-3f9effcf169a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1781229721, "narHash": "sha256-ORvqDbb/LYxiJljGIejapjkc/kJbVote2N1WSb9W45I=", @@ -328,12 +127,11 @@ "root": { "inputs": { "darwin": "darwin", - "determinate": "determinate", "home-manager": "home-manager", "homebrew-cask": "homebrew-cask", "homebrew-core": "homebrew-core", "nix-homebrew": "nix-homebrew", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "zen-browser": "zen-browser" } }, diff --git a/flake.nix b/flake.nix index c75f436..b48ab94 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,6 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/3"; zen-browser = { # Used exclusively for HM module, Zen is installed via cask url = "github:0xc000022070/zen-browser-flake"; inputs = { @@ -36,7 +35,6 @@ specialArgs = { inherit inputs; }; modules = [ { nixpkgs.config.allowUnfree = true; } - inputs.determinate.darwinModules.default ./hosts/RyanMac/configuration.nix home-manager.darwinModules.home-manager { 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"; diff --git a/users/ryan/home.nix b/users/ryan/home.nix index a83257b..5542baa 100644 --- a/users/ryan/home.nix +++ b/users/ryan/home.nix @@ -89,10 +89,18 @@ }; services.gpg-agent = { - enable = true; + enable = pkgs.stdenv.isLinux; enableSshSupport = true; }; + # Need special config for gpg-agent on macOS + home.file.".gnupg/gpg-agent.conf" = lib.mkIf pkgs.stdenv.isDarwin { + text = '' + pinentry-program ${pkgs.pinentry_mac}/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac + enable-ssh-support + ''; + }; + programs.zsh = { enable = true; initContent = let -- cgit v1.3