mirror of
https://github.com/thilobillerbeck/dotfiles.git
synced 2024-11-22 07:58:49 +01:00
modularized configs into flake
This commit is contained in:
parent
e615e06990
commit
bb3bd3e7a3
4 changed files with 20 additions and 14 deletions
|
@ -1,9 +1,12 @@
|
|||
{ inputs, ... }:
|
||||
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||
home-manager.users.thilo = {
|
||||
imports = [
|
||||
./home-manager/modules/machine.nix
|
||||
./../../home-manager/modules/machine.nix
|
||||
];
|
||||
|
||||
machine = {
|
||||
|
|
|
@ -152,8 +152,4 @@
|
|||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"electron-24.8.6"
|
||||
];
|
||||
environment.systemPackages = with nixpkgs; [
|
||||
inputs.nix-software-center.packages.x86_64-linux.nix-software-center
|
||||
inputs.devenv.packages.x86_64-linux.devenv
|
||||
];
|
||||
}
|
||||
|
|
21
flake.nix
21
flake.nix
|
@ -13,14 +13,19 @@
|
|||
devenv.url = "github:cachix/devenv";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, home-manager, ... }@inputs: {
|
||||
nixosConfigurations.thilo-pc = nixpkgs.lib.nixosSystem {
|
||||
outputs = { self, nixpkgs, home-manager, ... }@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
home-manager.nixosModules.home-manager
|
||||
./configs/thilo-pc/nixos.nix
|
||||
./configs/thilo-pc/home.nix
|
||||
];
|
||||
in
|
||||
{
|
||||
nixosConfigurations.thilo-pc = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
home-manager.nixosModules.home-manager
|
||||
./configs/thilo-pc/nixos.nix
|
||||
./configs/thilo-pc/home.nix
|
||||
];
|
||||
specialArgs = { inherit inputs; };
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{ config, pkgs, lib, inputs, ... }:
|
||||
|
||||
with lib;
|
||||
{
|
||||
|
@ -66,6 +66,7 @@ with lib;
|
|||
kubectl
|
||||
pulumiPackages.pulumi-language-nodejs
|
||||
ncdu
|
||||
inputs.devenv.packages.x86_64-linux.devenv
|
||||
] ++ (if config.machine.isGraphical then [
|
||||
(pkgs.nerdfonts.override {
|
||||
fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ];
|
||||
|
@ -102,6 +103,7 @@ with lib;
|
|||
quickgui
|
||||
trilium-desktop
|
||||
anki
|
||||
inputs.nix-software-center.packages.x86_64-linux.nix-software-center
|
||||
] else [ ]) ++ (if config.machine.isGnome then [
|
||||
gnomeExtensions.blur-my-shell
|
||||
gnomeExtensions.dash-to-panel
|
||||
|
|
Loading…
Reference in a new issue