diff --git a/flake.nix b/flake.nix index 34bae57..7d7faa7 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,7 @@ overlays = { rust = rust-overlay.overlays.default; - halloy = import ./overlays/halloy-overlay.nix; + # halloy = import ./overlays/halloy-overlay.nix; waveterm = import ./overlays/waveterm-overlay.nix; karakeep = import ./overlays/karakeep-overlay.nix; }; @@ -81,39 +81,39 @@ ; unstablePkgs = import nixpkgs-unstable { inherit system; }; }; - modules = [ - stylix.nixosModules.stylix - { - nixpkgs.overlays = [ - overlays.waveterm - overlays.rust - overlays.halloy - overlays.karakeep - ]; - } - ./nixos/configuration.nix - ./nixos/hardware-configuration.nix - { stylix.image = "/home/death916/Documents/nix-config/home-manager/wallpaper.jpg"; } - home-manager.nixosModules.home-manager - ( - { - unstablePkgs, - ... - }: - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.backupFileExtension = "backup"; - home-manager.extraSpecialArgs = { inherit hmLib unstablePkgs inputs; }; - home-manager.users.death916 = { - imports = [ - ./home-manager/home.nix - stylix.homeModules.stylix - ]; - }; - } - ) - ]; + modules = [ + stylix.nixosModules.stylix + { + nixpkgs.overlays = [ + overlays.waveterm + overlays.rust + overlays.halloy + overlays.karakeep + ]; + } + ./nixos/configuration.nix + ./nixos/hardware-configuration.nix + { stylix.image = "/home/death916/Documents/nix-config/home-manager/wallpaper.jpg"; } + home-manager.nixosModules.home-manager + ( + { + unstablePkgs, + ... + }: + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.backupFileExtension = "backup"; + home-manager.extraSpecialArgs = { inherit hmLib unstablePkgs inputs; }; + home-manager.users.death916 = { + imports = [ + ./home-manager/home.nix + stylix.homeModules.stylix + ]; + }; + } + ) + ]; }; homelab = diff --git a/home-manager/home.nix b/home-manager/home.nix index 767b418..5ae7d5b 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -105,6 +105,7 @@ in hypnotix obsidian pokemon-colorscripts + awscli2 ]; programs.ghostty = {