From 32a3bd27a8d6356587aa1e78541b90cf05ee0f19 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 22 Aug 2025 14:21:44 +0200 Subject: [PATCH] hosts/dosei: drop --- README.md | 1 - hosts/dosei/configuration.nix | 100 ------------------------- hosts/dosei/hardware-configuration.nix | 44 ----------- hosts/dosei/home/default.nix | 22 ------ hosts/dosei/programs/nrfutil.nix | 13 ---- hosts/dosei/services/avahi.nix | 13 ---- hosts/dosei/services/docker.nix | 4 - hosts/dosei/services/jenkins.nix | 23 ------ hosts/dosei/services/logiops.nix | 52 ------------- hosts/dosei/services/wstunnel.nix | 32 -------- 10 files changed, 304 deletions(-) delete mode 100644 hosts/dosei/configuration.nix delete mode 100644 hosts/dosei/hardware-configuration.nix delete mode 100644 hosts/dosei/home/default.nix delete mode 100644 hosts/dosei/programs/nrfutil.nix delete mode 100644 hosts/dosei/services/avahi.nix delete mode 100644 hosts/dosei/services/docker.nix delete mode 100644 hosts/dosei/services/jenkins.nix delete mode 100644 hosts/dosei/services/logiops.nix delete mode 100644 hosts/dosei/services/wstunnel.nix diff --git a/README.md b/README.md index 158e9d2..ba96844 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,6 @@ Here are some of the interesting files and dirs: |------|--------------|---------| | `Tsuki` | Dell Poweredge r710 server | Data storage / Build server / Selfhosted services. This server hosts a wide variety of services, including websites, matrix server, git repos, CI/CD and more. **This is probably the most interesting machine to pick config from** | | `Kasei` | AMD Zen 2 CPU / AMD GPU - desktop computer | Semi-daily driver. This is my main computer at home. | -| `Dosei` | Dell Optiplex | Work computer, mostly used for development and testing. | ## home-manager configuration diff --git a/hosts/dosei/configuration.nix b/hosts/dosei/configuration.nix deleted file mode 100644 index d1226b7..0000000 --- a/hosts/dosei/configuration.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - imports = [ - ./hardware-configuration.nix - - ./programs/nrfutil.nix - - ./services/avahi.nix - ./services/docker.nix - ./services/jenkins.nix - ./services/logiops.nix - ./services/wstunnel.nix - ]; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - boot.kernelPackages = pkgs.linuxPackages_6_14; - - boot.binfmt.emulatedSystems = [ - "aarch64-linux" - "armv7l-linux" - ]; - - i18n.defaultLocale = "en_US.UTF-8"; - - services.udev.packages = with pkgs; [ - segger-jlink - ]; - - system.stateVersion = "24.05"; - - machineVars = { - headless = false; - gaming = false; - development = true; - creative = true; - - wayland = true; - - dataDrives = let - main = "/data"; - in { - drives = { inherit main; }; - default = main; - }; - - screens = { - DP-1 = { - primary = true; - frequency = 60; - }; - DP-2 = { - frequency = 60; - position = "1920x0"; - }; - }; - }; - - systemd.targets = { - sleep.enable = false; - suspend.enable = false; - hibernate.enable = false; - hybrid-sleep.enable = false; - }; - - systemd.network = { - enable = true; - networks."40-enp0s31f6" = { - name = "enp0s31f6"; - DHCP = true; - domains = [ "nordicsemi.no" ]; - }; - }; - - networking = { - hostName = "dosei"; - useNetworkd = true; - # TODO: reenable - firewall.enable = false; - # hostId = ""; - }; - - services = { - openssh = { - enable = true; - settings.X11Forwarding = true; - }; - blueman.enable = true; - fstrim.enable = true; - }; - - nix.buildMachines = lib.mkForce [ ]; - - hardware = { - bluetooth.enable = true; - enableRedistributableFirmware = true; - keyboard.zsa.enable = true; - }; -} diff --git a/hosts/dosei/hardware-configuration.nix b/hosts/dosei/hardware-configuration.nix deleted file mode 100644 index f615e06..0000000 --- a/hosts/dosei/hardware-configuration.nix +++ /dev/null @@ -1,44 +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" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - boot.supportedFilesystems = [ "bcachefs" ]; - - fileSystems."/" = - { device = "UUID=ef98dc67-17bf-4005-8209-b5d3c352d6c6"; - fsType = "bcachefs"; - }; - - boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/1b6e3d9b-4408-45ac-9b98-dce4b505c311"; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/C930-D394"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/4fcc8f63-f5e0-42e3-a9d3-a96e4a26d5e8"; } - ]; - - # 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.enp0s31f6.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.enableAllFirmware = true; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/dosei/home/default.nix b/hosts/dosei/home/default.nix deleted file mode 100644 index 6f9a870..0000000 --- a/hosts/dosei/home/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, pkgs, ... }: -{ - home.stateVersion = "24.05"; - - home.packages = with pkgs; [ - groovy - ]; - - programs.ssh.matchBlocks = { - "tsuki-ws" = { - user = "h7x4"; - hostname = "localhost"; - port = 10022; - }; - - "hildring pvv-login".proxyJump = "tsuki-ws"; - "drolsum pvv-login2 pvv".proxyJump = "tsuki-ws"; - "microbel pvv-users pvv-mail".proxyJump = "tsuki-ws"; - }; - - programs.waybar.settings.mainBar.output = [ "DP-1" ]; -} diff --git a/hosts/dosei/programs/nrfutil.nix b/hosts/dosei/programs/nrfutil.nix deleted file mode 100644 index 982e1c0..0000000 --- a/hosts/dosei/programs/nrfutil.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - nrfutil - nrfconnect - nrf-command-line-tools - ]; - - services.udev.packages = with pkgs; [ - nrf-udev - segger-jlink - ]; -} \ No newline at end of file diff --git a/hosts/dosei/services/avahi.nix b/hosts/dosei/services/avahi.nix deleted file mode 100644 index 9eba86f..0000000 --- a/hosts/dosei/services/avahi.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - services.avahi = { - enable = true; - publish.enable = true; - publish.addresses = true; - publish.domain = true; - publish.hinfo = true; - publish.userServices = true; - publish.workstation = true; - extraServiceFiles.ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service"; - }; -} diff --git a/hosts/dosei/services/docker.nix b/hosts/dosei/services/docker.nix deleted file mode 100644 index 24bd360..0000000 --- a/hosts/dosei/services/docker.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - virtualisation.docker.enable = true; -} diff --git a/hosts/dosei/services/jenkins.nix b/hosts/dosei/services/jenkins.nix deleted file mode 100644 index 79a3793..0000000 --- a/hosts/dosei/services/jenkins.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - services.jenkins = { - enable = true; - withCLI = true; - # extraJavaOptions = [ - # "-Dorg.jenkinsci.plugins.durabletask.BourneShellScript.LAUNCH_DIAGNOSTICS=true" - # ]; - packages = with pkgs; [ - stdenv - jdk17 - nix - docker - git - bashInteractive # 'sh' step requires this - coreutils - which - procps - ]; - }; - - users.groups.docker.members = [ "jenkins" ]; -} diff --git a/hosts/dosei/services/logiops.nix b/hosts/dosei/services/logiops.nix deleted file mode 100644 index b71c098..0000000 --- a/hosts/dosei/services/logiops.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ pkgs, ... }: -{ - # TODO: remove when merged: https://github.com/NixOS/nixpkgs/pull/167388 - systemd.services.logid = let - config = pkgs.writeText "logid.cfg" '' - devices: ( - { - name: "Wireless Mouse MX Master"; - smartshift: - { - on: true; - threshold: 30; - torque: 50; - }; - hiresscroll: - { - hires: true; - invert: false; - target: true; - up: { - mode: "Axis"; - axis: "REL_WHEEL_HI_RES"; - multiplier: 1; - }, - down: { - mode: "Axis"; - axis: "REL_WHEEL_HI_RES"; - multiplier: -1; - }, - }; - dpi: 800; - } - ); - ''; - in { - description = "Logitech Configuration Daemon"; - startLimitIntervalSec = 0; - wants = [ "multi-user.target" ]; - after = [ "multi-user.target" ]; - wantedBy = [ "graphical-session.target" ]; - - serviceConfig = { - Type = "simple"; - ExecStart = "${pkgs.logiops}/bin/logid --config ${config}"; - User = "root"; - ExecReload = "/bin/kill -HUP $MAINPID"; - Restart="on-failure"; - }; - }; - - hardware.logitech.wireless.enable = true; -} diff --git a/hosts/dosei/services/wstunnel.nix b/hosts/dosei/services/wstunnel.nix deleted file mode 100644 index 8937606..0000000 --- a/hosts/dosei/services/wstunnel.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ config, ... }: -{ - imports = [ - ../../../modules/wstunnel.nix - ]; - disabledModules = [ - "services/networking/wstunnel.nix" - ]; - - sops = { - secrets."wstunnel/http-upgrade-path-prefix" = { - sopsFile = ../../../secrets/common.yaml; - }; - templates."wstunnel-environment.env".content = let - inherit (config.sops) placeholder; - in '' - WSTUNNEL_HTTP_UPGRADE_PATH_PREFIX=${placeholder."wstunnel/http-upgrade-path-prefix"} - WSTUNNEL_RESTRICT_HTTP_UPGRADE_PATH_PREFIX=${placeholder."wstunnel/http-upgrade-path-prefix"} - ''; - }; - - services.wstunnel = { - enable = true; - clients."ws-tsuki" = { - connectTo = "wss://ws.nani.wtf"; - localToRemote = [ - "tcp://10022:localhost:22" - ]; - environmentFile = config.sops.templates."wstunnel-environment.env".path; - }; - }; -}