odie
/
nixos-combined-flake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update inputs

This commit is contained in:
Patrick Neff 2024-04-14 17:06:52 +02:00
parent 75965ffeb9
commit afac2d99cb
4 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
flake.lock
View File

@ -365,11 +365,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712462372, "lastModified": 1713077896,
"narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=", "narHash": "sha256-Noot8H0EZEAFRQWyGxh9ryvhK96xpIqKbh78X447JWs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9", "rev": "630a0992b3627c64e34f179fab68e3d48c6991c0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -409,11 +409,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1712963920, "lastModified": 1713051308,
"narHash": "sha256-5Rh+bUrpeQLYtvnFlMFmUFkV/H6b+I22Bei8oNa+dBw=", "narHash": "sha256-DaaiUHENmPl1vPrQIJY7sl/LspPBQ/XiLIVeLfqpkKw=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "66220d164a40791a5131d4660e6ffbee431070d5", "rev": "a92822835521574710a830a7de0e692bf7517fb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -434,11 +434,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712966609, "lastModified": 1713053047,
"narHash": "sha256-XkNBbh8x1niHtVILUiNlGJHN9N2JkY+a8MR8w0/mhrI=", "narHash": "sha256-x17vugcgPuF+w5MpeYUbOlmUw/8tz7W4UetHKCode0E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "c83e531b908c1fe71a95830bbad6db8a1e5b5b6b", "rev": "8fa4fbe03aa7475441dd1b9c62e36feea083bfb0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -593,11 +593,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1713038713, "lastModified": 1713087347,
"narHash": "sha256-xijgNVqLYXUbpSsGXh7bzx6zCRVf+WGlTcGMG04mQjA=", "narHash": "sha256-RpRIJcbAjR3SF6tarvdG0ErN9afifG/zjxNlntRQrw4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "1da2087d9b8a89c310d093207afd41114d6727e1", "rev": "ad6a08b69528fdaf7e12c90da06f9a34f32d7ea6",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View File

@ -86,13 +86,13 @@
}; };
homeConfigurations = homeConfigurations =
flakeLib.mkHomeConfiguration { flakeLib.mkHomeConfiguration {
inherit inputs outputs nixpkgs flakeLib vars overlays; inherit inputs outputs nixpkgs flakeLib overlays;
profile = "odie@wanaheim"; vars = vars // {hostName = "wanaheim"; };
system = "x86_64-linux"; system = "x86_64-linux";
} }
// flakeLib.mkHomeConfiguration { // flakeLib.mkHomeConfiguration {
inherit inputs outputs nixpkgs flakeLib vars overlays; inherit inputs outputs nixpkgs flakeLib overlays;
profile = "odie@asgard"; vars = vars // {hostName = "asgard"; };
system = "x86_64-linux"; system = "x86_64-linux";
}; };
} }

9
lib/mkHomeConfiguration.nix
View File

@ -1,7 +1,10 @@
moduleInputs @ { moduleInputs @ {
nixpkgs,
inputs, inputs,
flakeLib, flakeLib,
system,
vars, vars,
overlays,
... ...
}: let }: let
inherit (vars) username hostName; inherit (vars) username hostName;
@ -9,9 +12,13 @@ moduleInputs @ {
in { in {
${profile} = let ${profile} = let
config = flakeLib.mkHomeManagerDefaults moduleInputs; config = flakeLib.mkHomeManagerDefaults moduleInputs;
pkgs = flakeLib.mkPkgs {
inherit nixpkgs system overlays;
};
in in
inputs.home-manager.lib.homeManagerConfiguration { inputs.home-manager.lib.homeManagerConfiguration {
inherit (config) extraSpecialArgs pkgs useGlobalPkgs useUserPackages system; inherit pkgs;
inherit (config) extraSpecialArgs;
modules = [ modules = [
../profiles/home-manager/${profile}/home.nix ../profiles/home-manager/${profile}/home.nix

2
profiles/nixos/vm/hardware-configuration.nix
View File

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { lib, modulesPath, ... }:
{ {
imports = imports =