erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Update flake.lock, add nixinate

Browse source 
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/6b44cc8a441bed3796e6ddc984745fcdeaba8aa4' (2023-01-26)
  → 'github:nix-community/emacs-overlay/1e9e9e62a5a37c262b4f31ee8cc97d40894d1874' (2023-01-27)
• Updated input 'home-manager':
    'github:nix-community/home-manager/c59f0eac51da91c6989fd13a68e156f63c0e60b6' (2023-01-24)
  → 'github:nix-community/home-manager/bb4b25b302dbf0f527f190461b080b5262871756' (2023-01-26)
• Updated input 'hyprland':
    'github:Hyprwm/Hyprland/fc89e70a1fb74429ad0f772d399325f69e65b357' (2023-01-25)
  → 'github:Hyprwm/Hyprland/af37a3895f810ebe3cc58600b0d9b2fcf449b2d1' (2023-01-27)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/1b1f50645af2a70dc93eae18bfd88d330bfbcf7f' (2023-01-23)
  → 'github:nixos/nixpkgs/9b97ad7b4330aacda9b2343396eb3df8a853b4fc' (2023-01-25)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/7bdf85f6bbef581eb687838d19f2b35a4c9d77f0' (2023-01-24)
  → 'github:cachix/pre-commit-hooks.nix/8539119ba0b17b15e60de60da0348d8c73bbfdf2' (2023-01-26)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/480f9cc37db841d1fd3ac0b0c059d48e5eb6946c' (2023-01-26)
  → 'github:oxalica/rust-overlay/296dd673b46aaebe1c8355f1848ceb7c905dda35' (2023-01-27)
This commit is contained in:
Erwin Boskma 2023-01-27 20:44:05 +01:00
parent 1932773f84
commit d37889cdf9
Signed by: erwin
SSH key fingerprint: SHA256:CyeNoWXd3kjX2Nwu6pDxxdS7OqmPVOy0NavA/KU/ntU
2 changed files with 60 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
flake.lock
View file

