foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-01-31 04:58:01 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

config: use flake-provided package

Browse Source 
We've also removed the overlay because of troubles with building certain
package that is required to be in a specific version. Overlays are very
powerful but very unwieldy for a stable environment at times.
This commit is contained in:
Gabriel Arazas 2022-11-05 09:25:24 +08:00
parent ffe8efd8d0
commit d14628b36e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
flake.nix
View File

@ -63,7 +63,6 @@
# Guix in NixOS?! # Guix in NixOS?!
guix-overlay.url = "github:foo-dogsquared/nix-overlay-guix"; guix-overlay.url = "github:foo-dogsquared/nix-overlay-guix";
guix-overlay.inputs.nixpkgs.follows = "nixpkgs";
# The more recommended Rust overlay so I'm going with it. # The more recommended Rust overlay so I'm going with it.
rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.url = "github:oxalica/rust-overlay";
@ -126,7 +125,7 @@
# The system of the NixOS system. # The system of the NixOS system.
inherit system; inherit system;
lib = lib'; lib = lib';
specialArgs = extraArgs; specialArgs = extraArgs // { inherit system; };
modules = modules =
# Append with our custom NixOS modules from the modules folder. # Append with our custom NixOS modules from the modules folder.
(lib'.modulesToList (lib'.filesToAttr ./modules/nixos)) (lib'.modulesToList (lib'.filesToAttr ./modules/nixos))
@ -209,7 +208,7 @@
# Extend nixpkgs with our overlays except for the NixOS-focused modules # Extend nixpkgs with our overlays except for the NixOS-focused modules
# here. # here.
nixpkgs.overlays = overlays nixpkgs.overlays = overlays
++ [ inputs.nix-alien.overlay inputs.guix-overlay.overlays.default ]; ++ [ inputs.nix-alien.overlay ];
# Please clean your temporary crap. # Please clean your temporary crap.
boot.cleanTmpDir = lib.mkDefault true; boot.cleanTmpDir = lib.mkDefault true;
@ -233,6 +232,8 @@
}; };
services.sshd.enable = lib.mkDefault true; services.sshd.enable = lib.mkDefault true;
services.openssh.enable = lib.mkDefault true; services.openssh.enable = lib.mkDefault true;
services.guix.package = inputs.guix-overlay.packages.${system}.guix;
}; };
mkUser = { system ? defaultSystem, extraModules ? [ ] }: mkUser = { system ? defaultSystem, extraModules ? [ ] }: