From fec19d0d9ba87dc23a401c3675b1b83ee53605fb Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Thu, 14 Sep 2023 21:20:27 -0500 Subject: [PATCH] Formatting --- flake.nix | 1 + home.nix | 47 ++++++++++++++++++++++++++--------------------- nixos.nix | 12 +++++++----- 3 files changed, 34 insertions(+), 26 deletions(-) diff --git a/flake.nix b/flake.nix index 7fddb70..9896c08 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,7 @@ sops-nix.url = "github:Mic92/sops-nix"; helix.url = "github:helix-editor/helix"; rtx.url = "github:jdx/rtx"; + # TODO: hyprland.url = "github:hyprwm/Hyprland"; }; outputs = inputs @ { self, ... }: { diff --git a/home.nix b/home.nix index 9e6c1ca..ffc8f09 100644 --- a/home.nix +++ b/home.nix @@ -5,26 +5,31 @@ let rtx = prev.rtx // inputs.rtx.packages.${system}.rtx; }; # TODO: be functional - have a mkHome function? -in { - daniel = let - system = "x86_64-linux"; - pkgs = import inputs.nixpkgs { inherit system; overlays = [ (overlay system) ]; }; - in inputs.home-manager.lib.homeManagerConfiguration { - inherit pkgs; - modules = [ - (import ./home/user.nix pkgs) - (import ./home/linux.nix pkgs) - ]; - }; +in +{ + daniel = + let + system = "x86_64-linux"; + pkgs = import inputs.nixpkgs { inherit system; overlays = [ (overlay system) ]; }; + in + inputs.home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = [ + (import ./home/user.nix pkgs) + (import ./home/linux.nix pkgs) + ]; + }; - daniel-work = let - system = "aarch64-darwin"; - pkgs = import inputs.nixpkgs { inherit system; overlays = [ (overlay system) ]; }; - in inputs.home-manager.lib.homeManagerConfiguration { - inherit pkgs; - modules = [ - (import ./home/user.nix pkgs) - (import ./home/work.nix pkgs) - ]; - }; + daniel-work = + let + system = "aarch64-darwin"; + pkgs = import inputs.nixpkgs { inherit system; overlays = [ (overlay system) ]; }; + in + inputs.home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = [ + (import ./home/user.nix pkgs) + (import ./home/work.nix pkgs) + ]; + }; } diff --git a/nixos.nix b/nixos.nix index f7c20cd..97c5169 100644 --- a/nixos.nix +++ b/nixos.nix @@ -38,19 +38,21 @@ in rascal = nixosSystem "x86_64-linux" [ ./nixos/rascal.nix ]; - musicbox = nixosSystem "x86_64-linux" (disko { + musicbox = nixosSystem "x86_64-linux" (disko + { scheme = "unencrypted"; - disks = ["/dev/sda"]; + disks = [ "/dev/sda" ]; } ++ [ ./nixos/musicbox.nix ]); - thinker = nixosSystem "x86_64-linux" (disko { + thinker = nixosSystem "x86_64-linux" (disko + { scheme = "standard"; - disks = ["/dev/nvme0n1"]; + disks = [ "/dev/nvme0n1" ]; name = "vdb"; } ++ [ - ./nixos/thinker.nix + ./nixos/thinker.nix ]); # dragon = diskoNixosSystem self.diskoConfigurations.standard [ "/dev/disk/by-uuid/asdf" ] [ ./nixos/dragon.nix ]; }