diff --git a/flake.nix b/flake.nix index b518cf6..e727081 100644 --- a/flake.nix +++ b/flake.nix @@ -64,16 +64,15 @@ altair = mkNixosConfig { path = ./system/hosts/altair; }; + vega = mkNixosConfig { + path = ./system/hosts/vega; + nixpkgs = inputs.nixpkgs-stable; + }; mcp = (import ./system/hosts/mcp) { inherit inputs; inherit self; nixpkgs = inputs.nixpkgs-stable; }; - vega = (import ./system/hosts/vega) { - inherit inputs; - inherit self; - nixpkgs = inputs.nixpkgs-unstable; - }; }; features = { development = (import ./home-manager/features/development/development.nix); diff --git a/home-manager/features/terminal.nix b/home-manager/features/terminal.nix index b251948..952f643 100644 --- a/home-manager/features/terminal.nix +++ b/home-manager/features/terminal.nix @@ -4,9 +4,13 @@ home.packages = with pkgs; [ # Font - nerd-fonts.inconsolata - nerd-fonts.fira-code - nerd-fonts.jetbrains-mono + # 24.11 + inconsolata-nerdfont + fira-code-nerdfont + # 25.05 + # nerd-fonts.inconsolata + # nerd-fonts.fira-code + # nerd-fonts.jetbrains-mono ]; # Allow Home Manager to set fonts. diff --git a/system/hosts/altair/default.nix b/system/hosts/altair/default.nix index 7f787fb..8c85e74 100644 --- a/system/hosts/altair/default.nix +++ b/system/hosts/altair/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: +{ ... }: { imports = [ ./configuration.nix diff --git a/system/hosts/vega/configuration.nix b/system/hosts/vega/configuration.nix index 6b0b924..6d72abd 100644 --- a/system/hosts/vega/configuration.nix +++ b/system/hosts/vega/configuration.nix @@ -92,7 +92,7 @@ services.gnome.gnome-keyring.enable = true; # Enable sound with pipewire. - services.pulseaudio.enable = false; + hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/system/hosts/vega/default.nix b/system/hosts/vega/default.nix index b13bca1..8c85e74 100644 --- a/system/hosts/vega/default.nix +++ b/system/hosts/vega/default.nix @@ -1,27 +1,18 @@ -{ nixpkgs, inputs, ... }: -nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ +{ ... }: +{ + imports = [ ./configuration.nix ./hardware-configuration.nix - inputs.home-manager.nixosModules.home-manager - { - nixpkgs.config.allowUnfree = true; - home-manager.users.drew = - { ... }: - { - imports = [ - ./drew.nix - ]; - }; - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { - inherit inputs; - }; - } + ../../authorized-keys.nix ]; - specialArgs = { - inherit inputs; - }; + + nixpkgs.config.allowUnfree = true; + + home-manager.users.drew = + { ... }: + { + imports = [ + ./drew.nix + ]; + }; }