From 64fcba43f061d5c9d1c25f58dddd6367f9457941 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 23:46:05 +0300 Subject: [PATCH] simpler flake --- flake.nix | 13 +------------ hosts/ymir/configuration.nix | 7 ++++++- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 300c317..9b213ba 100644 --- a/flake.nix +++ b/flake.nix @@ -74,18 +74,7 @@ }; ymir = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; - modules = [ - ./hosts/ymir/configuration.nix - vscode-server.nixosModules.default - agenix.nixosModules.default - home-manager.nixosModules.home-manager - { - environment.systemPackages = [ - agenix.packages.x86_64-linux.default - osbm-nvim.packages.x86_64-linux.default - ]; - } - ]; + modules = [ ./hosts/ymir/configuration.nix ]; }; harmonica = nixpkgs.lib.nixosSystem { modules = [ diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index a7378aa..d03f7ad 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -4,6 +4,7 @@ { config, pkgs, + inputs, ... }: let stateVersion = "25.05"; @@ -11,6 +12,9 @@ in { imports = [ ./hardware-configuration.nix ../../modules + inputs.vscode-server.nixosModules.default + inputs.agenix.nixosModules.default + inputs.home-manager.nixosModules.home-manager ]; blockYoutube = false; @@ -140,8 +144,9 @@ in { }; environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. nvidia-container-toolkit + inputs.agenix.packages.x86_64-linux.default + inputs.osbm-nvim.packages.x86_64-linux.default ]; services.ollama = {