ahoneybun/nix-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'release-25.05' into 'main'

Browse source 
building for 25.05

See merge request ahoneybun-nix/nix-configs!13
This commit is contained in:
Aaron Honeycutt 2025-05-24 23:52:21 -06:00
commit 53645ab51d
3 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
configuration.nix
View file

@ -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;
}

8
flake.nix
View file

@ -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";

14
home.nix
View file

@ -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 = {