authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-04-19 10:35:31-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-04-19 10:35:31-07:00
log7ffada5c7b5bf2ef4d15f9ef91415feaf65a19ef
tree9925e9e90097b8a30d7d6934af66699145caedfa
parente994781056b1537d2ab2e644323633de85cd1d8d
signature Commit is signed but in an unrecognized format.

get home manager working again

9 files changed, 16 insertions(+), 24 deletions(-)

flake.nix-9
...@@ -90,14 +90,5 @@...@@ -90,14 +90,5 @@
90 inherit user;90 inherit user;
91 darwin = true;91 darwin = true;
92 };92 };
93 # darwinConfigurations = {
94 # "Natalies-MacBook-Air" = darwin.lib.darwinSystem {
95 # system = "aarch64-darwin";
96 # specialArgs = inputs;
97 # modules = [
98 # ./hosts/laptop/configuration.nix
99 # ];
100 # };
101 # };
102 };93 };
103}94}
hosts/desktop/configuration.nix-1
...@@ -9,7 +9,6 @@...@@ -9,7 +9,6 @@
9 # Include the results of the hardware scan.9 # Include the results of the hardware scan.
10 ./hardware-configuration.nix10 ./hardware-configuration.nix
1111
12 ../../modules/shared/nix.nix
13 ../../modules/nixos/nvidia.nix12 ../../modules/nixos/nvidia.nix
14 ../../modules/nixos/boot.nix13 ../../modules/nixos/boot.nix
15 ];14 ];
hosts/desktop/home.nix+1-1
...@@ -7,7 +7,7 @@...@@ -7,7 +7,7 @@
7 nix-options-search,7 nix-options-search,
8 ...8 ...
9}: let9}: let
10 shared-programs = import ../shared/home-programs.nix {inherit config pkgs lib;};10 shared-programs = import ../shared/home-programs.nix {inherit inputs config pkgs lib;};
11in {11in {
12 home = {12 home = {
13 username = "nmarks";13 username = "nmarks";
hosts/laptop/configuration.nix+1-3
...@@ -1,13 +1,11 @@...@@ -1,13 +1,11 @@
1{1{
2 inputs,
2 config,3 config,
3 pkgs,4 pkgs,
4 lib,5 lib,
5 ...6 ...
6}: {7}: {
7 imports = [8 imports = [
8 ../../modules/shared/nix.nix
9 ../../modules/shared/extras.nix
10
11 ./modules/icons.nix9 ./modules/icons.nix
12 ];10 ];
1311
hosts/laptop/home.nix+3-1
...@@ -1,12 +1,14 @@...@@ -1,12 +1,14 @@
1{1{
2 inputs,
2 config,3 config,
3 pkgs,4 pkgs,
4 lib,5 lib,
5 ...6 ...
6}: {7}: {
7 programs = import ../shared/home-programs.nix {inherit config pkgs lib;};8 programs = import ../shared/home-programs.nix {inherit inputs config pkgs lib;};
89
9 home = {10 home = {
11 homeDirectory = "/Users/nmarks/";
10 # Home Manager needs a bit of information about you and the paths it should12 # Home Manager needs a bit of information about you and the paths it should
11 # manage.13 # manage.
12 # This value determines the Home Manager release that your configuration is14 # This value determines the Home Manager release that your configuration is
hosts/shared/home-programs.nix+2-2
...@@ -1,9 +1,11 @@...@@ -1,9 +1,11 @@
1{1{
2 inputs,
2 config,3 config,
3 pkgs,4 pkgs,
4 lib,5 lib,
5 ...6 ...
6}: {7}: {
8 nix-index.enable = true;
7 atuin = {9 atuin = {
8 enable = true;10 enable = true;
9 enableBashIntegration = true;11 enableBashIntegration = true;
...@@ -56,8 +58,6 @@...@@ -56,8 +58,6 @@
56 };58 };
57 color_align = {59 color_align = {
58 mode = "horizontal";60 mode = "horizontal";
59 # custom_colors = [];
60 # fore_back = null;
61 };61 };
62 distro = "nixos";62 distro = "nixos";
63 pride_month_shown = [63 pride_month_shown = [
lib/mkSystem.nix+5-2
...@@ -28,6 +28,7 @@...@@ -28,6 +28,7 @@
28 # The config files for this system.28 # The config files for this system.
2929
30 hostConfig = ../hosts/${host}/configuration.nix;30 hostConfig = ../hosts/${host}/configuration.nix;
31 homeConfig = ../hosts/${host}/home.nix;
3132
32 # NixOS vs nix-darwin functions33 # NixOS vs nix-darwin functions
33 systemFunc =34 systemFunc =
...@@ -35,7 +36,7 @@...@@ -35,7 +36,7 @@
35 then inputs.darwin.lib.darwinSystem36 then inputs.darwin.lib.darwinSystem
36 else nixpkgs.lib.nixosSystem;37 else nixpkgs.lib.nixosSystem;
3738
38 home-manager =39 hmModules =
39 if darwin40 if darwin
40 then inputs.home-manager.darwinModules41 then inputs.home-manager.darwinModules
41 else inputs.home-manager.nixosModules;42 else inputs.home-manager.nixosModules;
...@@ -58,13 +59,15 @@ in...@@ -58,13 +59,15 @@ in
5859
59 hostConfig60 hostConfig
60 nixindex61 nixindex
61 home-manager.home-manager62 {programs.nix-index-database.comma.enable = true;}
63 hmModules.home-manager
62 {64 {
63 home-manager = {65 home-manager = {
64 useGlobalPkgs = true;66 useGlobalPkgs = true;
65 useUserPackages = true;67 useUserPackages = true;
66 backupFileExtension = "hm-backup";68 backupFileExtension = "hm-backup";
67 extraSpecialArgs = {inherit inputs;};69 extraSpecialArgs = {inherit inputs;};
70 users.${user} = homeConfig;
68 };71 };
69 }72 }
7073
modules/shared/extras.nix-2
...@@ -6,6 +6,4 @@...@@ -6,6 +6,4 @@
6}: {6}: {
7 networking = {7 networking = {
8 };8 };
9
10 inputs.programs.nix-index-database.comma.enable = true;
11}9}
modules/shared/nix.nix+4-3
...@@ -13,8 +13,11 @@...@@ -13,8 +13,11 @@
13 warn-dirty = false13 warn-dirty = false
14 '';14 '';
1515
16 optimise = {
17 automatic = true;
18 };
19
16 settings = {20 settings = {
17 auto-optimise-store = true;
18 experimental-features = ["nix-command" "flakes"];21 experimental-features = ["nix-command" "flakes"];
19 substituters = [22 substituters = [
20 "https://cache.nixos.org/?priority=10"23 "https://cache.nixos.org/?priority=10"
...@@ -31,8 +34,6 @@...@@ -31,8 +34,6 @@
31 };34 };
32 gc = {35 gc = {
33 automatic = true;36 automatic = true;
34 persistent = true;
35 dates = "weekly";
36 options = "--delete-older-than 7d";37 options = "--delete-older-than 7d";
37 };38 };
38 };39 };