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

Compare commits

base: jordan:d7cfed8e7e0b0598b91d0b16e9e7141af3eb961f
Branches Tags
jordan:master jordan:helios-disko jordan:hass jordan:immich jordan:zitadel jordan:skycam jordan:24.05 jordan:lunarvim jordan:matrix jordan:docs jordan:vps1 jordan:wallpapers jordan:fix-odyssey-nix-store
...
compare: jordan:b1ed31104b3a88b8521a54c9159c9d0079cc2106
Branches Tags
jordan:master jordan:helios-disko jordan:hass jordan:immich jordan:zitadel jordan:skycam jordan:24.05 jordan:lunarvim jordan:matrix jordan:docs jordan:vps1 jordan:wallpapers jordan:fix-odyssey-nix-store

2 Commits
d7cfed8e7e ... b1ed31104b

Author SHA1 Message Date
Jordan Holt
b1ed31104b treewide: update to 25.11
Some checks failed
Check flake / build-amd64-linux (push) Failing after 25s
Details
2025-12-01 11:55:55 +00:00
Jordan Holt
210a95216e flake.lock: Update 
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/44831a7eaba4360fb81f2acc5ea6de5fde90aaa3?narHash=sha256-WHkdBlw6oyxXIra/vQPYLtqY%2B3G8dUVZM8bEXk0t8x4%3D' (2025-11-24)
  → 'github:nix-community/home-manager/3fdd076e08049a9c7a83149b270440d9787d2df5?narHash=sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4%3D' (2025-11-30)
• Updated input 'hyprland':
    'github:hyprwm/Hyprland/f11cf6f1de708b6b3811788e8ff7984ff05a9546?narHash=sha256-IiUf%2B9IG6gtiMJw3EJkgb2mlwv5ZtLQAZEeqf2oqejk%3D' (2025-11-29)
  → 'github:hyprwm/Hyprland/bb963fb00263bac78a0c633d1d0d02ae4763222c?narHash=sha256-gDP05ePlorViRWcDA3eYu4l%2B3NE53sayi6iHaaQDEMA%3D' (2025-11-30)
• Updated input 'nixos-mailserver':
    'gitlab:simple-nixos-mailserver/nixos-mailserver/5b38fb599f50e9d78325d1d2706e36303c166047?narHash=sha256-mEc3SBjRYfMcbNFLxmCc5tRtlu3j%2B1q7zRz%2BnRraSFE%3D' (2025-11-16)
  → 'gitlab:simple-nixos-mailserver/nixos-mailserver/a14fe3b293ec2720e5b7fc72ad136d22967e12ba?narHash=sha256-%2BHUOwSIFLoyett2cvRjuFIbhobpHallfP9J2cia1apo%3D' (2025-11-26)
• Updated input 'nixos-mailserver/flake-compat':
    'github:edolstra/flake-compat/9100a0f413b0c601e0533d1d94ffd501ce2e7885?narHash=sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX%2BfjA8Xf8PUmqCY%3D' (2025-05-12)
  → 'github:edolstra/flake-compat/f387cd2afec9419c8ee37694406ca490c3f34ee5?narHash=sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4%3D' (2025-10-27)
• Updated input 'nixos-mailserver/git-hooks':
    'github:cachix/git-hooks.nix/dcf5072734cb576d2b0c59b2ac44f5050b5eac82?narHash=sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco%3D' (2025-03-22)
  → 'github:cachix/git-hooks.nix/7275fa67fbbb75891c16d9dee7d88e58aea2d761?narHash=sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA%3D' (2025-11-16)
• Removed input 'nixos-mailserver/nixpkgs-25_05'
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/9a7b80b6f82a71ea04270d7ba11b48855681c4b0?narHash=sha256-82L%2BEJU%2B40%2BFIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o%3D' (2025-11-28)
  → 'github:NixOS/nixpkgs/8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f?narHash=sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD%2B/cTUzzgVFoaHrkqY%3D' (2025-11-30)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/2fad6eac6077f03fe109c4d4eb171cf96791faa4?narHash=sha256-sKoIWfnijJ0%2B9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI%3D' (2025-11-27)
  → 'github:NixOS/nixpkgs/2d293cbfa5a793b4c50d17c05ef9e385b90edf6c?narHash=sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4%3D' (2025-11-30)
