| author |  Natalie Marks <nmarks413@gmail.com> 2025-04-19 10:35:31-07:00 |
| committer | Natalie Marks <nmarks413@gmail.com> 2025-04-19 10:35:31-07:00 |
| log | 7ffada5c7b5bf2ef4d15f9ef91415feaf65a19ef |
| tree | 9925e9e90097b8a30d7d6934af66699145caedfa |
| parent | e994781056b1537d2ab2e644323633de85cd1d8d |
| signature | Commit is signed but in an unrecognized format. |
get home manager working again
9 files changed, 16 insertions(+), 24 deletions(-)
- flake.nix
hosts
desktop
shared
lib
modules
shared
flake.nix-9
| ... | ... | @@ -90,14 +90,5 @@ |
| 90 | 90 | inherit user; |
| 91 | 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 | 9 | # Include the results of the hardware scan. |
| 10 | 10 | ./hardware-configuration.nix |
| 11 | 11 | |
| 12 | ../../modules/shared/nix.nix | |
| 13 | 12 | ../../modules/nixos/nvidia.nix |
| 14 | 13 | ../../modules/nixos/boot.nix |
| 15 | 14 | ]; |
hosts/desktop/home.nix+1-1
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | nix-options-search, |
| 8 | 8 | ... |
| 9 | 9 | }: 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;}; | |
| 11 | 11 | in { |
| 12 | 12 | home = { |
| 13 | 13 | username = "nmarks"; |
hosts/laptop/configuration.nix+1-3
| ... | ... | @@ -1,13 +1,11 @@ |
| 1 | 1 | { |
| 2 | inputs, | |
| 2 | 3 | config, |
| 3 | 4 | pkgs, |
| 4 | 5 | lib, |
| 5 | 6 | ... |
| 6 | 7 | }: { |
| 7 | 8 | imports = [ |
| 8 | ../../modules/shared/nix.nix | |
| 9 | ../../modules/shared/extras.nix | |
| 10 | ||
| 11 | 9 | ./modules/icons.nix |
| 12 | 10 | ]; |
| 13 | 11 |
hosts/laptop/home.nix+3-1
| ... | ... | @@ -1,12 +1,14 @@ |
| 1 | 1 | { |
| 2 | inputs, | |
| 2 | 3 | config, |
| 3 | 4 | pkgs, |
| 4 | 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;}; | |
| 8 | 9 | |
| 9 | 10 | home = { |
| 11 | homeDirectory = "/Users/nmarks/"; | |
| 10 | 12 | # Home Manager needs a bit of information about you and the paths it should |
| 11 | 13 | # manage. |
| 12 | 14 | # This value determines the Home Manager release that your configuration is |
hosts/shared/home-programs.nix+2-2
| ... | ... | @@ -1,9 +1,11 @@ |
| 1 | 1 | { |
| 2 | inputs, | |
| 2 | 3 | config, |
| 3 | 4 | pkgs, |
| 4 | 5 | lib, |
| 5 | 6 | ... |
| 6 | 7 | }: { |
| 8 | nix-index.enable = true; | |
| 7 | 9 | atuin = { |
| 8 | 10 | enable = true; |
| 9 | 11 | enableBashIntegration = true; |
| ... | ... | @@ -56,8 +58,6 @@ |
| 56 | 58 | }; |
| 57 | 59 | color_align = { |
| 58 | 60 | mode = "horizontal"; |
| 59 | # custom_colors = []; | |
| 60 | # fore_back = null; | |
| 61 | 61 | }; |
| 62 | 62 | distro = "nixos"; |
| 63 | 63 | pride_month_shown = [ |
lib/mkSystem.nix+5-2
| ... | ... | @@ -28,6 +28,7 @@ |
| 28 | 28 | # The config files for this system. |
| 29 | 29 | |
| 30 | 30 | hostConfig = ../hosts/${host}/configuration.nix; |
| 31 | homeConfig = ../hosts/${host}/home.nix; | |
| 31 | 32 | |
| 32 | 33 | # NixOS vs nix-darwin functions |
| 33 | 34 | systemFunc = |
| ... | ... | @@ -35,7 +36,7 @@ |
| 35 | 36 | then inputs.darwin.lib.darwinSystem |
| 36 | 37 | else nixpkgs.lib.nixosSystem; |
| 37 | 38 | |
| 38 | home-manager = | |
| 39 | hmModules = | |
| 39 | 40 | if darwin |
| 40 | 41 | then inputs.home-manager.darwinModules |
| 41 | 42 | else inputs.home-manager.nixosModules; |
| ... | ... | @@ -58,13 +59,15 @@ in |
| 58 | 59 | |
| 59 | 60 | hostConfig |
| 60 | 61 | nixindex |
| 61 | home-manager.home-manager | |
| 62 | {programs.nix-index-database.comma.enable = true;} | |
| 63 | hmModules.home-manager | |
| 62 | 64 | { |
| 63 | 65 | home-manager = { |
| 64 | 66 | useGlobalPkgs = true; |
| 65 | 67 | useUserPackages = true; |
| 66 | 68 | backupFileExtension = "hm-backup"; |
| 67 | 69 | extraSpecialArgs = {inherit inputs;}; |
| 70 | users.${user} = homeConfig; | |
| 68 | 71 | }; |
| 69 | 72 | } |
| 70 | 73 |
modules/shared/extras.nix-2
| ... | ... | @@ -6,6 +6,4 @@ |
| 6 | 6 | }: { |
| 7 | 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 | 13 | warn-dirty = false |
| 14 | 14 | ''; |
| 15 | 15 | |
| 16 | optimise = { | |
| 17 | automatic = true; | |
| 18 | }; | |
| 19 | ||
| 16 | 20 | settings = { |
| 17 | auto-optimise-store = true; | |
| 18 | 21 | experimental-features = ["nix-command" "flakes"]; |
| 19 | 22 | substituters = [ |
| 20 | 23 | "https://cache.nixos.org/?priority=10" |
| ... | ... | @@ -31,8 +34,6 @@ |
| 31 | 34 | }; |
| 32 | 35 | gc = { |
| 33 | 36 | automatic = true; |
| 34 | persistent = true; | |
| 35 | dates = "weekly"; | |
| 36 | 37 | options = "--delete-older-than 7d"; |
| 37 | 38 | }; |
| 38 | 39 | }; |