From 45660c0877ba14139999e47b47d48b79c3c232dc Mon Sep 17 00:00:00 2001 From: Frantisek Bohacek Date: Sun, 24 Sep 2023 13:36:00 +0200 Subject: [PATCH] feat: use user packages instead of global --- hosts/default.nix | 35 ++--------------------------------- hosts/home.nix | 4 +++- 2 files changed, 5 insertions(+), 34 deletions(-) diff --git a/hosts/default.nix b/hosts/default.nix index d4206db..d13a318 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -33,11 +33,7 @@ in laptop = lib.nixosSystem { # Laptop profile inherit system; specialArgs = { - inherit unstable inputs user location; - host = { - hostName = "laptop"; - mainMonitor = "eDP-1"; - }; + inherit inputs unstable user location; }; modules = [ nur.nixosModules.nur @@ -45,14 +41,9 @@ in ./configuration.nix home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs unstable user location; - host = { - hostName = "laptop"; - mainMonitor = "eDP-1"; - }; }; home-manager.users.${user} = { imports = [ @@ -68,12 +59,7 @@ in vm = lib.nixosSystem { # VM profile inherit system; specialArgs = { - inherit unstable inputs user location; - host = { - hostName = "vm"; - mainMonitor = "Virtual-1"; - secondMonitor = "Virtual-2"; - }; + inherit inputs unstable user location; }; modules = [ nur.nixosModules.nur @@ -81,15 +67,9 @@ in ./configuration.nix home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs unstable user location; - host = { - hostName = "vm"; - mainMonitor = "Virtual-1"; - secondMonitor = "Virtual-2"; - }; }; home-manager.users.${user} = { imports = [ @@ -106,11 +86,6 @@ in inherit system; specialArgs = { inherit inputs unstable system user location; - host = { - hostName = "desktop"; - mainMonitor = "HDMI-A-1"; - secondMonitor = "HDMI-A-2"; - }; }; # Pass flake variable modules = [ # Modules that are used. nur.nixosModules.nur @@ -118,15 +93,9 @@ in ./configuration.nix home-manager.nixosModules.home-manager { # Home-Manager module that is used. - home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs unstable user location; - host = { - hostName = "desktop"; #For Xorg iGPU | Hyprland iGPU - mainMonitor = "HDMI-A-1"; #HDMIA3 | HDMI-A-3 - secondMonitor = "HDMI-A-2"; #DP1 | DP-1 - }; }; # Pass flake variable home-manager.users.${user} = { imports = [ diff --git a/hosts/home.nix b/hosts/home.nix index a2aa62e..84c5cad 100644 --- a/hosts/home.nix +++ b/hosts/home.nix @@ -11,7 +11,7 @@ # └─ default.nix # -{ config, lib, pkgs, unstable, user, location, ... }: +{ config, lib, nixpkgs, pkgs, unstable, user, location, ... }: { imports = # Home Manager Modules @@ -22,6 +22,8 @@ services.mpris-proxy.enable = true; + nixpkgs.config.allowUnfree = true; + xdg = { userDirs = let dir = s: "${config.home.homeDirectory}/${s}"; in { documents = dir "doc"; -- 2.48.1