From 6a06793716f42983eb5778e430aac70da9246781 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Thu, 9 May 2024 11:56:25 -0400 Subject: [PATCH] changed up --- flake.nix | 7 +++++-- src/system/machines/nix-less/default.nix | 10 ++++------ src/system/machines/nix-less/home.nix | 11 ++--------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index 8226306..56cf209 100644 --- a/flake.nix +++ b/flake.nix @@ -22,10 +22,10 @@ allowUnfree = true; }; }; - config = import ./user.config.nix; in { + import = ./user.configs.nix; nixosConfigurations = { desktop = nixpkgs.lib.nixosSystem { inherit system pkgs; @@ -56,6 +56,9 @@ ]; }; }; - homeConfigurations = import ./src/system/machines/nix-less; + homeConfigurations."bryan" = home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = [ ./src/system/machines/nix-less ]; + }; }; } diff --git a/src/system/machines/nix-less/default.nix b/src/system/machines/nix-less/default.nix index cb653ad..baf8fb6 100644 --- a/src/system/machines/nix-less/default.nix +++ b/src/system/machines/nix-less/default.nix @@ -1,9 +1,7 @@ -{ config, pkgs, home-manager, ... }: +{ ... }: { - imports = [ ../../../user ]; - "${config.user.name}" = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - modules = [ ./home.nix ]; - }; + imports = [ + ./home.nix + ]; } diff --git a/src/system/machines/nix-less/home.nix b/src/system/machines/nix-less/home.nix index 726099f..e0dede3 100644 --- a/src/system/machines/nix-less/home.nix +++ b/src/system/machines/nix-less/home.nix @@ -9,14 +9,14 @@ homeDirectory = "/home/${config.user.name}"; file.".config/home-manager" = { - source = ../../../../../nixos; + source = ../../../..; recursive = true; }; }; programs.home-manager.enable = true; programs.bash.shellAliases = { - nixup = "home-manager switch"; + nixup = "home-manager switch --flake"; }; nix = { @@ -26,11 +26,6 @@ auto-optimise-store = true; trusted-users = [ "${config.user.name}" ]; }; - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 30d"; - }; }; modules = { user = { @@ -42,8 +37,6 @@ alacritty.enable = true; browsers.enable = true; neovim.enable = true; - - }; utils = { enable = true;