jordan/nix-config
1
1
Fork 0
Code Issues 10 Pull Requests Actions Projects 3 Wiki Activity

treewide: update to 25.11
Some checks failed
Check flake / build-amd64-linux (push) Failing after 25s
Details

Browse Source
This commit is contained in:
Jordan Holt
2025-12-01 11:55:55 +00:00
parent 210a95216e
commit b1ed31104b
10 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flake.nix
View File

@@ -30,7 +30,7 @@
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05"; url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@@ -63,18 +63,18 @@
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
nixos-mailserver = { nixos-mailserver = {
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05"; url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixpkgs.url = "nixpkgs/nixos-25.05"; nixpkgs.url = "nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
# nixpkgs-master.url = "nixpkgs"; # nixpkgs-master.url = "nixpkgs";
nixvim = { nixvim = {
url = "github:nix-community/nixvim/nixos-25.05"; url = "github:nix-community/nixvim/nixos-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

2
hosts/common.nix
View File

@@ -124,7 +124,7 @@
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
sharedModules = [ sharedModules = [
inputs.nixvim.homeManagerModules.nixvim inputs.nixvim.homeModules.nixvim
{ {
home.stateVersion = config.system.stateVersion; home.stateVersion = config.system.stateVersion;
} }

4
hosts/odyssey/home-assistant/default.nix
View File

@@ -124,13 +124,13 @@
"folder_watcher" "folder_watcher"
"forecast_solar" "forecast_solar"
"frontend" "frontend"
"gdacs" # "gdacs"
"generic" "generic"
"generic_hygrostat" "generic_hygrostat"
"generic_thermostat" "generic_thermostat"
"geo_json_events" "geo_json_events"
"geo_location" "geo_location"
"geo_rss_events" # "geo_rss_events"
"github" "github"
"group" "group"
"hardware" "hardware"

2
users/jordan/artemis.nix
View File

@@ -12,7 +12,7 @@
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
jellyfin-media-player # jellyfin-media-player
unstable.lutris unstable.lutris
pcsx2 pcsx2
xemu xemu

2
users/jordan/atlas.nix
View File

@@ -10,7 +10,7 @@
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
jellyfin-media-player # jellyfin-media-player
qbittorrent qbittorrent
]; ];
} }

8
users/jordan/common/git.nix
View File

@@ -5,6 +5,7 @@
{ {
programs.git = { programs.git = {
enable = true; enable = true;
settings = {
aliases = { aliases = {
amend = "commit --amend"; amend = "commit --amend";
lg = "log --color --graph --abbrev-commit --"; lg = "log --color --graph --abbrev-commit --";
@@ -12,6 +13,11 @@
unadd = "reset HEAD"; unadd = "reset HEAD";
undo-commit = "reset --soft \"HEAD^\""; undo-commit = "reset --soft \"HEAD^\"";
}; };
user = {
email = "jordan@vimium.com";
name = "Jordan Holt";
};
};
ignores = [ ignores = [
".Trash-*" ".Trash-*"
"[._]*.s[a-v][a-z]" "[._]*.s[a-v][a-z]"
@@ -27,8 +33,6 @@
"[._]*.un~" "[._]*.un~"
"cmake-build-*/" "cmake-build-*/"
]; ];
userEmail = "jordan@vimium.com";
userName = "Jordan Holt";
signing = { signing = {
key = "B8CFFF61F1CCF520"; key = "B8CFFF61F1CCF520";
signByDefault = true; signByDefault = true;

4
users/jordan/common/neovim.nix
View File

@@ -176,9 +176,9 @@
plugins.treesitter-refactor = { plugins.treesitter-refactor = {
enable = true; enable = true;
highlightDefinitions = { settings.highlight_definitions = {
enable = true; enable = true;
clearOnCursorMove = false; clear_on_cursor_move = false;
}; };
}; };

2
users/jordan/common/ssh.nix
View File

@@ -7,7 +7,7 @@
programs.ssh = { programs.ssh = {
enable = true; enable = true;
addKeysToAgent = "yes"; matchBlocks."*".addKeysToAgent = "yes";
}; };
home.persistence."/state".files = [ home.persistence."/state".files = [

2
users/jordan/helios.nix
View File

@@ -14,6 +14,6 @@
programs.nh.enable = true; programs.nh.enable = true;
home.packages = with pkgs; [ home.packages = with pkgs; [
jellyfin-media-player # jellyfin-media-player
]; ];
} }

2
users/jordan/odyssey.nix
View File

@@ -22,7 +22,7 @@
gimp gimp
handbrake handbrake
inkscape inkscape
jellyfin-media-player # jellyfin-media-player
krita krita
unstable.lutris unstable.lutris
mkvtoolnix mkvtoolnix