From c75e2621640b4dd7883b2f83d3e1e283fc7a0c50 Mon Sep 17 00:00:00 2001 From: Mohammad Rafiq Date: Fri, 28 Feb 2025 19:52:31 +0800 Subject: [PATCH] rebase: add home config back in --- flake.nix | 32 ++++++++++++++++---------------- users/rafiq.nix | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/flake.nix b/flake.nix index af40d45..06435cb 100644 --- a/flake.nix +++ b/flake.nix @@ -20,27 +20,27 @@ ./systems/nemesis.nix # Add the home-manager user -# home-manager.nixosModules.home-manager { -# # Don't instantiate the home-manager instance of nixpkgs -# home-manager.useGlobalPkgs = true; -# # Install user packages to /etc/profiles -# home-manager.useUserPackages = true; -# # Pass inputs to home-manager configurations -# home-manager.extraSpecialArgs = args; -# # Add the users -# home-manager.users.rafiq.imports = [ -# ./users/rafiq.nix -# ]; -# } + home-manager.nixosModules.home-manager { + # Don't instantiate the home-manager instance of nixpkgs + home-manager.useGlobalPkgs = true; + # Install user packages to /etc/profiles + home-manager.useUserPackages = true; + # Pass inputs to home-manager configurations + home-manager.extraSpecialArgs = args; + # Add the users + home-manager.users.rafiq.imports = [ + ./users/rafiq.nix + ]; + } ]; }; }; # Packages -# packages.x86_64-linux.nvf = (inputs.nvf.lib.neovimConfiguration { -# pkgs = nixpkgs.legacyPackages.x86_64-linux; -# modules = [ ./packages/nvf.nix ]; -# }).neovim; + packages.x86_64-linux.nvf = (inputs.nvf.lib.neovimConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; + modules = [ ./packages/nvf.nix ]; + }).neovim; }; inputs = { diff --git a/users/rafiq.nix b/users/rafiq.nix index 9eb22c6..fa6251e 100644 --- a/users/rafiq.nix +++ b/users/rafiq.nix @@ -2,13 +2,13 @@ { imports = [ - ../../modules/home-git.nix # git specific configs - ../../modules/home-tmux.nix # tmux specific configs (might move this) - ../../modules/home-sh.nix # bash and other shell specific configs - ../../modules/home-wm.nix # window manager configs - ../../modules/home-editor.nix # editor specific configs - ../../modules/home-terminal.nix # terminal emulator configs - ../../modules/home-utils.nix # miscellaneous utilities + ../modules/home-git.nix # git specific configs + ../modules/home-tmux.nix # tmux specific configs (might move this) + ../modules/home-sh.nix # bash and other shell specific configs + ../modules/home-wm.nix # window manager configs + ../modules/home-editor.nix # editor specific configs + ../modules/home-terminal.nix # terminal emulator configs + ../modules/home-utils.nix # miscellaneous utilities ]; # This enables using home-manager from the command line.