c8h4/nixos-config
1
0
Fork 0
Code Issues Actions Activity

flake: update nixpkgs to 01-07-2024 to pull in openssh patches
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse source 
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
This commit is contained in:
Christoph Heiss 2024-07-06 01:13:48 +02:00
parent 2dc6d5235e
commit cf48860c8b
Signed by: c8h4
GPG key ID: 73D5E7FDEE3DE49A
1 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
flake.nix
View file

@ -7,7 +7,7 @@
owner = "NixOS";
repo = "nixpkgs";
rev =
"3b93a4d28af851867c4321b2b0d3bc20107a0920"; # nixos-unstable; 30-06-2024
"540b06943397e3ff6743236cb5a639e76ddae731"; # nixos-unstable; 01-07-2024
};
home-manager = {
type = "github";
@ -22,12 +22,6 @@
repo = "nixos-hardware";
rev = "a59f00f5ac65b19382617ba00f360f8bc07ed3ac"; # master; 29-06-2024
};
# Can be removed when we pull in
# https://github.com/NixOS/nixpkgs/commit/7f993cdf26ccef564eabf31fdb40d140821e12bc
# and
# https://github.com/NixOS/nixpkgs/commit/cba702ada89fe0bdb92e9e9c080a4502ddd8e90f
# through regular nixpkgs above
nixpkgs-latest.url = "github:NixOS/nixpkgs?ref=master";
simple-nixos-mailserver = {
type = "gitlab";
owner = "simple-nixos-mailserver";
@ -75,7 +69,7 @@
outputs = { self, nixpkgs, home-manager, nixos-hardware
, simple-nixos-mailserver, nixgl, flake-utils, treefmt-nix, nixinate
, sops-nix, lix-module, nixpkgs-latest, ... }:
, sops-nix, lix-module, ... }:
flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system:
let
pkgs = import nixpkgs { inherit system; };
@ -155,22 +149,17 @@
packages = (import ./pkgs) null pkgs;
}) // (let
overlays = system: [
overlays = [
(import ./pkgs)
(self: super: {
vimPlugins = super.vimPlugins
// (import ./pkgs/vim-plugins.nix self super);
inherit (import nixpkgs-latest { inherit system; }) openssh;
})
];
machines = {
back = { };
fort = { };
tank.extraModules = [{
disabledModules = [ "system/boot/initrd-ssh.nix" ];
imports =
[ "${nixpkgs-latest}/nixos/modules/system/boot/initrd-ssh.nix" ];
}];
tank = { };
trek.extraModules =
[ nixos-hardware.nixosModules.framework-12th-gen-intel ];
zero = { };
@ -198,7 +187,7 @@
};
imports = [ (./machines + "/${name}.nix") ];
nixpkgs = { overlays = overlays system; };
nixpkgs = { inherit overlays; };
networking.hostName = name;
sops.age = {
sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
@ -209,11 +198,10 @@
] ++ (builtins.attrValues self.nixosModules) ++ extraModules;
};
in {
homeConfigurations.maui = let system = "x86_64-linux";
in home-manager.lib.homeManagerConfiguration {
homeConfigurations.maui = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {
inherit system;
overlays = (overlays system) ++ [ nixgl.overlay ];
system = "x86_64-linux";
overlays = overlays ++ [ nixgl.overlay ];
};
modules = [ ./machines/maui.nix lix-module.nixosModules.default ];