jakalx/nixos-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

thrall: Move most modules from flake to thrall

Browse source
This commit is contained in:
Alexander Kobjolke 2024-01-24 21:50:18 +01:00
parent 2d8e1a873a
commit a12c6266cc
2 changed files with 40 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

74
flake.nix
View file

@ -42,46 +42,42 @@
}; };
}; };
outputs = outputs = { home-manager, nixpkgs, nixpkgs-unstable, ... }@inputs: {
{ home-manager, nixpkgs, nixpkgs-unstable, agenix, snm, ... }@inputs: { nixosConfigurations."thrall" = nixpkgs.lib.nixosSystem {
nixosConfigurations."thrall" = nixpkgs.lib.nixosSystem { system = "x86_64-linux";
system = "x86_64-linux"; specialArgs = { inherit inputs; };
specialArgs = { inherit inputs; }; modules = let
modules = let postfix-overlay = final: prev: {
postfix-overlay = final: prev: { postfix = nixpkgs-unstable.legacyPackages."x86_64-linux".postfix;
postfix = nixpkgs-unstable.legacyPackages."x86_64-linux".postfix; };
in [
({ inputs, lib, ... }: {
nixpkgs = {
config.allowUnfree = true;
overlays = with inputs; [ emacs.overlay postfix-overlay ];
}; };
in [ nix.registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
({ inputs, lib, ... }: { })
nixpkgs = { ./hosts/thrall
config.allowUnfree = true; home-manager.nixosModules.home-manager
overlays = with inputs; [ emacs.overlay postfix-overlay ]; {
}; home-manager.useGlobalPkgs = true;
nix.registry = lib.mapAttrs (_: value: { flake = value; }) inputs; home-manager.useUserPackages = true;
}) home-manager.users.alex = import ./home/cli.nix;
snm.nixosModule }
./modules/security.nix ];
./hosts/thrall };
agenix.nixosModules.age
home-manager.nixosModules.home-manager nixosConfigurations."dregil" = import ./hosts/dregil { inherit inputs; };
{ homeConfigurations = import ./outputs/homeConfigurations inputs;
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; nixOnDroidConfigurations.default = with inputs;
home-manager.users.alex = import ./home/cli.nix; nix-on-droid.lib.nixOnDroidConfiguration {
} modules = [
./hosts/redmi
{ nix.registry.nixpkgs.flake = nixpkgs-droid; }
{ nix.nixPath = [ "nixpkgs=${nixpkgs-droid}" ]; }
]; ];
}; };
};
nixosConfigurations."dregil" = import ./hosts/dregil { inherit inputs; };
homeConfigurations = import ./outputs/homeConfigurations inputs;
nixOnDroidConfigurations.default = with inputs;
nix-on-droid.lib.nixOnDroidConfiguration {
modules = [
./hosts/redmi
{ nix.registry.nixpkgs.flake = nixpkgs-droid; }
{ nix.nixPath = [ "nixpkgs=${nixpkgs-droid}" ]; }
];
};
};
} }

15
hosts/thrall/default.nix
View file

@ -2,13 +2,16 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }: { inputs, config, pkgs, ... }:
let let
authorityFromUrl = url: authorityFromUrl = url:
builtins.head (pkgs.lib.drop 1 (pkgs.lib.splitString "://" url)); builtins.head (pkgs.lib.drop 1 (pkgs.lib.splitString "://" url));
in { in {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
inputs.snm.nixosModule
inputs.agenix.nixosModules.age
../../modules/security.nix
../../modules/upgrade-pg-cluster.nix ../../modules/upgrade-pg-cluster.nix
../../modules/nix-config.nix ../../modules/nix-config.nix
../../modules/iohk.nix ../../modules/iohk.nix
@ -135,15 +138,7 @@ in {
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [ wget rsync htop tmux git rclone ];
wget
rsync
htop
tmux
git
restic # fast and secure backup
rclone
];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
# started in user sessions. # started in user sessions.