flake.lock

@@ -103,28 +103,11 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1733656523,
-        "narHash": "sha256-w0FXPfpGhOihoJDiwMsyN1EzpsXi2F8VQ+NVZQSMtys=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "93dc9803a1ee435e590b02cde9589038d5cc3a4e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "agenix": "agenix",
         "home-manager": "home-manager_2",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "nixpkgs": "nixpkgs"
       }
     },
     "systems": {

flake.nix

@@ -4,7 +4,6 @@
   inputs = {
     # Specify the source of Home Manager and Nixpkgs.
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     home-manager = {
       url = "github:nix-community/home-manager/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -15,17 +14,10 @@
     };
   };
 
-  outputs = { nixpkgs, nixpkgs-unstable, home-manager, agenix, ... }:
+  outputs = { nixpkgs, home-manager, agenix, ... }:
     let
       system = "aarch64-darwin";
-      pkgs = import nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-      };
-      pkgs-unstable = import nixpkgs-unstable {
-        inherit system;
-        config.allowUnfree = true;
-      };
+      pkgs = nixpkgs.legacyPackages.${system};
     in {
       homeConfigurations."millironx" =
         home-manager.lib.homeManagerConfiguration {
@@ -37,7 +29,6 @@
 
           # Optionally use extraSpecialArgs
           # to pass through arguments to home.nix
-          extraSpecialArgs = { inherit pkgs-unstable; };
         };
     };
 }

home.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs-unstable, ... }:
+{ config, pkgs, ... }:
 
 {
   # Home Manager needs a bit of information about you and the paths it should
@@ -19,12 +19,10 @@
   # environment.
   home.packages = with pkgs; [
     act
-    anki-bin # anki is broken on aarch64-darwin
     asitop
     bat
     cowsay
     direnv
-    earthly
     ffmpeg
     figlet
     fortune
@@ -38,11 +36,9 @@
     inkscape-with-extensions
     jq
     lapce
-    logseq
     lsd
     lynx
     most
-    musescore
     neovide
     nil
     nixd
@@ -53,14 +49,11 @@
     python3
     quarto
     shellcheck
-    pkgs-unstable.signal-desktop
     sketchybar-app-font
     sqlitebrowser
     texlive.combined.scheme-full
     woodpecker-cli
     yt-dlp
-    pkgs-unstable.zed-editor
-    zotero
     zulu17
 
     # # It is sometimes useful to fine-tune packages, for example, by applying
@@ -143,7 +136,6 @@
     "$HOME/.juliaup/bin"
     "$HOME/.cargo/bin"
     "$HOME/.local/bin"
-    "$HOME/.rd/bin"
   ];
 
   # Let Home Manager install and manage itself.
@@ -178,7 +170,7 @@
       else
         eval "$(/opt/homebrew/bin/brew shellenv bash)"
       fi
-      #gpgconf --launch gpg-agent
+      gpgconf --launch gpg-agent
     '';
   };
   programs.bat = {
@@ -195,7 +187,7 @@
     userName = "Thomas A. Christensen II";
     userEmail = "25492070+MillironX@users.noreply.github.com";
     signing = {
-      key = "0x19A2EF3A3C0C18A9!";
+      key = "0x073201D703B7C376";
       signByDefault = true;
     };
     extraConfig = {
@@ -269,7 +261,7 @@
         . "$HOME/miniconda3/etc/profile.d/mamba.sh"
       fi
       # <<< conda initialize <<<
-      #gpgconf --launch gpg-agent
+      gpgconf --launch gpg-agent
       source "$HOME/.cargo/env"
     '';
     profileExtra = ''
@@ -281,14 +273,12 @@
     '';
   };
   services.gpg-agent = {
-    enable = true;
+    enable = pkgs.hostPlatform.isLinux;
     enableBashIntegration = true;
     enableSshSupport = true;
     enableZshIntegration = true;
     defaultCacheTtl = 60;
     maxCacheTtl = 120;
-    pinentryPackage = pkgs.pinentry_mac;
-    sshKeys = [ "CC3F27D613DCC2248B56A881FDDACEF6EA090E37" ];
-    verbose = true;
+    #pinentryPackage = pkgs.pinentry-qt;
   };
 }

secrets/nextcloud-password.age