• Updated input 'nixvim':
    'github:nix-community/nixvim/ed3c771ab21b082f61955e43db8cc6e63386d8fc?narHash=sha256-k%2By285jyeE0qrqKq1L/TMeDZO7XIk7ActLASi%2BniqWk%3D' (2025-11-29)
  → 'github:nix-community/nixvim/967ba0bbe11cb9e5db56449c56e9d061c2915857?narHash=sha256-G%2BTNek01gaoje0kcMN9hZ3JL4xiMc0tUqDxzKL8B/f8%3D' (2025-11-30)
 2025-12-01 10:45:48 +00:00
11 changed files with 55 additions and 68 deletions
Expand all files Collapse all files

75
flake.lock generated
View File

@@ -277,11 +277,11 @@
"flake-compat_3": { "flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1747046372, "lastModified": 1761588595,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -415,11 +415,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742649964, "lastModified": 1763319842,
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -517,16 +517,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763992789, "lastModified": 1764536451,
"narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", "narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", "rev": "3fdd076e08049a9c7a83149b270440d9787d2df5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -605,11 +605,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1764451009, "lastModified": 1764515131,
"narHash": "sha256-IiUf+9IG6gtiMJw3EJkgb2mlwv5ZtLQAZEeqf2oqejk=", "narHash": "sha256-gDP05ePlorViRWcDA3eYu4l+3NE53sayi6iHaaQDEMA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "f11cf6f1de708b6b3811788e8ff7984ff05a9546", "rev": "bb963fb00263bac78a0c633d1d0d02ae4763222c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -956,20 +956,19 @@
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"nixpkgs-25_05": "nixpkgs-25_05"
}, },
"locked": { "locked": {
"lastModified": 1763302796, "lastModified": 1764185122,
"narHash": "sha256-mEc3SBjRYfMcbNFLxmCc5tRtlu3j+1q7zRz+nRraSFE=", "narHash": "sha256-+HUOwSIFLoyett2cvRjuFIbhobpHallfP9J2cia1apo=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "5b38fb599f50e9d78325d1d2706e36303c166047", "rev": "a14fe3b293ec2720e5b7fc72ad136d22967e12ba",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"type": "gitlab" "type": "gitlab"
} }
@@ -990,22 +989,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-25_05": {
"locked": {
"lastModified": 1747610100,
"narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1761765539, "lastModified": 1761765539,
@@ -1023,11 +1006,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1764242076, "lastModified": 1764517877,
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1038,16 +1021,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1764316264, "lastModified": 1764522689,
"narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=", "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0", "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"type": "indirect" "type": "indirect"
} }
}, },
@@ -1061,16 +1044,16 @@
"systems": "systems_6" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1764434567, "lastModified": 1764538972,
"narHash": "sha256-k+y285jyeE0qrqKq1L/TMeDZO7XIk7ActLASi+niqWk=", "narHash": "sha256-G+TNek01gaoje0kcMN9hZ3JL4xiMc0tUqDxzKL8B/f8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "ed3c771ab21b082f61955e43db8cc6e63386d8fc", "rev": "967ba0bbe11cb9e5db56449c56e9d061c2915857",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixvim", "repo": "nixvim",
"type": "github" "type": "github"
} }

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

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

@@ -5,12 +5,18 @@
{ {
programs.git = { programs.git = {
enable = true; enable = true;
aliases = { settings = {
amend = "commit --amend"; aliases = {
lg = "log --color --graph --abbrev-commit --"; amend = "commit --amend";
ls = "ls-files"; lg = "log --color --graph --abbrev-commit --";
unadd = "reset HEAD"; ls = "ls-files";
undo-commit = "reset --soft \"HEAD^\""; unadd = "reset HEAD";
undo-commit = "reset --soft \"HEAD^\"";
};
user = {
email = "jordan@vimium.com";
name = "Jordan Holt";
};
}; };
ignores = [ ignores = [
".Trash-*" ".Trash-*"
@@ -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