AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update flake

Browse Source
This commit is contained in:
Dmitriy Kholkin 2023-01-26 00:08:39 +03:00
parent 2ac9baa765
commit c00991e348
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
flake.nix
View File

@ -115,15 +115,18 @@
}] else }] else
findModules (dir + "/${name}")) findModules (dir + "/${name}"))
(builtins.readDir dir))); (builtins.readDir dir)));
in flake-utils-plus.lib.mkFlake {
patchesPath = (patches: map (x: ./patches + "/${x}") patches);
in flake-utils-plus.lib.mkFlake rec {
inherit self inputs; inherit self inputs;
supportedSystems = [ "x86_64-linux" ]; supportedSystems = [ "x86_64-linux" ];
sharedPatches = patchesPath [ "mullvad-exclude-containers.patch" ];
channelsConfig = { allowUnfree = true; }; channelsConfig = { allowUnfree = true; };
channels.unstable.input = nixpkgs; channels.unstable.input = nixpkgs;
channels.unstable.patches = [ ]; channels.unstable.patches = [ ] ++ sharedPatches;
channels.unstable-zfs.input = nixpkgs; channels.unstable-zfs.input = nixpkgs;
channels.unstable-zfs.patches = [ ./patches/zen-kernels.patch ]; channels.unstable-zfs.patches = [ ./patches/zen-kernels.patch ] ++ sharedPatches;
hostDefaults.system = "x86_64-linux"; hostDefaults.system = "x86_64-linux";
hostDefaults.channelName = "unstable"; hostDefaults.channelName = "unstable";
@ -136,8 +139,8 @@
}; };
in (genAttrs hostnames mkHost) // { in (genAttrs hostnames mkHost) // {
AMD-Workstation = { AMD-Workstation = {
system = builtins.readFile (./machines + "/AMD-Workstation/system"); system = builtins.readFile (./machines/AMD-Workstation/system);
modules = [ (import (./machines + "/AMD-Workstation")) { device = "AMD-Workstation"; mainuser = "alukard"; } ]; modules = [ (import (./machines/AMD-Workstation)) { device = "AMD-Workstation"; mainuser = "alukard"; } ];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
channelName = "unstable-zfs"; channelName = "unstable-zfs";
}; };
@ -146,7 +149,7 @@
outputsBuilder = channels: let outputsBuilder = channels: let
pkgs = channels.unstable; pkgs = channels.unstable;
pkgs-zfs = channels.unstable-zfs; pkgs-zfs = channels.unstable-zfs;
# FIXME: nixos-rebuild with --flakes flag doesn't work with doas # FIXME: nixos-rebuild with --flake flag doesn't work with doas
rebuild = pkgs.writeShellScriptBin "rebuild" '' rebuild = pkgs.writeShellScriptBin "rebuild" ''
if [[ -z $1 ]]; then if [[ -z $1 ]]; then
echo "Usage: $(basename $0) {switch|boot|test}" echo "Usage: $(basename $0) {switch|boot|test}"
@ -174,7 +177,10 @@
in { in {
devShell = channels.unstable.mkShell { devShell = channels.unstable.mkShell {
name = "aliases"; name = "aliases";
packages = [ rebuild update-vscode upgrade upgrade-hyprland ]; packages = with pkgs; [
rebuild update-vscode upgrade upgrade-hyprland
nixfmt nixpkgs-fmt statix
];
}; };
packages = { packages = {
Wayland-VM = nixos-generators.nixosGenerate { Wayland-VM = nixos-generators.nixosGenerate {
@ -191,14 +197,16 @@
}; };
Flakes-ISO = nixos-generators.nixosGenerate { Flakes-ISO = nixos-generators.nixosGenerate {
system = builtins.readFile (./machines/Flakes-ISO/system); system = builtins.readFile (./machines/Flakes-ISO/system);
modules = [ (import (./machines/Flakes-ISO)) ]; modules = [
(import (./machines/Flakes-ISO)) { device = "Flakes-ISO"; mainuser = "alukard"; }
];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
format = "install-iso"; format = "install-iso";
}; };
}; };
}; };
nixosModules = builtins.listToAttrs (findModules ./modules); customModules = builtins.listToAttrs (findModules ./modules);
nixosProfiles = builtins.listToAttrs (findModules ./profiles); nixosProfiles = builtins.listToAttrs (findModules ./profiles);
nixosRoles = import ./roles; nixosRoles = import ./roles;