diff --git a/flake.lock b/flake.lock index 7321fde..e65174c 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1751438379, - "narHash": "sha256-0u0rFAkdUIexx8r7+TkGjUsmauK6kKQ/RtE7vCEwLLE=", + "lastModified": 1775029908, + "narHash": "sha256-QuPn+EN/097aBLeSqbQ7vOwc5TSOb68bAxg1+mknfmw=", "owner": "nix-community", "repo": "fenix", - "rev": "9d776d59084355be7d187a047f64c36664249c4d", + "rev": "380f1969f440e683333af5746caac76811b4a1a8", "type": "github" }, "original": { @@ -135,25 +135,7 @@ }, "flake-utils_3": { "inputs": { - "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" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -221,11 +203,11 @@ ] }, "locked": { - "lastModified": 1748529677, - "narHash": "sha256-MJEX3Skt5EAIs/aGHD8/aXXZPcceMMHheyIGSjvxZN0=", + "lastModified": 1775047159, + "narHash": "sha256-UWM4VZvfKaPwA9FMu7iZha5YAE8vsEtUazk+rFxmbTY=", "owner": "nix-community", "repo": "home-manager", - "rev": "da282034f4d30e787b8a10722431e8b650a907ef", + "rev": "1ce9e62690dfdd7e76bd266ccb9a887778410eb2", "type": "github" }, "original": { @@ -331,11 +313,11 @@ ] }, "locked": { - "lastModified": 1748149228, - "narHash": "sha256-mmonYFesFo42UUS49Hd0bcbVJRWX/aHBCDYUkkvylf4=", + "lastModified": 1775037210, + "narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "a9939228f661df370c4094fe85f683e45d761dbe", + "rev": "06648f4902343228ce2de79f291dd5a58ee12146", "type": "github" }, "original": { @@ -365,16 +347,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "lastModified": 1774709303, + "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -427,39 +409,23 @@ "type": "github" } }, + "nixpkgs_2": { + "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_3": { - "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_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=", @@ -503,7 +469,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5", + "systems": "systems_4", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -522,8 +488,8 @@ }, "readlater-bot": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1772524468, @@ -551,7 +517,7 @@ "niri": "niri", "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "noctalia": "noctalia", "noctalia-qs": "noctalia-qs", "readlater-bot": "readlater-bot" @@ -560,11 +526,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1751377982, - "narHash": "sha256-eqf9Bxe3uBNG4xwcteIKt855wHuT+j6orPiABQ83dDw=", + "lastModified": 1774948198, + "narHash": "sha256-oVPo0/3CXM/5uFKu1ZwP7osSV2tiQIFU09Y3UzNbm7g=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "aa16885e6282a540ecfbffa0d886ed9904b425bc", + "rev": "63b3eff38ef1c216480147dd53b0e4365d55f269", "type": "github" }, "original": { @@ -620,21 +586,6 @@ } }, "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=", @@ -649,7 +600,7 @@ "type": "github" } }, - "systems_6": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -666,7 +617,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1772660329, diff --git a/hosts/thegeneralist-mbp/configuration.nix b/hosts/thegeneralist-mbp/configuration.nix index 48c5209..612c424 100644 --- a/hosts/thegeneralist-mbp/configuration.nix +++ b/hosts/thegeneralist-mbp/configuration.nix @@ -24,6 +24,7 @@ home-manager = { backupFileExtension = "home.bak"; users.thegeneralist.home = { + # stateVersion = "25.11"; stateVersion = "25.11"; homeDirectory = "/Users/thegeneralist"; }; diff --git a/modules/common/git.nix b/modules/common/git.nix index cecf81a..434004c 100644 --- a/modules/common/git.nix +++ b/modules/common/git.nix @@ -9,25 +9,34 @@ in ]; home-manager.sharedModules = [ + { + programs.difftastic = { + enable = true; + options.background = "dark"; + }; + } + { programs = { gpg.enable = true; gh.enable = true; gh-dash.enable = true; + difftastic.git.enable = true; git = { enable = true; - - userName = "TheGeneralist"; - userEmail = "180094941+thegeneralist01@users.noreply.github.com"; lfs.enable = true; - extraConfig = { + 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; - user.signingKey = "~/.ssh/id_ed25519"; + diff.algorithm = "histogram"; diff.colorMoved = "default"; diff --git a/modules/common/neovim.nix b/modules/common/neovim.nix index 4230d2b..82c3716 100644 --- a/modules/common/neovim.nix +++ b/modules/common/neovim.nix @@ -35,7 +35,7 @@ in black nodejs - nodePackages."sass" + dart-sass pnpm_9 ] ++ optionals config.onLinux [ diff --git a/modules/common/nix.nix b/modules/common/nix.nix index aa7dc42..06a1939 100644 --- a/modules/common/nix.nix +++ b/modules/common/nix.nix @@ -32,7 +32,7 @@ in { builders-use-substitutes = true; }; - nix.package = pkgs.nixVersions.nix_2_30; + nix.package = pkgs.nixVersions.latest; 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 354345b..168b467 100644 --- a/modules/common/rust.nix +++ b/modules/common/rust.nix @@ -23,7 +23,7 @@ # for nil nixd - nixfmt-rfc-style + nixfmt libiconv