mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-10 23:00:39 +02:00
Code Activity

chore: update flake inputs

Browse source
This commit is contained in:
oddlama 2024-01-10 16:03:24 +01:00
parent 714dec1c33
commit ab9c6fc507
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
4 changed files with 145 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

199
flake.lock generated
View file

@ -221,7 +221,7 @@
"crane": { "crane": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"elewrap", "elewrap",
"nixpkgs" "nixpkgs"
@ -309,17 +309,17 @@
}, },
"devshell_2": { "devshell_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1701787589, "lastModified": 1704648272,
"narHash": "sha256-ce+oQR4Zq9VOsLoh9bZT8Ip9PaMLcjjBUHVPzW5d7Cw=", "narHash": "sha256-zCDhWGl3bVpBKpDZ0p3NuGksZVg69BAChsY5W4KARL4=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "44ddedcbcfc2d52a76b64fb6122f209881bd3e1e", "rev": "f54745fd4aae92443817ddc566ce06572b178b5a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -357,11 +357,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704318910, "lastModified": 1704741201,
"narHash": "sha256-wOIJwAsnZhM0NlFRwYJRgO4Lldh8j9viyzwQXtrbNtM=", "narHash": "sha256-Y420NeqPWRSpxHpXsxhKILfTxT5exjtTgCgDwSpcEfU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "aef9a509db64a081186af2dc185654d78dc8e344", "rev": "f0a3425a7b173701922e7959d8bfb136ef53aa54",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -374,7 +374,7 @@
"inputs": { "inputs": {
"advisory-db": "advisory-db", "advisory-db": "advisory-db",
"crane": "crane", "crane": "crane",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -552,7 +552,46 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1704152458,
"narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "88a2cd8166694ba0b6cb374700799cec53aef527",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_4"
}, },
@ -570,7 +609,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_5"
}, },
@ -588,7 +627,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_7" "systems": "systems_7"
}, },
@ -606,7 +645,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": { "flake-utils_5": {
"inputs": { "inputs": {
"systems": "systems_8" "systems": "systems_8"
}, },
@ -750,11 +789,32 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704383912, "lastModified": 1704809957,
"narHash": "sha256-Be7O73qoOj/z+4ZCgizdLlu+5BkVvO2KO299goZ9cW8=", "narHash": "sha256-Z8sBeoeeY2O+BNqh5C+4Z1h1F1wQ2mij7yPZ2GY397M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "26b8adb300e50efceb51fff6859a1a6ba1ade4f7", "rev": "e13aa9e287b3365473e5897e3667ea80a899cdfb",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1704498488,
"narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -780,15 +840,15 @@
}, },
"lib-aggregate": { "lib-aggregate": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1704024543, "lastModified": 1704629345,
"narHash": "sha256-hmKcKSuTqVK47l2G0PkLAinZN1oCOb6XdPPJhNCQ2rg=", "narHash": "sha256-cWrno5kSY2cCaWIl97Ae4/iZ9rnMLlm0VrwRqdzIESk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "4608880f02f8f868e1b7f85c60abdfc5cb0cf9ec", "rev": "3e408e7391e9d778f48861bb9da08ac54e01441a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -834,6 +894,27 @@
"type": "github" "type": "github"
} }
}, },
"nix-darwin": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1704277720,
"narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4",
"type": "github"
},
"original": {
"owner": "lnl7",
"repo": "nix-darwin",
"type": "github"
}
},
"nix-eval-jobs": { "nix-eval-jobs": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
@ -884,11 +965,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1703992163, "lastModified": 1704596958,
"narHash": "sha256-709CGmwU34dxv8DjSpRBZ+HibVJIVaFcA4JH+GFnhyM=", "narHash": "sha256-BK3Ohsz7m8X6qVKFxDtr8KVcHipfr5hYE9PDIJevHbQ=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "d6510ce144f5da7dd9bac667ba3d5a4946c00d11", "rev": "f46800ac5a6e9f892fe36e50821c5d85794ecc62",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -935,11 +1016,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1704458188, "lastModified": 1704786394,
"narHash": "sha256-f6BYEuIqnbrs6J/9m1/1VdkJ6d63hO9kUC09kTPuOqE=", "narHash": "sha256-aJM0ln9fMGWw1+tjyl5JZWZ3ahxAA2gw2ZpZY/hkEMs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "172385318068519900a7d71c1024242fa6af75f0", "rev": "b34a6075e9e298c4124e35c3ccaf2210c1f3a43b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -971,11 +1052,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1704194953, "lastModified": 1704722960,
"narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -987,11 +1068,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1703983607, "lastModified": 1704588527,
"narHash": "sha256-YECXW8P0bqFM5e65Mu2fL4wZlonNWCuNEk7UQPsuJZ0=", "narHash": "sha256-YECXW8P0bqFM5e65Mu2fL4wZlonNWCuNEk7UQPsuJZ0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "a6c99b57d2e58f7fc6d52a08b0ba40160e75f738", "rev": "be8e58791dcfa2b98b512c2a1bdf3bd94a38790b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1074,11 +1155,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704330409, "lastModified": 1704684968,
"narHash": "sha256-msr/ZbWUZBG4WZIybCC0sZJmdkJJLDbCB4uZG4lNFbE=", "narHash": "sha256-h+lSV/cfnfE5//dHefL154mgvaEmTz13ehI7eb/Hph0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "6c542fbd24f9115eda6d7e33392f64aa95021eda", "rev": "17d7827cd61e7e6bdc732c4817ea4da26ab0b47b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1103,34 +1184,11 @@
"type": "github" "type": "github"
} }
}, },
"nixseparatedebuginfod": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1703073600,
"narHash": "sha256-XSEHNoc3h21foVeR28KgfiBTRHyUh+GJ52LMD2xFHfA=",
"owner": "symphorien",
"repo": "nixseparatedebuginfod",
"rev": "c64424332b6198ed1411917232a2b0e3794dd09b",
"type": "github"
},
"original": {
"owner": "symphorien",
"repo": "nixseparatedebuginfod",
"type": "github"
}
},
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-utils": [ "flake-parts": "flake-parts_2",
"flake-utils" "home-manager": "home-manager_2",
], "nix-darwin": "nix-darwin",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -1139,11 +1197,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704409528, "lastModified": 1704812275,
"narHash": "sha256-P71jg1WyqKpXFBcl4p+ffAh4ihRQfCDINdTLK/ZV51g=", "narHash": "sha256-uRe8BdZhuSiupXOxohaVP8LzJtBRG+ETP9PgzR60orI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "5281e7957fb9b8536a6bd36d53b130d86a2639c0", "rev": "b4ddb322889e2daf41333b4dbca2555da2e8bb7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1249,11 +1307,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1703939133, "lastModified": 1704725188,
"narHash": "sha256-Gxe+mfOT6bL7wLC/tuT2F+V+Sb44jNr8YsJ3cyIl4Mo=", "narHash": "sha256-qq8NbkhRZF1vVYQFt1s8Mbgo8knj+83+QlL5LBnYGpI=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "9d3d7e18c6bc4473d7520200d4ddab12f8402d38", "rev": "ea96f0c05924341c551a797aaba8126334c505d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1270,7 +1328,7 @@
"disko": "disko", "disko": "disko",
"elewrap": "elewrap", "elewrap": "elewrap",
"extra-modules": "extra-modules", "extra-modules": "extra-modules",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"home-manager": "home-manager", "home-manager": "home-manager",
"impermanence": "impermanence", "impermanence": "impermanence",
"lib-net": "lib-net", "lib-net": "lib-net",
@ -1281,7 +1339,6 @@
"nixos-nftables-firewall": "nixos-nftables-firewall", "nixos-nftables-firewall": "nixos-nftables-firewall",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"nixseparatedebuginfod": "nixseparatedebuginfod",
"nixvim": "nixvim", "nixvim": "nixvim",
"pre-commit-hooks": "pre-commit-hooks_4", "pre-commit-hooks": "pre-commit-hooks_4",
"stylix": "stylix", "stylix": "stylix",
@ -1486,11 +1543,11 @@
}, },
"templates": { "templates": {
"locked": { "locked": {
"lastModified": 1697364028, "lastModified": 1704737624,
"narHash": "sha256-t7IGwY/nvopK9n9tgCVrHlLimhU2MuoP9VbVy07AR2A=", "narHash": "sha256-ypprYGtIL/DbV7D0zNA36gRdMqcv8LHgoxHjwTm7EGY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "templates", "repo": "templates",
"rev": "98bc26d94008617aac7cd0244fb09ff04d6c8cf6", "rev": "105b28c09033d1c137704cab544ed3cc4bc9ac40",
"type": "github" "type": "github"
}, },
"original": { "original": {

23
flake.nix
View file

@ -73,16 +73,9 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixseparatedebuginfod = {
url = "github:symphorien/nixseparatedebuginfod";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
nixvim = { nixvim = {
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
inputs.pre-commit-hooks.follows = "pre-commit-hooks"; inputs.pre-commit-hooks.follows = "pre-commit-hooks";
}; };
@ -264,6 +257,22 @@
package = pkgs.nix-diff; package = pkgs.nix-diff;
help = "Explain why two Nix derivations differ"; help = "Explain why two Nix derivations differ";
} }
{
package = pkgs.nix-output-monitor;
help = "Nix Output Monitor (a drop alternative for `nix` which shows a build graph)";
}
{
package = pkgs.writeShellApplication {
name = "build";
text = ''
set -euo pipefail
[[ "$#" -eq 1 ]] \
|| { echo "usage: build <host>" >&2; exit 1; }
nom build --no-link --print-out-paths --show-trace .#nodes."$1".config.system.build.toplevel
'';
};
help = "Build a host configuration";
}
]; ];
devshell.startup.pre-commit.text = self.checks.${system}.pre-commit-hooks.shellHook; devshell.startup.pre-commit.text = self.checks.${system}.pre-commit-hooks.shellHook;

2
modules/optional/dev/default.nix
View file

@ -1,5 +1,4 @@
{ {
inputs,
pkgs, pkgs,
lib, lib,
minimal, minimal,
@ -7,7 +6,6 @@
}: }:
lib.optionalAttrs (!minimal) { lib.optionalAttrs (!minimal) {
imports = [ imports = [
inputs.nixseparatedebuginfod.nixosModules.default
./documentation.nix ./documentation.nix
./embedded.nix ./embedded.nix
./yubikey.nix ./yubikey.nix

2
users/modules/config/shell/starship.nix
View file

@ -20,7 +20,7 @@
inherit src; inherit src;
cargoDeps = previousAttrs.cargoDeps.overrideAttrs (_: { cargoDeps = previousAttrs.cargoDeps.overrideAttrs (_: {
inherit src; inherit src;
outputHash = "sha256-oPjmUknQ9Z+0qxphOMuf2Zkg8ou0cbkKSl04IfQNxz8="; outputHash = "sha256-tMQLSITZ/kc7CQTbbF2xkggYAEdh2ShQG3NmtF4zH5k=";
}); });
}); });
settings = { settings = {