From 7d40e27b210bc7bd016b8060ab15132571a5c397 Mon Sep 17 00:00:00 2001 From: iFargle Date: Fri, 15 Sep 2023 13:50:26 +0900 Subject: [PATCH] reorganize --- flake.nix | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/flake.nix b/flake.nix index d28b01c7..32664b0e 100644 --- a/flake.nix +++ b/flake.nix @@ -11,9 +11,7 @@ sops-nix.url = "github:Mic92/sops-nix"; doom-emacs.url = "github:nix-community/nix-doom-emacs"; }; - outputs = { - self, nixpkgs, nixpkgs-wayland, home-manager, lanzaboote, nur, sops-nix, doom-emacs, ... - }@inputs: + outputs = { self, nixpkgs, nixpkgs-wayland, home-manager, lanzaboote, nur, sops-nix, doom-emacs, ... } @inputs: let inherit (self) outputs; stateVersion = "unstable"; @@ -21,29 +19,20 @@ libx = import ./lib { inherit inputs outputs stateVersion hmStateVersion; }; in { nixosConfigurations = { - # Currently a Lenovo P1 Gen 5 - nixos-laptop = libx.mkHost { - hostname = "nixos-laptop"; username = "albert"; desktop = "hyprland"; gpu = "intel"; theme = "gruvbox"; - }; - # Ryzen 7 Framework 13 - nixos-framework = libx.mkHost { - hostname = "nixos-framework"; username = "albert"; desktop = "hyprland"; gpu = "amd"; theme = "gruvbox"; - }; - nixos-desktop = libx.mkHost { - hostname = "nixos-desktop"; username = "albert"; desktop = "gnome"; gpu = "nvidia"; theme = "gruvbox"; - }; - # Testing ARM NixOS - nixos-rpi4-01 = libx.mkHost { - hostname = "nixos-rpi4-01"; username = "albert"; platform = "aarch64-linux"; - }; + nixos-laptop = libx.mkHost + { hostname = "nixos-laptop"; username = "albert"; desktop = "hyprland"; gpu = "intel"; theme = "gruvbox"; }; + nixos-framework = libx.mkHost + { hostname = "nixos-framework"; username = "albert"; desktop = "hyprland"; gpu = "amd"; theme = "gruvbox"; }; + nixos-rpi4-01 = libx.mkHost + { hostname = "nixos-rpi4-01"; username = "albert"; }; }; homeConfigurations = { - "albert@nixos-laptop" = libx.mkHome { - hostname = "nixos-laptop"; username = "albert"; desktop = "hyprland"; theme = "gruvbox"; - }; - "albert@nixos-rpi4-01" = libx.mkHome { - hostname = "nixos-rpi4-01"; username = "albert"; - }; + "albert@nixos-laptop" = libx.mkHome + { hostname = "nixos-laptop"; username = "albert"; desktop = "hyprland"; theme = "gruvbox"; }; + "albert@nixos-framework" = libx.mkHome + { hostname = "nixos-framework"; username = "albert"; desktop = "hyprland"; theme = "gruvbox"; }; + "albert@nixos-rpi4-01" = libx.mkHome + { hostname = "nixos-rpi4-01"; username = "albert"; }; }; }; } \ No newline at end of file