From 212e521c7300abf21409d91a51b27f16c2a1eef0 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Fri, 19 Apr 2024 02:18:25 +0200 Subject: [PATCH] restructure hm moduels to ibe more flexible --- configs/fedora/home.nix | 17 +++++++++++++++++ flake.nix | 8 +++++++- home-manager/modules/packages.nix | 6 ++++-- home-manager/programs/alacritty.nix | 2 +- home-manager/programs/git.nix | 1 - 5 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 configs/fedora/home.nix diff --git a/configs/fedora/home.nix b/configs/fedora/home.nix new file mode 100644 index 0000000..47e5a03 --- /dev/null +++ b/configs/fedora/home.nix @@ -0,0 +1,17 @@ +{ ... }: + +{ + imports = [ ./../../home-manager/modules/machine.nix ]; + + machine = { + username = "thilo"; + isGeneric = true; + isGnome = false; + noiseSuppression.enable = false; + isGraphical = false; + }; + + fonts.fontconfig.enable = true; + + nixpkgs.config.allowUnfree = true; +} diff --git a/flake.nix b/flake.nix index 05a973a..fc533e5 100644 --- a/flake.nix +++ b/flake.nix @@ -68,11 +68,17 @@ ]; specialArgs = { inherit inputs; }; }; + homeConfigurations."thilo@thilo-pc" = + home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = [ ./configs/fedora/home.nix ]; + extraSpecialArgs = { inherit inputs nixgl; }; + }; homeConfigurations."thilo@thilo-pc-win" = home-manager.lib.homeManagerConfiguration { inherit pkgs; modules = [ ./configs/wsl/home.nix ]; - extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = { inherit inputs nixgl; }; }; }; } diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix index 355d792..9098b60 100644 --- a/home-manager/modules/packages.nix +++ b/home-manager/modules/packages.nix @@ -70,11 +70,13 @@ in { unrar inputs.w17.packages.x86_64-linux.default aichat - nix-output-monitor - ] ++ (if config.machine.isGraphical then [ (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ]; }) + nix-output-monitor + nodePackages.pnpm + npm-check-updates + ] ++ (if config.machine.isGraphical then [ corefonts vistafonts jetbrains.webstorm diff --git a/home-manager/programs/alacritty.nix b/home-manager/programs/alacritty.nix index 5d93150..2f8a30f 100644 --- a/home-manager/programs/alacritty.nix +++ b/home-manager/programs/alacritty.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, pkgs, lib, ... }: { programs.alacritty = { diff --git a/home-manager/programs/git.nix b/home-manager/programs/git.nix index fab6ce4..db4decc 100644 --- a/home-manager/programs/git.nix +++ b/home-manager/programs/git.nix @@ -3,7 +3,6 @@ { programs.git = { enable = true; - package = pkgs.gitFull; lfs.enable = true; userEmail = "thilo.billerbeck@officerent.de"; userName = "Thilo Billerbeck";