fabianhauser/dotfiles
1
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Add threema submodule

Browse source
This commit is contained in:
Fabian Hauser 2022-04-11 15:28:30 +02:00
parent 4064593e44
commit 66092ec8e5
11 changed files with 66 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

26
flake.nix
View file

@ -6,12 +6,15 @@
home-manager.url = "github:nix-community/home-manager/release-21.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs-stable";
qois-infrastructure.url = "path:/etc/nixos/qois-infrastructure";
threema.url = "path:/etc/nixos/defaults/threema";
threema.inputs.nixpkgs-unstable.follows = "nixpkgs-unstable";
fabianhauser-etaxes-sg.url = "github:fabianhauser/etaxes-sg-nix";
fabianhauser-etaxes-sg.inputs.nixpkgs.follows = "nixpkgs-stable";
};
outputs = { self, nixpkgs-unstable, nixpkgs-stable, home-manager
, qois-infrastructure, fabianhauser-etaxes-sg, nixos-hardware, ... }@inputs:
, qois-infrastructure, fabianhauser-etaxes-sg, nixos-hardware, threema, ...
}@inputs:
let
system = "x86_64-linux";
pkgsUnstable = import nixpkgs-unstable {
@ -37,6 +40,7 @@
useUserPackages = true;
extraSpecialArgs = {
inherit pkgsUnstable;
threemaModules = threema.nixosModules;
pkgsEtaxesSg = fabianhauser-etaxes-sg.packages.${system};
};
users.fhauser = import ./home/fhauser/default.nix;
@ -45,7 +49,10 @@
mapHostnameToAttr = host:
nixpkgs-stable.lib.nixosSystem {
inherit system;
specialArgs.hardwareModules = nixos-hardware.nixosModules;
specialArgs = {
hardwareModules = nixos-hardware.nixosModules;
threemaModules = threema.nixosModules;
};
modules = [
qois-infrastructure.nixosModule
home-manager.nixosModules.home-manager
@ -60,7 +67,10 @@
inherit system;
username = "fhauser";
configuration = import ./home/${username}/default.nix;
extraSpecialArgs = { inherit pkgsUnstable; };
extraSpecialArgs = {
inherit pkgsUnstable;
threemaModules = threema.nixosModules;
};
# Update the state version as needed.
# See the changelog here:
@ -69,5 +79,15 @@
};
};
devShell.${system} = import ./shell.nix { pkgs = pkgsUnstable; };
apps.${system}.format = let
pkgs = pkgsUnstable;
formatter = pkgsUnstable.writeShellScriptBin "formatter" ''
${pkgs.findutils}/bin/find . -type f -name '*.nix' -exec ${pkgs.nixfmt}/bin/nixfmt {} +
'';
in {
type = "app";
program = "${formatter}/bin/formatter";
};
};
}