diff --git a/flake.lock b/flake.lock index 4c40e65..51f1222 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1760641408, - "narHash": "sha256-Y086n2U0kN9HjOo+UScwQDS27gKMiIlT6vDehvlmdAg=", + "lastModified": 1761081701, + "narHash": "sha256-IwpfaKg5c/WWQiy8b5QGaVPMvoEQ2J6kpwRFdpVpBNQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "847669dabf374d32a072bdab3f08cae7296ac011", + "rev": "9b4a2a7c4fbd75b422f00794af02d6edb4d9d315", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1760106635, - "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", + "lastModified": 1760958188, + "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", + "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { diff --git a/hosts/hades/configuration.nix b/hosts/hades/configuration.nix index e9398c0..49e5fa5 100644 --- a/hosts/hades/configuration.nix +++ b/hosts/hades/configuration.nix @@ -299,27 +299,31 @@ programs.git = { enable = true; - userName = "UnstoppableMango"; - userEmail = "erik.rasmussen@unmango.dev"; + + # From GitHub desktop: + # warning: error running /nix/store/6jjz4n9w3y9c5d55n86s0sa6cfa5dkg6-github-desktop-3.4.13/opt/resources/app/git/libexec/git-core/git 'config' '--includes' '--global' '--replace-all' 'filter.lfs.process' 'git-lfs filter-process': 'error: could not lock config file /home/erik/.config/git/config: Read-only file system' 'exit status 255'. Run `git lfs install --force` to reset Git configuration. + settings.user = { + name = "UnstoppableMango"; + email = "erik.rasmussen@unmango.dev"; + push.autoSetupRemote = true; + }; signing = { format = "openpgp"; key = "264283BBFDC491BC"; signByDefault = true; }; - # Still fiddling with these - # https://github.com/git/git/blob/master/contrib/diff-highlight/README - diff-highlight.enable = true; - # https://github.com/so-fancy/diff-so-fancy - # diff-so-fancy.enable = true; - # https://github.com/Wilfred/difftastic - # difftastic.enable = true; + }; - # From GitHub desktop: - # warning: error running /nix/store/6jjz4n9w3y9c5d55n86s0sa6cfa5dkg6-github-desktop-3.4.13/opt/resources/app/git/libexec/git-core/git 'config' '--includes' '--global' '--replace-all' 'filter.lfs.process' 'git-lfs filter-process': 'error: could not lock config file /home/erik/.config/git/config: Read-only file system' 'exit status 255'. Run `git lfs install --force` to reset Git configuration. - extraConfig = { - push.autoSetupRemote = true; - }; + # Still fiddling with these + # https://github.com/git/git/blob/master/contrib/diff-highlight/README + programs.diff-highlight = { + enable = true; + enableGitIntegration = true; }; + # https://github.com/so-fancy/diff-so-fancy + # programs.diff-so-fancy.enable = true; + # https://github.com/Wilfred/difftastic + # programs.difftastic.enable = true; programs.micro.enable = true; programs.helix.enable = true;