diff --git a/machines/x2100/default.nix b/machines/x2100/default.nix deleted file mode 100644 index 1b6b971..0000000 --- a/machines/x2100/default.nix +++ /dev/null @@ -1,177 +0,0 @@ -{ - config, - pkgs, - lib, - inputs, - ... -}: - -{ - imports = [ - ./hardware.nix - ./home-julien.nix - ]; - - machine.meta = { - arch = "x86_64-linux"; - nixpkgs_version = inputs.nixpkgs_patched; - hm_version = inputs.home-manager-unstable; - # TODO: Fix colmena deployment - ips.public.ipv4 = "127.0.0.1"; - - }; - - # Lanzaboote - boot.loader.systemd-boot.enable = lib.mkForce false; - boot.lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - }; - - # Automatic root partition decryption with TPM2 - boot.initrd = { - systemd = { - enable = true; - enableTpm2 = true; - }; - clevis = { - enable = true; - devices."/dev/nvme0n1p1".secretFile = ./root.jwe; - }; - }; - - # Sound - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - wireplumber.enable = true; - }; - hardware.pulseaudio.enable = lib.mkForce false; - - services.postgresql.enable = true; - - networking.wireless.enable = false; - - environment.sessionVariables = { - LIBSEAT_BACKEND = "logind"; - }; - - services.logind.lidSwitch = "suspend"; - - services.tailscale.enable = true; - networking.networkmanager.enable = true; - - networking.networkmanager.dns = "systemd-resolved"; - services.resolved.enable = true; - - time.timeZone = "Europe/Paris"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - console = { - font = null; - useXkbConfig = true; # use xkbOptions in tty. - }; - - hardware.graphics.enable = true; - - services.dbus.enable = true; - - programs.dconf.enable = true; - - security.polkit.enable = true; - - services.tlp.enable = false; - - security.tpm2.enable = true; - security.tpm2.pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so - security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables - users.users.julien.extraGroups = [ "tss" ]; # tss group has access to TPM devices - - nix = { - distributedBuilds = true; - buildMachines = [ - { - hostName = "epyc.infra.newtype.fr"; - maxJobs = 100; - systems = [ "x86_64-linux" ]; - sshUser = "root"; - supportedFeatures = [ - "kvm" - "nixos-test" - ]; - sshKey = "/home/julien/.ssh/id_ed25519"; - speedFactor = 2; - } - ]; - }; - - environment.systemPackages = with pkgs; [ - tailscale - brightnessctl - sbctl - wl-mirror - ]; - - networking.wireguard.interfaces.rezo = { - ips = [ "fd81:fb3a:50cc::200/128" ]; - privateKeyFile = "/root/wg-private"; - peers = [ - { - publicKey = "srQPT9ZjXBKyJ7R1mvXYMZNy+NcnHMy5qE1WGZDfmnc="; - allowedIPs = [ "fd81:fb3a:50cc::/48" ]; - endpoint = "129.199.146.230:25351"; - } - ]; - }; - - security.pam.services.swaylock = { }; - - services.printing.enable = true; - services.avahi.enable = true; - services.avahi.nssmdns4 = true; - # for a WiFi printer - services.avahi.openFirewall = true; - - programs.ssh.startAgent = true; - - services.gnome.gnome-keyring.enable = true; - - nixpkgs.config.permittedInsecurePackages = [ - "electron-24.8.6" - "zotero-6.0.27" - ]; - - services.hash-collection = { - enable = true; - collection-url = "https://reproducibility.nixos.social"; - tokenFile = "/home/julien/lila-secrets/tokenfile"; - secretKeyFile = "/home/julien/lila-secrets/secret.key"; - }; - - nix.settings = { - post-build-hook = lib.mkForce ( - pkgs.writeScript "hash-collection-build-hook" '' - #!/bin/sh - export HASH_COLLECTION_SERVER=${config.services.hash-collection.collection-url} - export HASH_COLLECTION_TOKEN=$(cat ${toString config.services.hash-collection.tokenFile}) - export HASH_COLLECTION_SECRET_KEY=$(cat ${toString config.services.hash-collection.secretKeyFile}) - - # redirect stderr to stdout, otherwise it appears to go missing? - ${pkgs.lila-build-hook}/bin/build-hook 2>&1 - '' - ); - }; - - # Desktop environment - programs.xwayland.enable = true; - programs.hyprland = { - enable = true; - package = pkgs.unstable.hyprland; - portalPackage = pkgs.unstable.xdg-desktop-portal-hyprland; - }; - - system.stateVersion = "23.05"; -} diff --git a/machines/x2100/hardware.nix b/machines/x2100/hardware.nix deleted file mode 100644 index 89615c9..0000000 --- a/machines/x2100/hardware.nix +++ /dev/null @@ -1,50 +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 = [ ]; - boot.kernelPackages = pkgs.linuxPackages_6_8; - - fileSystems."/" = { - device = "/dev/nvme0n1p1"; - fsType = "bcachefs"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/72EA-E988"; - fsType = "vfat"; - }; - - swapDevices = [ { device = "/dev/disk/by-uuid/2c19cb7a-bf8d-4bd3-ad61-ee3c27d57998"; } ]; - - # 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.enp1s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/machines/x2100/home-julien.nix b/machines/x2100/home-julien.nix deleted file mode 100644 index f791859..0000000 --- a/machines/x2100/home-julien.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ pkgs, ... }: -{ - - luj.hmgr.julien = { - home.stateVersion = "22.11"; - luj.programs.neovim.enable = true; - luj.programs.ssh-client.enable = true; - luj.programs.git.enable = true; - luj.programs.gtk.enable = true; - luj.programs.alacritty.enable = true; - luj.programs.waybar.enable = true; - luj.programs.waybar.interfaceName = "wlp3s0"; - luj.programs.kitty.enable = true; - luj.programs.dunst.enable = true; - luj.programs.hyprland.enable = true; - luj.emails.enable = true; - luj.programs.firefox.enable = true; - luj.programs.pass.enable = true; - - programs.rofi = { - enable = true; - package = pkgs.rofi-wayland; - font = "Fira Font"; - theme = "DarkBlue"; - }; - - programs.direnv = { - enable = true; - enableZshIntegration = true; - nix-direnv.enable = true; - }; - - home.pointerCursor = { - name = "Adwaita"; - package = pkgs.gnome.adwaita-icon-theme; - size = 15; - x11 = { - enable = true; - defaultCursor = "Adwaita"; - }; - }; - - home.packages = with pkgs; [ - du-dust - kitty - jq - lazygit - fira-code - feh - meld - emacs29-pgtk - vlc - jftui - nerdfonts - libreoffice - font-awesome - cantarell-fonts - roboto - nodejs - htop - evince - mosh - zotero - flameshot - kitty - networkmanagerapplet - xdg-utils - step-cli - gh - gh-dash - cvc5 - signal-desktop - scli - texlive.combined.scheme-full - ]; - - fonts.fontconfig.enable = true; - - home.keyboard = { - layout = "fr"; - }; - }; -} diff --git a/machines/x2100/root.jwe b/machines/x2100/root.jwe deleted file mode 100644 index c6384fd..0000000 --- a/machines/x2100/root.jwe +++ /dev/null @@ -1 +0,0 @@ -eyJhbGciOiJkaXIiLCJjbGV2aXMiOnsicGluIjoidHBtMiIsInRwbTIiOnsiaGFzaCI6InNoYTI1NiIsImp3a19wcml2IjoiQU80QUlOOEZUcXNiT2R1RUswZHZ0TVEwSVVLaG5oUEtidEUzWnZGVVJJWFBJakQzQUJBdUlrdGJCeWRaYjdHa1dfZ1V0VW85bTR4cDJseF9rTUtrNzhzZkRCelRmZVowYVFHSHlzcFJFc0hhSzZGY0t0MlBkcW1YQWF3Q3RGM1JrQktWN1prZkF5ZGV1bzNJb3BvSlRZOGRnc0JMTTRFalBkR01tRFl6T1Q2THg5dzdlQl9qbnJ5amlwUzRiVHBhdmF6RDhpeTFkOVlNVmZwQlhMMnVnYU02NkNrc05yRTE2WU1CeU1wOWFvV2lBUFBVWkliRGRuWFdmSVdEaVR0MWFqc0JjY2pKa0Z2aUdyclFqWFhsU1YyZVBhUUt4RGE4blBjSnNyOTd6R1U2YnZkREVVb3N3SlBGS1lKcF95TzYiLCJqd2tfcHViIjoiQUM0QUNBQUxBQUFFMGdBQUFCQUFJRUpwelJNV3Y4a1A5c1ZuZjRFc01mLUNBM0IteFVyNnhRc1ZtNjNQX0VMNSIsImtleSI6ImVjYyJ9fSwiZW5jIjoiQTI1NkdDTSJ9..GBc9Ff3etDxIjBQf.XYPmAHm0B67jUcI.vbHHVIQ45KJcypPbR3soWw \ No newline at end of file diff --git a/machines/x2100/wallpaper.jpg b/machines/x2100/wallpaper.jpg deleted file mode 100644 index 403fd4e..0000000 Binary files a/machines/x2100/wallpaper.jpg and /dev/null differ