diff options
author | Kjetil Orbekk <kj@orbekk.com> | 2025-03-01 14:34:25 -0500 |
---|---|---|
committer | Kjetil Orbekk <kj@orbekk.com> | 2025-03-01 14:34:25 -0500 |
commit | e603acd4828053fdfdaf245992322b8533f667d8 (patch) | |
tree | a7fa7fcf00e3f1bfdfc9f7e4fe442725cde3e915 /machines | |
parent | f043102d16a32a845501eda0b536feebad72db4a (diff) |
Delete old config
Diffstat (limited to 'machines')
-rw-r--r-- | machines/generic-container.nix | 11 | ||||
-rw-r--r-- | machines/minideck.nix | 86 | ||||
-rw-r--r-- | machines/x220-aji.nix | 75 |
3 files changed, 0 insertions, 172 deletions
diff --git a/machines/generic-container.nix b/machines/generic-container.nix deleted file mode 100644 index 6c6c332..0000000 --- a/machines/generic-container.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - imports = [ - ../config/container.nix - ../config/users.nix - ]; - - networking = { - hostName = lib.mkForce "new-container"; - }; -} diff --git a/machines/minideck.nix b/machines/minideck.nix deleted file mode 100644 index 7a76936..0000000 --- a/machines/minideck.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib, config, pkgs, ... }: - -with lib; - -{ - orbekk.simple-firewall.enable = mkForce false; - - # Install desktop packages, but don't enable X11. - orbekk.desktop.enable = true; - orbekk.development.enable = true; - services.xserver.enable = mkForce false; - services.xserver.displayManager.lightdm.enable = mkForce false; - - # Fake pipewire socket activation. - services.pipewire.socketActivation = false; - systemd.user.services.pipewire-setup = { - description = "Link pipewire socket"; - after = [ "paths.target" ]; - wantedBy = [ "default.target" ]; - serviceConfig = { - ExecStart = "${pkgs.coreutils}/bin/ln -s /tmp/pipewire-0 %t/pipewire-0"; - Type = "oneshot"; - }; - }; - - # GPG socket is forwarded by SSH. - systemd.user.sockets.gpg-agent.enable = mkForce false; - - nix.gc.persistent = false; - - boot.cleanTmpDir = mkForce false; # Don't delete bind mounts in /tmp. - boot.isContainer = true; - boot.postBootCommands = '' - # After booting, register the contents of the Nix store in the Nix - # database. - if [ -f /nix-path-registration ]; then - ${config.nix.package.out}/bin/nix-store --load-db < /nix-path-registration && - rm /nix-path-registration - fi - # nixos-rebuild also requires a "system" profile - ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system - ''; - - environment.defaultPackages = with pkgs; [ neovim xmonad ]; - environment.etc."resolv.conf".text = '' - nameserver 172.20.100.1 - nameserver 8.8.8.8 - ''; - - networking.hostName = "minideck"; - networking.interfaces.host0 = { - ipv4.addresses = [{ - address = "172.20.199.2"; - prefixLength = 24; - }]; - ipv4.routes = [{ - address = "0.0.0.0"; - prefixLength = 0; - via = "172.20.199.1"; - }]; - }; - - users.users.root.initialHashedPassword = mkOverride 150 ""; - - system.activationScripts.installInitScript = mkForce '' - ln -fs $systemConfig/init /sbin/init - ''; - environment.shellInit = '' - source /.host-profile - ''; - services.openssh.enable = mkDefault true; - services.openssh.startWhenNeeded = mkDefault true; - system.stateVersion = "22.05"; - - systemd.tmpfiles.rules = [ - # Don't remove the X11 socket. - "d /tmp/.X11-unix 1777 root root" - ]; - systemd.suppressedSystemUnits = [ - "systemd-udev-trigger.service" - "systemd-udevd.service" - "sys-fs-fuse-connections.mount" - "sys-kernel-debug.mount" - "dev-mqueue.mount" - ]; -} diff --git a/machines/x220-aji.nix b/machines/x220-aji.nix deleted file mode 100644 index 771d1b8..0000000 --- a/machines/x220-aji.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - imports = [ - ../config/desktop.nix - ../config/thinkpad.nix - ../config/yubikey.nix - ../config/postgresql.nix - # ../config/ap.nix - ]; - - services.thinkfan.enable = true; - services.thinkfan.sensors = '' - hwmon /sys/devices/platform/coretemp.0/hwmon/hwmon4/temp1_input - hwmon /sys/devices/platform/coretemp.0/hwmon/hwmon4/temp2_input - hwmon /sys/devices/platform/coretemp.0/hwmon/hwmon4/temp3_input - ''; - services.openssh.enable = true; - services.postgresql.package = lib.mkForce pkgs.postgresql_11; - - nixpkgs.config.allowUnfree = true; - nixpkgs.config.packageOverrides = pkgs: { - my-steam-run = (pkgs.steam.override { - extraPkgs = pkgs: [ ]; - }).run; - }; - - environment.systemPackages = with pkgs; [ - # my-steam-run - # wine - ]; - - networking = { - hostName = "aji"; - }; - - boot = { - initrd.luks.devices = { - cryptroot = { - device = "/dev/disk/by-id/ata-INTEL_SSDSC2BW240H6_CVTR609508W0240CGN-part2"; - allowDiscards = true; - }; - }; - - extraModulePackages = [ config.boot.kernelPackages.tp_smapi ]; - - extraModprobeConfig = '' - options i915 enable_rc6=1 - options thinkpad_acpi fan_control=1 - ''; - }; - - fileSystems = { - "/boot" = lib.mkForce { - mountPoint = "/boot"; - device = "/dev/disk/by-uuid/829B-F56C"; - fsType = "vfat"; - }; - "/" = { - mountPoint = "/"; - device = "/dev/mapper/cryptvg-root"; - fsType = "btrfs"; - options = ["subvol=aji-root" "discard" "compress=lzo"]; - }; - "/btrfs" = { - mountPoint = "/btrfs"; - device = "/dev/mapper/cryptvg-root"; - fsType = "btrfs"; - options = ["discard" "compress=lzo"]; - }; - }; - swapDevices = - [ { device = "/dev/mapper/cryptvg-swap"; } - ]; - system.stateVersion = "17.04"; -} |