diff --git a/flake.lock b/flake.lock index e65174c..7321fde 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1775029908, - "narHash": "sha256-QuPn+EN/097aBLeSqbQ7vOwc5TSOb68bAxg1+mknfmw=", + "lastModified": 1751438379, + "narHash": "sha256-0u0rFAkdUIexx8r7+TkGjUsmauK6kKQ/RtE7vCEwLLE=", "owner": "nix-community", "repo": "fenix", - "rev": "380f1969f440e683333af5746caac76811b4a1a8", + "rev": "9d776d59084355be7d187a047f64c36664249c4d", "type": "github" }, "original": { @@ -135,7 +135,25 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, @@ -203,11 +221,11 @@ ] }, "locked": { - "lastModified": 1775047159, - "narHash": "sha256-UWM4VZvfKaPwA9FMu7iZha5YAE8vsEtUazk+rFxmbTY=", + "lastModified": 1748529677, + "narHash": "sha256-MJEX3Skt5EAIs/aGHD8/aXXZPcceMMHheyIGSjvxZN0=", "owner": "nix-community", "repo": "home-manager", - "rev": "1ce9e62690dfdd7e76bd266ccb9a887778410eb2", + "rev": "da282034f4d30e787b8a10722431e8b650a907ef", "type": "github" }, "original": { @@ -313,11 +331,11 @@ ] }, "locked": { - "lastModified": 1775037210, - "narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=", + "lastModified": 1748149228, + "narHash": "sha256-mmonYFesFo42UUS49Hd0bcbVJRWX/aHBCDYUkkvylf4=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "06648f4902343228ce2de79f291dd5a58ee12146", + "rev": "a9939228f661df370c4094fe85f683e45d761dbe", "type": "github" }, "original": { @@ -347,16 +365,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -409,7 +427,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1755186698, "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", @@ -425,7 +443,23 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { + "locked": { + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1769789167, "narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=", @@ -469,7 +503,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4", + "systems": "systems_5", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -488,8 +522,8 @@ }, "readlater-bot": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3" + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1772524468, @@ -517,7 +551,7 @@ "niri": "niri", "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_3", "noctalia": "noctalia", "noctalia-qs": "noctalia-qs", "readlater-bot": "readlater-bot" @@ -526,11 +560,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1774948198, - "narHash": "sha256-oVPo0/3CXM/5uFKu1ZwP7osSV2tiQIFU09Y3UzNbm7g=", + "lastModified": 1751377982, + "narHash": "sha256-eqf9Bxe3uBNG4xwcteIKt855wHuT+j6orPiABQ83dDw=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "63b3eff38ef1c216480147dd53b0e4365d55f269", + "rev": "aa16885e6282a540ecfbffa0d886ed9904b425bc", "type": "github" }, "original": { @@ -586,6 +620,21 @@ } }, "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -600,7 +649,7 @@ "type": "github" } }, - "systems_5": { + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -617,7 +666,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1772660329, diff --git a/hosts/thegeneralist-central-mbp/configuration.nix b/hosts/thegeneralist-central-mbp/configuration.nix index a6ffb2f..9f8c03a 100644 --- a/hosts/thegeneralist-central-mbp/configuration.nix +++ b/hosts/thegeneralist-central-mbp/configuration.nix @@ -24,7 +24,7 @@ home-manager = { backupFileExtension = "home.bak"; users.central.home = { - stateVersion = "26.05"; + stateVersion = "25.11"; homeDirectory = "/Users/central"; }; }; diff --git a/hosts/thegeneralist-central/configuration.nix b/hosts/thegeneralist-central/configuration.nix index 7f720e8..fe9b658 100644 --- a/hosts/thegeneralist-central/configuration.nix +++ b/hosts/thegeneralist-central/configuration.nix @@ -82,7 +82,7 @@ home = { username = "thegeneralist"; homeDirectory = "/home/thegeneralist"; - stateVersion = "26.05"; + stateVersion = "25.11"; }; }; }; diff --git a/hosts/thegeneralist-mbp/configuration.nix b/hosts/thegeneralist-mbp/configuration.nix index 7de0dad..48c5209 100644 --- a/hosts/thegeneralist-mbp/configuration.nix +++ b/hosts/thegeneralist-mbp/configuration.nix @@ -24,7 +24,7 @@ home-manager = { backupFileExtension = "home.bak"; users.thegeneralist.home = { - stateVersion = "26.05"; + stateVersion = "25.11"; homeDirectory = "/Users/thegeneralist"; }; }; diff --git a/hosts/thegeneralist/configuration.nix b/hosts/thegeneralist/configuration.nix index cb7818d..8064501 100644 --- a/hosts/thegeneralist/configuration.nix +++ b/hosts/thegeneralist/configuration.nix @@ -37,7 +37,7 @@ users.thegeneralist.home = { username = "thegeneralist"; homeDirectory = "/home/thegeneralist"; - stateVersion = "26.05"; + stateVersion = "25.11"; }; }; diff --git a/modules/common/git.nix b/modules/common/git.nix index 434004c..6fe5b3e 100644 --- a/modules/common/git.nix +++ b/modules/common/git.nix @@ -1,64 +1,31 @@ -{ lib, pkgs, ... }: -let +{ lib, pkgs, ... }: let inherit (lib) getExe; -in -{ +in { environment.systemPackages = with pkgs; [ gnupg - difftastic ]; - home-manager.sharedModules = [ - { - programs.difftastic = { + home-manager.sharedModules = [{ + programs = { + gpg.enable = true; + gh.enable = true; + gh-dash.enable = true; + git = { enable = true; - options.background = "dark"; - }; - } - { - programs = { - gpg.enable = true; - gh.enable = true; - gh-dash.enable = true; - difftastic.git.enable = true; + userName = "TheGeneralist"; + userEmail = "180094941+thegeneralist01@users.noreply.github.com"; + lfs.enable = true; - git = { - enable = true; - lfs.enable = true; - - settings = { - user.name = "TheGeneralist"; - user.email = "180094941+thegeneralist01@users.noreply.github.com"; - user.signingKey = "~/.ssh/id_ed25519"; - - commit.gpgSign = true; - tag.gpgSign = true; - gpg.format = "ssh"; - gpg.program = getExe pkgs.gnupg; - - diff.algorithm = "histogram"; - diff.colorMoved = "default"; - - pull.rebase = true; - push.autoSetupRemote = true; - - merge.conflictStyle = "zdiff3"; - rebase.autoSquash = true; - rebase.autoStash = true; - rebase.updateRefs = true; - rerere.enabled = true; - - fetch.fsckObjects = true; - receive.fsckObjects = true; - transfer.fsckobjects = true; - - # https://bernsteinbear.com/git - alias.recent = "! git branch --sort=-committerdate --format=\"%(committerdate:relative)%09%(refname:short)\" | head -10"; - }; + extraConfig = { + commit.gpgSign = true; + tag.gpgSign = true; + gpg.format = "ssh"; + gpg.program = getExe pkgs.gnupg; + user.signingKey = "~/.ssh/id_ed25519"; }; }; + }; - } - ]; + }]; } diff --git a/modules/common/neovim.nix b/modules/common/neovim.nix index 82c3716..4230d2b 100644 --- a/modules/common/neovim.nix +++ b/modules/common/neovim.nix @@ -35,7 +35,7 @@ in black nodejs - dart-sass + nodePackages."sass" pnpm_9 ] ++ optionals config.onLinux [ diff --git a/modules/common/nix.nix b/modules/common/nix.nix index 06a1939..aa7dc42 100644 --- a/modules/common/nix.nix +++ b/modules/common/nix.nix @@ -32,7 +32,7 @@ in { builders-use-substitutes = true; }; - nix.package = pkgs.nixVersions.latest; + nix.package = pkgs.nixVersions.nix_2_30; nix.distributedBuilds = true; nix.buildMachines = if (config.networking.hostName != "thegeneralist-central") then [{ diff --git a/modules/common/rust.nix b/modules/common/rust.nix index 168b467..354345b 100644 --- a/modules/common/rust.nix +++ b/modules/common/rust.nix @@ -23,7 +23,7 @@ # for nil nixd - nixfmt + nixfmt-rfc-style libiconv diff --git a/modules/common/shell/0_nushell.nix b/modules/common/shell/0_nushell.nix index 9f83ff8..28c69a0 100644 --- a/modules/common/shell/0_nushell.nix +++ b/modules/common/shell/0_nushell.nix @@ -21,7 +21,7 @@ let unstable = import (builtins.fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz"; sha256 = if (config.isServer) then "sha256:0fgmdh1j6qrx64wq8wk2hry2rjh3rkvz9pch29l8zn49nlndvxy2" else (if (config.onLinux) then "sha256:03plivnr4cg0h8v7djf9g2jra09r45pmdiirmy4lvl2n1d4yb7ac" else "sha256:16xi1yijq2ccbp8254zc0b5fgz0igxvyf4yn349wj2ggk4cl6dgn"); - }) { system = pkgs.stdenv.hostPlatform.system; }; + }) { system = pkgs.system; }; package = unstable.nushell; in { diff --git a/modules/linux/packages.nix b/modules/linux/packages.nix index 33cbf1b..47b1be7 100644 --- a/modules/linux/packages.nix +++ b/modules/linux/packages.nix @@ -16,6 +16,6 @@ in { obsidian tor-browser; }) else []) ++ (if (!config.isServer) then [ - inputs.helium.packages.${pkgs.stdenv.hostPlatform.system}.default + inputs.helium.packages.${pkgs.system}.default ] else []); }