diff --git a/hive.nix b/hive.nix index 7c2d59a..ed7bf87 100644 --- a/hive.nix +++ b/hive.nix @@ -29,7 +29,14 @@ in config = { boot.tmp.useTmpfs = true; networking.hostName = name; - nix.package = pkgs.lix; + nix = { + nixPath = [ + "nixpkgs=${builtins.storePath pkgs.path}" + "nixos=${builtins.storePath pkgs.path}" + ]; + channel.enable = false; + package = pkgs.lix; + }; system.build.anywhere = pkgs.writeShellApplication { name = "anywhere-deploy_${name}.sh"; runtimeInputs = [ pkgs.nixos-anywhere ]; @@ -84,9 +91,6 @@ in (users.root { ssh = true; }) users.catvayor ]; - home-manager.users.catvayor = { - imports = [ mods.home.mail ]; - }; }; kat-virt = @@ -150,36 +154,5 @@ in services.openssh.enable = true; services.qemuGuest.enable = true; boot.kernelParams = [ "console=ttyS0" ]; - - environment.etc = { - "config_base.nix" = { - mode = "0444"; - text = '' - { config, lib, pkgs, ... }: { - imports = [ ./hardware-configuration.nix ]; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.supportedFilesystems = [ "bcachefs" ]; - boot.kernelPackages = pkgs.linuxPackages_latest; - # networking.networkmanager.enable = true; - networking.hostName = "kat-undefined"; - - time.timeZone = "Europe/Paris"; - i18n.defaultLocale = "en_US.UTF-8"; - console = { - font = "Lat2-Terminus16"; - keyMap = "fr"; - }; - #services.netbird.enable = true; - services.qemuGuest.enable = true; - services.openssh.enable = true; - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAA16foz+XzwKwyIR4wFgNIAE3Y7AfXyEsUZFVVz8Rie catvayor@katvayor" - ]; - system.stateVersion = "23.11"; - } - ''; - }; - }; }; } diff --git a/machines/kat-probook/configuration.nix b/machines/kat-probook/configuration.nix index 05f5491..693bf0e 100644 --- a/machines/kat-probook/configuration.nix +++ b/machines/kat-probook/configuration.nix @@ -3,6 +3,7 @@ lib, pkgs, mods, + sources, ... }: @@ -41,7 +42,7 @@ }; environment.systemPackages = with pkgs; [ - (pkgs.callPackage { }) + (pkgs.callPackage "${toString sources.agenix}/pkgs/agenix.nix" { }) wget brightnessctl nix-search-cli @@ -86,6 +87,8 @@ }; services.netbird.enable = true; + programs.steam.enable = true; + # boot.kernelModules = [ "kvm-intel" "kvm-amd" ]; # programs.virt-manager.enable = true; # virtualisation.libvirtd.enable = true;