schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 2 Pull requests Releases Wiki Activity

Compare commits

base: schmittlauch:cda2fe70913dd8547a868ee7c2d1d3707d9dd4e2
Branches Tags
schmittlauch:mainline
schmittlauch:upgrade-25.11
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion
..
compare: schmittlauch:af1994d3d5e6f632ac21b80539a954089714e27f
Branches Tags
schmittlauch:mainline
schmittlauch:upgrade-25.11
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion

No commits in common. "cda2fe70913dd8547a868ee7c2d1d3707d9dd4e2" and "af1994d3d5e6f632ac21b80539a954089714e27f" have entirely different histories.
cda2fe7091 ... af1994d3d5

4 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flake.lock generated
View file

@ -179,11 +179,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1769302137, "lastModified": 1769086393,
"narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", "narHash": "sha256-3ymIZ8s3+hu7sDl/Y48o6bwMxorfKrmn97KuWiw1vjY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", "rev": "9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +195,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1769170682, "lastModified": 1769018530,
"narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c5296fdd05cfa2c187990dd909864da9658df755", "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,11 +227,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1769318308, "lastModified": 1768940263,
"narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=", "narHash": "sha256-sJERJIYTKPFXkoz/gBaBtRKke82h4DkX3BBSsKbfbvI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1cd347bf3355fce6c64ab37d3967b4a2cb4b878c", "rev": "3ceaaa8bc963ced4d830e06ea2d0863b6490ff03",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,11 +243,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1769170682, "lastModified": 1768305791,
"narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c5296fdd05cfa2c187990dd909864da9658df755", "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -263,11 +263,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1769504998, "lastModified": 1768451253,
"narHash": "sha256-KihFuBqPESgHyk0FKT43xrPqRM6ECCFX6ecQZDsH9Qo=", "narHash": "sha256-lrrqQuxIIlHn4TzOMDkhd/fhuDLtHJsXLuJ8x3SCn4o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "ba71e5e4a5652b27648ab7fae841d1d616f58fce", "rev": "216f5786b653a68a7618296c8d54dde43644ab56",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
home/common.nix
View file

@ -51,7 +51,7 @@
merge.tool = "vimdiff"; merge.tool = "vimdiff";
# provide `git mergetool -t nixfmt` # provide `git mergetool -t nixfmt`
mergetool.nixfmt = { mergetool.nixfmt = {
cmd = "${lib.getExe pkgs.nixfmt} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""; cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
trustExitCode = true; trustExitCode = true;
}; };
core.excludesfile = toString ( core.excludesfile = toString (

2
home/modules/packages.nix
View file

@ -90,7 +90,7 @@ let
nixHelpers = [ nixHelpers = [
nixpkgs-review nixpkgs-review
nixfmt nixfmt-rfc-style
nix-top nix-top
statix statix
]; ];

2
home/modules/vscodium.nix
View file

@ -74,7 +74,7 @@
"editor.formatOnSave" = false; "editor.formatOnSave" = false;
"editor.formatOnType" = false; "editor.formatOnType" = false;
}; };
"nix.formatterPath" = lib.getExe pkgs.nixfmt; "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
"nix.enableLanguageServer" = true; "nix.enableLanguageServer" = true;
"nix.serverPath" = lib.getExe pkgs.nixd; "nix.serverPath" = lib.getExe pkgs.nixd;
"nix.serverSettings" = { }; "nix.serverSettings" = { };