diff --git a/bacon.nix b/bacon.nix index 7edd6e8..a2c7c6f 100644 --- a/bacon.nix +++ b/bacon.nix @@ -1,7 +1,8 @@ { inputs, system }: with inputs; let username = "sigmanificient"; -in { +in +{ inherit system; specialArgs = { @@ -11,33 +12,33 @@ in { modules = let - home-manager-conf = { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - users.${username} = import ./home; - extraSpecialArgs = { - inherit username system ecsls; + home-manager-conf = { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + users.${username} = import ./home; + extraSpecialArgs = { + inherit username system ecsls; + }; }; }; - }; - hosts-conf = { - networking.stevenBlackHosts.enable = true; - }; + hosts-conf = { + networking.stevenBlackHosts.enable = true; + }; - mod-nixhardware-lst = with nixos-hardware.nixosModules; [ - asus-battery - common-cpu-amd - common-pc - common-pc-ssd - ]; - in + mod-nixhardware-lst = with nixos-hardware.nixosModules; [ + asus-battery + common-pc-laptop + common-cpu-amd + common-pc-ssd + ]; + in [ - ./system + ./system ./hardware-configuration.nix ] ++ [ - home-manager.nixosModules.home-manager + home-manager.nixosModules.home-manager home-manager-conf hosts.nixosModule hosts-conf diff --git a/flake.nix b/flake.nix index f2e906f..458e740 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ nixosConfigurations = { Bacon = nixpkgs.lib.nixosSystem - (import ./bacon.nix { inherit inputs system; }); + (import ./bacon.nix { inherit inputs system; }); }; }; } diff --git a/home/bash/default.nix b/home/bash/default.nix index 53e09cb..5193ff7 100644 --- a/home/bash/default.nix +++ b/home/bash/default.nix @@ -6,7 +6,8 @@ let rev = "c97292398936393c3f985f4924a3c234793ca3b8"; sha256 = "sha256-Heq/VxfCqFhnYxAm2ejymANdPmZ5uNixuZiuC/53VQE="; }; -in { +in +{ programs.bash = { enable = true; diff --git a/home/nvim/default.nix b/home/nvim/default.nix index 85d6cd1..4cb068c 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -26,7 +26,8 @@ extraPackages = with pkgs; let ecsls-pkg = ecsls.packages.${system}.default; - in [ + in + [ nil lua-language-server nodePackages.pyright diff --git a/system/default.nix b/system/default.nix index c6b0551..602358a 100644 --- a/system/default.nix +++ b/system/default.nix @@ -168,7 +168,8 @@ fonts.packages = with pkgs; let jetbrains-mono-nerd-font = (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }); - in [ + in + [ jetbrains-mono-nerd-font dina-font fira-code