@@ -1,17 +0,0 @@
-age-encryption.org/v1
--> ssh-rsa bEJDHQ
-TJA2CxSMcETzzc1R5xCAhVe76nevyLfHNVmnhYQjvFU0h+Cr7BbmaKfWRaegh1ot
-OBSQdGLwe7Vbcc2dsVpoQHwNHP/dRb1QM6rc28kRLGrRQVzz93ZkrS2P0i1qI6oU
-sO0f7PY+q3FXTC0vNr9f7tCFDEKxc9culd7TZpyI9IL820sFJ9xVsgM6z1cGs7+H
-nxq1HuOv3/9e6v44Y2zQed1Ecsr+r3uj+sL3OZFuWc3MQL6uzGui6oqW6SPnIsCO
-DeuXfxZM5EYkZQdIVN4VSCa0R7dGRhECETRE1ebfoCK2udU6z6McBSX0fZqw6hOW
-H0p8WAnd2mR6FhIwwCt0DLDv+fNw822Zw3LgoVYSeJok/HIHjV1FFI7e9L/auaAq
-/ME05nHnQl7KbEHASylwFgeM6q+IVihUBuwLlYc3LqmnCSfvcSSKOxC1SYIUpGHt
-+WCIpinBpwgEw8mzupWk4SrB2lCQz/QHZ1xMJyOHY0+qvl3ymKcNtPBpixM/uLoP
-RthRW60Zh6e2uZflrvCCYKXVcbXEhZreeYJosDfTLZS0YD0IR9u3PHk2QRzjFpL4
-mHtVRJzyVlJUKVGbJGWoku97slcqLtpU+xPzt6fE7orjlFKHNWKSFEoGgMOxxDHM
-wOY1Ka1QdMvm7OSfsNXa3KbXg5HDuvPMS/pDEXkkSNc
--> ssh-ed25519 dbKeHw 0cXhuCrGv/QYZmZvRKg/5R0vFu5C6LBR1MKDqKI6UWY
-j+XYqhAfV5AjzcaWFjFNrcS5PfCvUxLP6YXhvgaAJFw
---- 2gAo5+tlcCSJA0wlYpfHc/2CTWOnM/qKIbT3qY1HN78
-Én©B©iUzR]ÉÊ®u×¾µA86%EÃôäÙ
e²ñåR麞p¦s¸ôŸ_ˆŒ]²v§í<C2A7>ÉÑ‹ëüV

secrets/secrets.nix

@@ -1,7 +0,0 @@
-let
-  millironx =
-    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCgIDIuH/MqCiCdqopPCbdx6zKzDwFNxZJUTqVEZ74O0LdfsL22a/sSJDDjowp5cXK4NzLwi990ld2Yh+65it620Zusfub3qWfwIsTvYG+IkN3Vkrkki4ELLBlJfh69CjQv1MgBlM0TF5gL56411kxLTWmhaFUJDgt0jlfQQNyEoDdfq2rJZ1kbPS6EPoPWeVL1i+b2S5zVOHayrmRwvn5TVN66yxGaRufWTcdGibgrxByyg01/3W4mBFiJHVcnHAbN6rsdOV/I6PP/Z6yRRoHU/vf1F/nh6uWZuK4araAo+al6gxgXGfrJnQNkTDqwDa0GLc71QDNPjoUk2fjORJQsGFq2jA8+aiWukxAtgUjZIFKeMAbFVZGz9jMQK4a/7qf80set0tRzz9UKIEb5RjR+Lvm8S2xEiKLOu7aGfeFGMEUzAdG8cSmxcfwkZs1rWN1IS/0PumLu7MGnFq/Yl11mOlAjjvKNuh2dAttsqtG2yE3XdvhU1vSQkimJzogUKoWewupDFzteUt43Jen/7npDZ6R1NGJORVKsDZ+7I4Ivm7EPJV1Die/+JpX8TxKyTXKeuiazKNP2fDZU3cec5pWLTJPbn9aLsWaBx5AZ/MvqVtdSsxfFqgEOyZXJHBbP9Iv3gQ0bHP8QNO3t4gIuAmzfAkxv5x/D9HQEVNYwJyglaw== cardno:18_319_764";
-  corianne =
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOgL2lO9RJBdQYANoxGyWXcNKi5/NZkRHHo/rNqaYMc/ millironx@corianne";
-  allusers = [ millironx corianne ];
-in { "nextcloud-password.age".publicKeys = allusers; }