From 07146859b40087ff7fabfb19d20badd92a771d51 Mon Sep 17 00:00:00 2001 From: catvayor Date: Tue, 25 Jun 2024 18:19:34 +0200 Subject: [PATCH] default is config entry --- hive.nix | 23 +-- .../{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 machines/kat-test/configuration.nix | 134 ------------------ machines/kat-test/hardware-configuration.nix | 49 ------- .../{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 7 files changed, 4 insertions(+), 202 deletions(-) rename machines/kat-probook/{configuration.nix => default.nix} (100%) rename machines/kat-r86s/{configuration.nix => default.nix} (100%) delete mode 100644 machines/kat-test/configuration.nix delete mode 100644 machines/kat-test/hardware-configuration.nix rename machines/kat-traque/{configuration.nix => default.nix} (100%) rename machines/kat-virt/{configuration.nix => default.nix} (100%) diff --git a/hive.nix b/hive.nix index c7d2e03..34a5086 100644 --- a/hive.nix +++ b/hive.nix @@ -62,7 +62,7 @@ in deployment.allowLocalDeployment = true; imports = [ - ./machines/kat-probook/configuration.nix + ./machines/kat-probook (users.root { ssh = false; }) users.catvayor ]; @@ -77,33 +77,18 @@ in { deployment.targetHost = "r86s.kat"; imports = [ - ./machines/kat-r86s/configuration.nix + ./machines/kat-r86s (users.root { ssh = true; }) ]; }; - kat-test = - { name, nodes, ... }: - { - deployment = { - allowLocalDeployment = true; - targetHost = "test.kat"; - }; - - imports = [ - ./machines/kat-test/configuration.nix - (users.root { ssh = true; }) - users.catvayor - ]; - }; - kat-virt = { name, nodes, ... }: { deployment.targetHost = "virt.kat"; imports = [ - ./machines/kat-virt/configuration.nix + ./machines/kat-virt (users.root { ssh = true; }) ]; users.users.root.openssh.authorizedKeys.keys = [ id_sylvain ]; @@ -115,7 +100,7 @@ in deployment.targetHost = "traque.kat"; imports = [ - ./machines/kat-traque/configuration.nix + ./machines/kat-traque (users.root { ssh = true; }) ]; users.users.root.openssh.authorizedKeys.keys = [ id_sylvain ]; diff --git a/machines/kat-probook/configuration.nix b/machines/kat-probook/default.nix similarity index 100% rename from machines/kat-probook/configuration.nix rename to machines/kat-probook/default.nix diff --git a/machines/kat-r86s/configuration.nix b/machines/kat-r86s/default.nix similarity index 100% rename from machines/kat-r86s/configuration.nix rename to machines/kat-r86s/default.nix diff --git a/machines/kat-test/configuration.nix b/machines/kat-test/configuration.nix deleted file mode 100644 index 5040f36..0000000 --- a/machines/kat-test/configuration.nix +++ /dev/null @@ -1,134 +0,0 @@ -# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). - -{ - config, - lib, - pkgs, - mods, - ... -}: - -{ - 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; # Easiest to use and most distros use this by default. - time.timeZone = "Europe/Paris"; - - i18n.defaultLocale = "en_US.UTF-8"; - console = { - font = "Lat2-Terminus16"; - keyMap = "fr"; - }; - - # Enable the X11 windowing system. - # services.xserver.enable = true; - - # security.polkit.enable = true; - # programs.light.enable = true; - - nixpkgs.config.allowUnfree = true; - - # Configure keymap in X11 - # services.xserver.xkb.layout = "us"; - # services.xserver.xkb.options = "eurosign:e,caps:escape"; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - hardware = { - pulseaudio = { - enable = true; - package = pkgs.pulseaudioFull; - }; - bluetooth = { - enable = true; - powerOnBoot = false; - }; - }; - - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - programs.zsh.enable = true; - - environment.systemPackages = with pkgs; [ - wget - brightnessctl - nix-search-cli - git - btop - ranger - colmena - tree - ]; - fonts.packages = with pkgs; [ - fira-code-nerdfont - font-awesome - ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - - # services.syncthing = { - # enable = true; - # systemService = true; - # dataDir = "/home/catvayor"; - # user = "catvayor"; - # group = "users"; - # openDefaultPorts = true; - # settings = { - # folders."essentials" = { - # path = "~/essentials"; - # id = "vgpwu-fk3ct"; - # devices = [ "katest" "katel" ]; - # }; - # devices.katest.id = "UPVXT7D-ZQF4E3J-4WKLLRV-2KF7323-7VOMEJJ-4PZVXW4-UQ2YABE-G7ID4AD"; - # devices.katel.id = "DYOKK7J-HZAF5S7-FYTHQF5-UD5GJZ2-4JMV5I5-STUM3HG-5YM2JPR-LATJNAZ"; - # }; - # }; - services.netbird.enable = true; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - - # This option defines the first version of NixOS you have installed on this particular machine, - # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. - # - # Most users should NEVER change this value after the initial install, for any reason, - # even if you've upgraded your system to a new NixOS release. - # - # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, - # so changing it will NOT upgrade your system. - # - # This value being lower than the current NixOS release does NOT mean your system is - # out of date, out of support, or vulnerable. - # - # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, - # and migrated your data accordingly. - # - # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "23.11"; # Did you read the comment? -} diff --git a/machines/kat-test/hardware-configuration.nix b/machines/kat-test/hardware-configuration.nix deleted file mode 100644 index aa21245..0000000 --- a/machines/kat-test/hardware-configuration.nix +++ /dev/null @@ -1,49 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: - -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "usb_storage" - "sd_mod" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "UUID=3d3c874f-7182-4eb1-91a6-ededc6f05fcc"; - fsType = "bcachefs"; - }; - - boot.initrd.luks.devices."disk".device = "/dev/disk/by-uuid/b1e18836-c657-49b2-81f9-8f0b2e4a4283"; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/B405-7B40"; - fsType = "vfat"; - }; - - swapDevices = [ { device = "/dev/disk/by-uuid/060c35d7-86b0-4901-b882-02443efbfe07"; } ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/machines/kat-traque/configuration.nix b/machines/kat-traque/default.nix similarity index 100% rename from machines/kat-traque/configuration.nix rename to machines/kat-traque/default.nix diff --git a/machines/kat-virt/configuration.nix b/machines/kat-virt/default.nix similarity index 100% rename from machines/kat-virt/configuration.nix rename to machines/kat-virt/default.nix