From bfbd5e8f075c9627d9306f9bc02fbd136d3b0021 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Sat, 24 May 2025 23:52:00 -0600
Subject: [PATCH] building for 25.05

---
 configuration.nix |  4 +++-
 flake.nix         |  8 ++++----
 home.nix          | 14 +++++++-------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index a0ae7cd..3f4f1f2 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -82,6 +82,8 @@
 
          # Flake CLI tools
          inputs.pinix.packages.${system}.default
+         inputs.nixpkgs-ahoneybun.packages.${system}.honeyfetch
+         inputs.nixpkgs-ahoneybun.packages.${system}.naviterm
          ]; 
  
    # Enable/Disable hardware
@@ -125,6 +127,6 @@
    services.hardware.bolt.enable = true;
 
    # System 
-   system.stateVersion = "24.11";
+   system.stateVersion = "25.05";
    system.autoUpgrade.enable = true;
 }
diff --git a/flake.nix b/flake.nix
index 7eb7598..dca119a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,17 +2,17 @@
    description = "Generic System Flake file";
 
    inputs = {
-      nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
-      #nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+      nixpkgs.url = "github:NixOS/nixpkgs/release-25.05";
+      nixpkgs-ahoneybun.url = "gitlab:ahoneybun/nixpkgs/main";
       home-manager = {
-         url = "github:nix-community/home-manager/release-24.11";
+         url = "github:nix-community/home-manager/release-25.05";
          inputs.nixpkgs.follows = "nixpkgs";
       };
       nixos-hardware.url = "github:NixOS/nixos-hardware/master";
       pinix.url = "github:remi-dupre/pinix";
    };
 
-   outputs = inputs@{ self, nixpkgs, home-manager, nixos-hardware, pinix }: {
+   outputs = inputs@{ self, nixpkgs, nixpkgs-ahoneybun, home-manager, nixos-hardware, pinix }: {
       nixosConfigurations = {
          "nixos" = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
diff --git a/home.nix b/home.nix
index cc51dde..8f42f1f 100644
--- a/home.nix
+++ b/home.nix
@@ -5,7 +5,7 @@
   home = {
     username = "aaronh";
     homeDirectory = "/home/aaronh";
-    stateVersion = "24.11";
+    stateVersion = "25.05";
   };
 
   home.packages = with pkgs; [
@@ -15,14 +15,16 @@
 
   ];
 
+  programs.starship = {
+    enable = true;
+    enableBashIntegration = true;
+  };
+
   programs.bash = {
     enable = true;
     shellAliases = {
-      nix-generations = "sudo nix-env -p /nix/var/nix/profiles/system --list-generations";
-      nix-upgrade = "sudo nixos-rebuild switch --upgrade";
-      nix-full-upgrade = "sudo nix flake update --flake /etc/nixos && sudo nixos-rebuild switch --upgrade";
+      gits = "git status";
     };
-    bashrcExtra = "eval `ssh-agent`";
   };
 
   programs.git = {
@@ -33,8 +35,6 @@
     aliases = {
        undo = "reset HEAD~1 --mixed";
        amend = "commit -a --amend";
-       feature = "commit -m feat: -m new-feature";
-       fix = "commit -m fix: -m issue#";
     };
     extraConfig = {
       color = {