From 73013afe1c47b710fe8e4a4bce82e6d672ba74e3 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Fri, 9 Aug 2024 22:00:37 -0400 Subject: [PATCH] Added home manager configs --- .tmp/flake.nix | 30 ------------------- .tmp/home.nix | 76 ------------------------------------------------- flake.nix | 4 +++ modules/lib.nix | 17 +++++++++++ 4 files changed, 21 insertions(+), 106 deletions(-) delete mode 100644 .tmp/flake.nix delete mode 100644 .tmp/home.nix diff --git a/.tmp/flake.nix b/.tmp/flake.nix deleted file mode 100644 index 426c05b..0000000 --- a/.tmp/flake.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - description = "Home Manager configuration of ari"; - - inputs = { - # Specify the source of Home Manager and Nixpkgs. - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; - - outputs = { nixpkgs, home-manager, ... }: - let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - in - { - homeConfigurations."ari" = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - - # Specify your home configuration modules here, for example, - # the path to your home.nix. - modules = [ ./home.nix ]; - - # Optionally use extraSpecialArgs - # to pass through arguments to home.nix - }; - }; -} diff --git a/.tmp/home.nix b/.tmp/home.nix deleted file mode 100644 index b889661..0000000 --- a/.tmp/home.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ config, pkgs, ... }: - -{ - # Home Manager needs a bit of information about you and the paths it should - # manage. - home.username = "ari"; - home.homeDirectory = "/home/ari"; - - # This value determines the Home Manager release that your configuration is - # compatible with. This helps avoid breakage when a new Home Manager release - # introduces backwards incompatible changes. - # - # You should not change this value, even if you update Home Manager. If you do - # want to update the value, then make sure to first check the Home Manager - # release notes. - home.stateVersion = "24.05"; # Please read the comment before changing. - - # The home.packages option allows you to install Nix packages into your - # environment. - home.packages = [ - # # Adds the 'hello' command to your environment. It prints a friendly - # # "Hello, world!" when run. - # pkgs.hello - - # # It is sometimes useful to fine-tune packages, for example, by applying - # # overrides. You can do that directly here, just don't forget the - # # parentheses. Maybe you want to install Nerd Fonts with a limited number of - # # fonts? - # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) - - # # You can also create simple shell scripts directly inside your - # # configuration. For example, this adds a command 'my-hello' to your - # # environment: - # (pkgs.writeShellScriptBin "my-hello" '' - # echo "Hello, ${config.home.username}!" - # '') - ]; - - # Home Manager is pretty good at managing dotfiles. The primary way to manage - # plain files is through 'home.file'. - home.file = { - # # Building this configuration will create a copy of 'dotfiles/screenrc' in - # # the Nix store. Activating the configuration will then make '~/.screenrc' a - # # symlink to the Nix store copy. - # ".screenrc".source = dotfiles/screenrc; - - # # You can also set the file content immediately. - # ".gradle/gradle.properties".text = '' - # org.gradle.console=verbose - # org.gradle.daemon.idletimeout=3600000 - # ''; - }; - - # Home Manager can also manage your environment variables through - # 'home.sessionVariables'. These will be explicitly sourced when using a - # shell provided by Home Manager. If you don't want to manage your shell - # through Home Manager then you have to manually source 'hm-session-vars.sh' - # located at either - # - # ~/.nix-profile/etc/profile.d/hm-session-vars.sh - # - # or - # - # ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh - # - # or - # - # /etc/profiles/per-user/ari/etc/profile.d/hm-session-vars.sh - # - home.sessionVariables = { - # EDITOR = "emacs"; - }; - - # Let Home Manager install and manage itself. - programs.home-manager.enable = true; -} diff --git a/flake.nix b/flake.nix index 526deec..157565b 100644 --- a/flake.nix +++ b/flake.nix @@ -132,6 +132,10 @@ (import ./hosts/asosnovsky-mac.nix { user = sumoUser; }); }; + homeConfigurations."${user.name}" = lib.makeHomeManagerUsers { + user = user; + homeManagerVersion = homeManagerVersion; + }; nixosConfigurations = { # NIXOS Framework Setups diff --git a/modules/lib.nix b/modules/lib.nix index 48926b4..7e499ad 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -59,6 +59,22 @@ let }) ]; }; + makeHomeManagerUsers = + { modules ? [ ] + , homeManagerVersion + , user + }: + let + hm = (import ../home-manager.nix { + stateVersion = homeManagerVersion; + }); + in + home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = [ + (hm.makeCommonUser user) + ] ++ modules; + }; in { eachSystem = eachSystem; @@ -66,6 +82,7 @@ in makeNixOsModule = makeNixOsModule; makeHLService = makeHLService; makeDarwinModule = makeDarwinModule; + makeHomeManagerUsers = makeHomeManagerUsers; makeHLServices = { nodeNames ? [ ] , systemStateVersion ? "24.05"