summaryrefslogtreecommitdiff
path: root/flake.nix
diff options
context:
space:
mode:
authorDevin Finlinson <devin.finlinson@pm.me>2023-08-31 00:59:48 +0200
committerDevin Finlinson <devin.finlinson@pm.me>2023-08-31 00:59:48 +0200
commit25c7085a5f6777359329b19799840fc7257e0ac3 (patch)
treec27cd02452645c4c8c322d2200d55bbc190999d3 /flake.nix
parent9668d628be89827963c92ff7faf1f2f55e53d97b (diff)
Diffstat (limited to 'flake.nix')
-rw-r--r--flake.nix52
1 files changed, 41 insertions, 11 deletions
diff --git a/flake.nix b/flake.nix
index 5130363..777c6f4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,16 +10,44 @@
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
- # hyprland.url = "github:hyprwm/Hyprland";
+ hyprland.url = "github:hyprwm/Hyprland";
};
- # outputs = { nixpkgs, nixpkgs-unstable, home-manager, hyprland, ... }: {
- outputs = { nixpkgs, nixpkgs-unstable, home-manager, ... }: {
+ outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, hyprland, ... }: {
+ # outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }: let
+ # system = "x86_64-linux";
+
+ # defFlakeSystem = baseCfg: nixpkgs.lib.nixosSystem {
+ # # defFlakeSystem = nixpkgs.lib.nixosSystem {
+
+ # pkgs = import nixpkgs {
+ # inherit system;
+ # config.allowUnfree = true;
+ # };
+ # pkgsUnstable = import nixpkgs-unstable {
+ # inherit system;
+ # config.allowUnfree = true;
+ # };
+
+ # modules = [({ ... }: {
+ # imports = [
+ # baseCfg
+ # home-manager.nixosModules.home-manager
+ # {
+ # # home-manager.useGlobalPkgs = true;
+ # home-manager.useUserpackages = true;
+ # }
+ # ];
+ # # Let 'nixos-version --json' know the Git revision of this flake.
+ # system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
+ # nix.registry.nixpkgs.flake = nixpkgs;
+ # })];
+ # };
+ # in {
nixosConfigurations = {
nixos-zenbook = nixpkgs.lib.nixosSystem {
- system = "x86_64-linux";
modules = [
./machines/zenbook/configuration.nix
@@ -28,15 +56,17 @@
# Default users
./modules/user-profiles/defin.nix
- home-manager.nixosModules.home-manager {
+ imports = [
+ home-manager.nixosModules.home-manager {
- # home-manager.useGlobalPkgs = true;
- home-manager.useUserpackages = true;
- home-manager.users.defin = import ./home-manager/home.nix;
+ # home-manager.useGlobalPkgs = true;
+ home-manager.useUserpackages = true;
+ home-manager.users.defin = import ./home-manager/home.nix;
- # Optionally, use home-manager.extraSpecialArgs to pass
- # arguments to home.nix
- }
+ # Optionally, use home-manager.extraSpecialArgs to pass
+ # arguments to home.nix
+ }
+ ]
# hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;}
./modules/hyprland.nix