@ -54,11 +54,11 @@
]
},
"locked": {
"lastModified": 1674727661,
"narHash": "sha256-yiT8F+VrFS5xnDwfb6kLYitAztXuxiblhz8+AP6T28g=",
"lastModified": 1674843012,
"narHash": "sha256-ri1RbS/YahqeYhkvz3LyJe8A5y3udLSGWirKHVvPlH4=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "6b44cc8a441bed3796e6ddc984745fcdeaba8aa4",
"rev": "1e9e9e62a5a37c262b4f31ee8cc97d40894d1874",
"type": "github"
},
"original": {
@ -176,11 +176,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1674556204,
"narHash": "sha256-HCRmkZsq01h2Evch08zpgE9jeHdMtGdT1okWotyvuhY=",
"lastModified": 1674771519,
"narHash": "sha256-U0W3S1nX6yEvLh3Vq70EORbmXecAKXfmEfCfaA4A+I8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c59f0eac51da91c6989fd13a68e156f63c0e60b6",
"rev": "bb4b25b302dbf0f527f190461b080b5262871756",
"type": "github"
},
"original": {
@ -199,11 +199,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1674661101,
"narHash": "sha256-iFFUngau5KHjsKScLhovpb7kCMjJvw/mXXOj6I62sVM=",
"lastModified": 1674819116,
"narHash": "sha256-/lOvQnwIxDjz8E0VKKlkHqZ/DjBYXy7miEDegiGMY8M=",
"owner": "Hyprwm",
"repo": "Hyprland",
"rev": "fc89e70a1fb74429ad0f772d399325f69e65b357",
"rev": "af37a3895f810ebe3cc58600b0d9b2fcf449b2d1",
"type": "github"
},
"original": {
@ -302,6 +302,26 @@
"type": "github"
}
},
"nixinate": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1671116920,
"narHash": "sha256-QmDGsUUmAGn77UTR7eQJmebl8f3IIUCtmbbAdJqKA3s=",
"owner": "MatthewCroughan",
"repo": "nixinate",
"rev": "b4d17b8e2a4abc47e93e1a1c466e0286a63640d8",
"type": "github"
},
"original": {
"owner": "MatthewCroughan",
"repo": "nixinate",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1674550793,
@ -319,11 +339,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1674459583,
"narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=",
"lastModified": 1674641431,
"narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f",
"rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc",
"type": "github"
},
"original": {
@ -421,11 +441,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1674550893,
"narHash": "sha256-HXI8AB96PP7UZ7iPANACXM8qc9eMz0ljxBEDM8JJKhY=",
"lastModified": 1674761200,
"narHash": "sha256-v0ypL0eDhFWmgd3f5nnbffaMA5BUoOnYUiEso7fk+q0=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "7bdf85f6bbef581eb687838d19f2b35a4c9d77f0",
"rev": "8539119ba0b17b15e60de60da0348d8c73bbfdf2",
"type": "github"
},
"original": {
@ -446,6 +466,7 @@
"microvm": "microvm",
"naersk": "naersk",
"nil": "nil",
"nixinate": "nixinate",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"nomachine": "nomachine",
@ -466,11 +487,11 @@
]
},
"locked": {
"lastModified": 1674699969,
"narHash": "sha256-gkhhGV7zBVoEIl1sFSz67r0d8fTeY57coY/+zDzxrbk=",
"lastModified": 1674786480,
"narHash": "sha256-n25V3Ug/dJewbJaxj1gL0cUMBdOonrVkIQCHd9yHHvw=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "480f9cc37db841d1fd3ac0b0c059d48e5eb6946c",
"rev": "296dd673b46aaebe1c8355f1848ceb7c905dda35",
"type": "github"
},
"original": {

36
flake.nix
View file

@ -25,6 +25,11 @@
inputs.utils.follows = "flake-utils";
};
nixinate = {
url = "github:MatthewCroughan/nixinate";
inputs.nixpkgs.follows = "nixpkgs";
};
naersk = {
url = "github:nix-community/naersk";
inputs.nixpkgs.follows = "nixpkgs";
@ -103,20 +108,22 @@
, ha-now-playing
, pamedia
, deploy-rs
, nixinate
, ...
} @ inputs:
with inputs; let
machines = import ./machines inputs;
defSystem = system: baseConfig:
defSystem = system: baseConfig: deployConfig:
nixpkgs.lib.nixosSystem {
system = "${system}";
modules = [
{ _module.args.inputs = inputs; }
{ _module.args.self-overlay = self.overlays.default; }
({ ... }: {
imports =
builtins.attrValues self.nixosModules
++ [
++ [
{
nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
nixpkgs =
@ -157,7 +164,8 @@
sops.nixosModules.sops
inputs.sunshine.nixosModules.sunshine
inputs.hyprland.nixosModules.default
];
] ++ (nixpkgs.lib.optional (deployConfig != null) { _module.args.nixinate = deployConfig; })
;
};
in
{
@ -180,14 +188,18 @@
nixosConfigurations = builtins.listToAttrs (map
(machine: {
name = machine;
value = defSystem (machines.${machine}.system or "x86_64-linux") {
imports = [
machines.${machine}.config
];
};
value = defSystem (machines.${machine}.system or "x86_64-linux")
{
imports = [
machines.${machine}.config
];
}
(machines.${machine}.deploy or null);
})
(builtins.attrNames machines));
apps = nixinate.nixinate.x86_64-linux self;
deploy.nodes = {
drone = {
hostname = "10.0.0.202";
@ -263,12 +275,6 @@
commitgpt = pkgs.commitgpt;
};
apps = {
rofi-wayland = flake-utils.lib.mkApp { drv = packages.rofi-wayland; };
nix-plugins = flake-utils.lib.mkApp { drv = packages.nix-plugins; };
backscrub = flake-utils.lib.mkApp { drv = packages.backscrub; };
};
checks = {
pre-commit-check = pre-commit-hooks.lib.${system}.run {
src = ./.;
@ -285,7 +291,7 @@
};
};
} // deploy-rs.lib.${system}.deployChecks self.deploy;
}; # // deploy-rs.lib.${system}.deployChecks self.deploy;
devShells.default = with pkgs;
mkShell {