Skip to content

Commit 5f9764f

Browse files
authored
refactored: flake make it single user
1 parent bd32201 commit 5f9764f

8 files changed

Lines changed: 40 additions & 432 deletions

File tree

flake.nix

Lines changed: 40 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -49,78 +49,56 @@
4949
} @ inputs: let
5050
inherit (nixpkgs) lib;
5151

52-
# Instantiate pkgs for a given system with shared config.
53-
mkPkgs = system:
54-
import nixpkgs {
55-
inherit system;
56-
config.allowUnfree = true;
57-
overlays = [inputs.nur.overlays.default];
58-
};
52+
system = "x86_64-linux";
5953

60-
# eachSystem replaces flake-utils.lib.eachDefaultSystem using the
61-
eachSystem = f:
62-
lib.genAttrs (import systems) f;
63-
64-
mkHost = import ./lib/mkHost.nix {inherit inputs self;};
65-
66-
# Host definitions
67-
hosts = {
68-
nixos = mkHost {
69-
hostname = "nixos";
70-
username = "anon";
71-
fullName = "Harshal Sawant";
72-
system = "x86_64-linux";
73-
bootloader = "grub";
74-
windowManager = "gnome";
75-
nixosModules = [./hosts/nixos];
76-
};
54+
mkPkgs = sys: import nixpkgs {
55+
system = sys;
56+
config.allowUnfree = true;
57+
overlays = [ inputs.nur.overlays.default ];
7758
};
59+
60+
eachSystem = f: lib.genAttrs (import systems) f;
61+
62+
specialArgs = { inherit inputs self system; };
7863
in {
79-
# NixOS systems
80-
nixosConfigurations =
81-
lib.filterAttrs (_: v: v != null)
82-
(lib.mapAttrs (_: h: h.nixos) hosts);
83-
84-
# Standalone Home Manager configurations.
85-
homeConfigurations =
86-
lib.mapAttrs' (
87-
_: h: lib.nameValuePair "${h.meta.username}@${h.meta.hostname}" h.home
88-
)
89-
hosts;
90-
91-
# Dev tools
92-
devShells = eachSystem (system: {
64+
nixosConfigurations.default = lib.nixosSystem {
65+
inherit system specialArgs;
66+
modules = [
67+
./modules/nixos
68+
inputs.home-manager.nixosModules.home-manager
69+
{
70+
home-manager = {
71+
useGlobalPkgs = true;
72+
useUserPackages = true;
73+
backupFileExtension = "backup";
74+
extraSpecialArgs = specialArgs;
75+
users."c0d3h01".imports = [ ./modules/home ];
76+
};
77+
}
78+
];
79+
};
80+
81+
homeConfigurations.default = inputs.home-manager.lib.homeManagerConfiguration {
82+
pkgs = mkPkgs system;
83+
extraSpecialArgs = specialArgs;
84+
modules = [ ./modules/home ];
85+
};
86+
87+
devShells = eachSystem (sys: {
9388
default = import ./shell.nix {
94-
pkgs = mkPkgs system;
95-
inherit
96-
((import ./lib/formatter.nix {
97-
inherit self;
98-
pkgs = mkPkgs system;
99-
}))
100-
formatter
101-
;
89+
pkgs = mkPkgs sys;
90+
formatter = (import ./formatter.nix { inherit self; pkgs = mkPkgs sys; }).formatter;
10291
};
10392
});
10493

105-
formatter = eachSystem (
106-
system:
107-
(import ./lib/formatter.nix {
108-
inherit self;
109-
pkgs = mkPkgs system;
110-
}).formatter
94+
formatter = eachSystem (sys:
95+
(import ./formatter.nix { inherit self; pkgs = mkPkgs sys; }).formatter
11196
);
11297

113-
checks = eachSystem (system: {
114-
formatting =
115-
(import ./lib/formatter.nix {
116-
inherit self;
117-
pkgs = mkPkgs system;
118-
}).check;
98+
checks = eachSystem (sys: {
99+
formatting = (import ./formatter.nix { inherit self; pkgs = mkPkgs sys; }).check;
119100
});
120101

121-
packages = eachSystem (
122-
system:
123-
import ./lib/scripts.nix {pkgs = mkPkgs system;}
124-
);
102+
packages = eachSystem (sys: import ./scripts.nix { pkgs = mkPkgs sys; });
125103
};
126104
}
File renamed without changes.

hosts/filesystems/btrfs.nix

Lines changed: 0 additions & 24 deletions
This file was deleted.

hosts/filesystems/disko-btrfs.nix

Lines changed: 0 additions & 77 deletions
This file was deleted.

hosts/filesystems/ext4.nix

Lines changed: 0 additions & 20 deletions
This file was deleted.

hosts/nixos/default.nix

Lines changed: 0 additions & 31 deletions
This file was deleted.

lib/mkHost.nix

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)