From 9ceec77160990655885e19dfad6f1d990f95c6c7 Mon Sep 17 00:00:00 2001 From: Madeleine Date: Tue, 31 Oct 2023 15:33:25 +0000 Subject: [PATCH] remove tau, not used anymore --- flake.nix | 14 ---------- systems/tau/android.nix | 5 ---- systems/tau/audio.nix | 14 ---------- systems/tau/bluetooth.nix | 6 ----- systems/tau/boot.nix | 6 ----- systems/tau/doas.nix | 13 ---------- systems/tau/firewall.nix | 6 ----- systems/tau/fonts.nix | 11 -------- systems/tau/gpg.nix | 9 ------- systems/tau/locale.nix | 13 ---------- systems/tau/networking.nix | 17 ------------ systems/tau/nix.nix | 16 ------------ systems/tau/nixos.nix | 6 ----- systems/tau/openrazer.nix | 9 ------- systems/tau/openrgb.nix | 8 ------ systems/tau/packages.nix | 47 ---------------------------------- systems/tau/security.nix | 6 ----- systems/tau/services.nix | 6 ----- systems/tau/ssh.nix | 13 ---------- systems/tau/syncthing.nix | 42 ------------------------------ systems/tau/systemd.nix | 8 ------ systems/tau/users.nix | 11 -------- systems/tau/virtualisation.nix | 6 ----- systems/tau/xorg.nix | 17 ------------ systems/tau/yubikey.nix | 22 ---------------- systems/tau/zsh.nix | 10 -------- 26 files changed, 341 deletions(-) delete mode 100644 systems/tau/android.nix delete mode 100644 systems/tau/audio.nix delete mode 100644 systems/tau/bluetooth.nix delete mode 100644 systems/tau/boot.nix delete mode 100644 systems/tau/doas.nix delete mode 100644 systems/tau/firewall.nix delete mode 100644 systems/tau/fonts.nix delete mode 100644 systems/tau/gpg.nix delete mode 100644 systems/tau/locale.nix delete mode 100644 systems/tau/networking.nix delete mode 100644 systems/tau/nix.nix delete mode 100644 systems/tau/nixos.nix delete mode 100644 systems/tau/openrazer.nix delete mode 100644 systems/tau/openrgb.nix delete mode 100644 systems/tau/packages.nix delete mode 100644 systems/tau/security.nix delete mode 100644 systems/tau/services.nix delete mode 100644 systems/tau/ssh.nix delete mode 100644 systems/tau/syncthing.nix delete mode 100644 systems/tau/systemd.nix delete mode 100644 systems/tau/users.nix delete mode 100644 systems/tau/virtualisation.nix delete mode 100644 systems/tau/xorg.nix delete mode 100644 systems/tau/yubikey.nix delete mode 100644 systems/tau/zsh.nix diff --git a/flake.nix b/flake.nix index be25c24..b4c24d7 100644 --- a/flake.nix +++ b/flake.nix @@ -57,20 +57,6 @@ ] ++ utils.nixFilesIn ./systems/mdesktop; }; - nixosConfigurations."tau" = nixpkgs.lib.nixosSystem - { - specialArgs = { inherit username; }; - pkgs = nixpkgs_aarch64_linux; - system = "aarch64-linux"; - modules = [ - home-manager.nixosModules.home-manager - { - home-manager.users.${username}.imports = utils.nixFilesIn ./maddie/common ++ utils.nixFilesIn ./maddie/nixos; - home-manager.extraSpecialArgs = { inherit username; pkgs = nixpkgs_aarch64_linux; }; - } - ] ++ utils.nixFilesIn ./systems/tau; - }; - darwinConfigurations."MMacBookPro" = darwin.lib.darwinSystem { pkgs = nixpkgs_aarch64_darwin; diff --git a/systems/tau/android.nix b/systems/tau/android.nix deleted file mode 100644 index b9fd5f2..0000000 --- a/systems/tau/android.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, ... }: - -{ - programs.adb.enable = true; -} diff --git a/systems/tau/audio.nix b/systems/tau/audio.nix deleted file mode 100644 index 329fa97..0000000 --- a/systems/tau/audio.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, ... }: - -{ - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - jack.enable = true; - }; -} diff --git a/systems/tau/bluetooth.nix b/systems/tau/bluetooth.nix deleted file mode 100644 index fae0e1d..0000000 --- a/systems/tau/bluetooth.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, ... }: - -{ - hardware.bluetooth.enable = true; - services.blueman.enable = true; -} diff --git a/systems/tau/boot.nix b/systems/tau/boot.nix deleted file mode 100644 index 5bb22a9..0000000 --- a/systems/tau/boot.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, ... }: - -{ - boot.loader.grub.enable = false; - boot.loader.generic-extlinux-compatible.enable = true; -} diff --git a/systems/tau/doas.nix b/systems/tau/doas.nix deleted file mode 100644 index 6aa5f72..0000000 --- a/systems/tau/doas.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, username, ... }: - -{ - security.sudo.enable = false; - security.doas = { - enable = true; - extraRules = [{ - users = [ "${username}" ]; - keepEnv = true; - persist = true; - }]; - }; -} diff --git a/systems/tau/firewall.nix b/systems/tau/firewall.nix deleted file mode 100644 index 1abda33..0000000 --- a/systems/tau/firewall.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, ... }: - -{ - # Disable the firewall altogether - networking.firewall.enable = false; -} diff --git a/systems/tau/fonts.nix b/systems/tau/fonts.nix deleted file mode 100644 index 692832b..0000000 --- a/systems/tau/fonts.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, pkgs, ... }: - -{ - fonts.fonts = with pkgs; [ - nerdfonts - font-awesome - source-han-sans - source-han-serif - source-han-code-jp - ]; -} diff --git a/systems/tau/gpg.nix b/systems/tau/gpg.nix deleted file mode 100644 index 8ce0a92..0000000 --- a/systems/tau/gpg.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, ... }: - -{ - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - pinentryFlavor = "gtk2"; - }; -} diff --git a/systems/tau/locale.nix b/systems/tau/locale.nix deleted file mode 100644 index 1c7fd22..0000000 --- a/systems/tau/locale.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, ... }: - -{ - # Time zone - time.timeZone = "Europe/London"; - - # Internationalisation properties - i18n.defaultLocale = "en_GB.UTF-8"; - console = { - font = "Lat2-Terminus16"; - keyMap = "uk"; - }; -} diff --git a/systems/tau/networking.nix b/systems/tau/networking.nix deleted file mode 100644 index 85b594d..0000000 --- a/systems/tau/networking.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ config, lib, ... }: - -{ - # DHCP - networking.useDHCP = lib.mkDefault true; - - # Hostname - networking.hostName = "tau"; - - # Enable wireless support & configuration - networking.wireless.enable = true; - networking.wireless.networks = { - "BT-C5CPMR_5GEXT" = { - psk = "hN3LtFrkp36bXc"; - }; - }; -} diff --git a/systems/tau/nix.nix b/systems/tau/nix.nix deleted file mode 100644 index 533f7e9..0000000 --- a/systems/tau/nix.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, pkgs, ... }: - -{ - # Enable flakes and nix-command - nix = { - package = pkgs.nixVersions.stable; - settings = { - experimental-features = [ "nix-command" "flakes" ]; - auto-optimise-store = true; - }; - gc = { - automatic = true; - options = "--delete-older-than 7d"; - }; - }; -} diff --git a/systems/tau/nixos.nix b/systems/tau/nixos.nix deleted file mode 100644 index 8488a9a..0000000 --- a/systems/tau/nixos.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, lib, ... }: - -{ - system.stateVersion = "23.05"; - nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; -} diff --git a/systems/tau/openrazer.nix b/systems/tau/openrazer.nix deleted file mode 100644 index 4175987..0000000 --- a/systems/tau/openrazer.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, username, ... }: - -{ - hardware.openrazer = { - enable = true; - users = [ "${username}" ]; - devicesOffOnScreensaver = false; - }; -} diff --git a/systems/tau/openrgb.nix b/systems/tau/openrgb.nix deleted file mode 100644 index d112498..0000000 --- a/systems/tau/openrgb.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, pkgs, ... }: - -{ - services.hardware.openrgb = { - enable = true; - package = pkgs.openrgb-with-all-plugins; - }; -} diff --git a/systems/tau/packages.nix b/systems/tau/packages.nix deleted file mode 100644 index 23c9665..0000000 --- a/systems/tau/packages.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ config, pkgs, ... }: - -{ - # System-wide packages - # I want these available for all users at all times - environment.systemPackages = with pkgs; [ - # Xorg packages - xorg.xinit - xorg.xkill - xorg.xprop - xorg.xwininfo - xorg.xrandr - xdotool - xclip - - # Processes - killall - appimage-run - - # Filesystems - dosfstools - btrfs-progs - ntfs3g - exfatprogs - libimobiledevice - ifuse - - # Archives - zip - unrar - unzip - p7zip - - # Cli tools - ripgrep - wget - fzf - bat - - # XDG - xdg-utils - xdg-user-dirs - - # Git - git - ]; -} diff --git a/systems/tau/security.nix b/systems/tau/security.nix deleted file mode 100644 index 65a4e9a..0000000 --- a/systems/tau/security.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, pkgs, ... }: - -{ - programs.slock.enable = true; - security.wrappers.slock.source = "${pkgs.slock.out}/bin/slock"; -} diff --git a/systems/tau/services.nix b/systems/tau/services.nix deleted file mode 100644 index 291c999..0000000 --- a/systems/tau/services.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, ... }: - -{ - # Misc services - services.usbmuxd.enable = true; -} diff --git a/systems/tau/ssh.nix b/systems/tau/ssh.nix deleted file mode 100644 index 613102e..0000000 --- a/systems/tau/ssh.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, ... }: - -{ - services.openssh = { - enable = true; - settings = { - PermitRootLogin = "no"; - PasswordAuthentication = false; - KbdInteractiveAuthentication = false; - }; - }; - programs.ssh.hostKeyAlgorithms = [ "sk-ssh-ed25519@openssh.com" "ssh-ed25519" ]; -} diff --git a/systems/tau/syncthing.nix b/systems/tau/syncthing.nix deleted file mode 100644 index fdeaccb..0000000 --- a/systems/tau/syncthing.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ config, username, ... }: - -{ - services.syncthing = { - enable = true; - user = "${username}"; - group = "users"; - dataDir = "/home/${username}"; - configDir = "/home/${username}/.config/syncthing"; - guiAddress = "0.0.0.0:8384"; - overrideFolders = true; - overrideDevices = true; - devices = { - "M.Phone.Pixel" = { id = "WMGWVOU-DFZQSZO-46XQJQA-Q5XD5ZB-NDXK5SP-LXNAADH-Z2KJN4P-4P4UXA5"; }; - "M.MacBookPro" = { id = "A5HRCSI-RWYZ6GG-SCBZ2OJ-PG6T7VP-WKDN2VP-CNXIQ3B-VCJ7ZHO-MTV63QP"; }; - "Lambda" = { id = "ZYNSFWR-F3ZNDDT-66TSJWB-PRP3KQK-IWTTABU-GGWT5DL-RWC7VAE-LI5AXQQ"; }; - }; - folders = { - "Documents" = { - path = "/home/${username}/Documents"; - devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; - }; - "Pictures" = { - path = "/home/${username}/Pictures"; - devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; - }; - "Videos" = { - path = "/home/${username}/Videos"; - devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; - }; - "Music" = { - path = "/home/${username}/Music"; - devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; - }; - "Android Camera" = { - id = "pixel_7_pro_2qyx-photos"; - path = "/home/${username}/Pictures/DCIM"; - devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; - }; - }; - }; -} diff --git a/systems/tau/systemd.nix b/systems/tau/systemd.nix deleted file mode 100644 index 93db17e..0000000 --- a/systems/tau/systemd.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, ... }: - -{ - # Stop systemd from hanging for ages - systemd.extraConfig = '' - DefaultTimeoutStopSec=10s - ''; -} diff --git a/systems/tau/users.nix b/systems/tau/users.nix deleted file mode 100644 index 2e29887..0000000 --- a/systems/tau/users.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, pkgs, username, ... }: - -{ - users.users.${username} = { - isNormalUser = true; - shell = pkgs.zsh; - description = "Madeleine"; - extraGroups = [ "adbusers" "dialout" "libvirtd" "plugdev" ]; - openssh.authorizedKeys.keyFiles = [ ../../maddie/common/ssh/id_ed25519_sk.pub ]; - }; -} diff --git a/systems/tau/virtualisation.nix b/systems/tau/virtualisation.nix deleted file mode 100644 index dad25d2..0000000 --- a/systems/tau/virtualisation.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, ... }: - -{ - virtualisation.libvirtd.enable = true; - programs.dconf.enable = true; -} diff --git a/systems/tau/xorg.nix b/systems/tau/xorg.nix deleted file mode 100644 index f8389c2..0000000 --- a/systems/tau/xorg.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ config, pkgs, ... }: - -{ - services.xserver = { - # Enable X11 windowing system - enable = true; - - # Set gb X11 keymap - layout = "gb"; - xkbOptions = "eurosign:e"; - - # Use startx for starting window managers - displayManager = { - startx.enable = true; - }; - }; -} diff --git a/systems/tau/yubikey.nix b/systems/tau/yubikey.nix deleted file mode 100644 index 32d847a..0000000 --- a/systems/tau/yubikey.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, pkgs, ... }: - -{ - services.pcscd.enable = true; - services.udev.packages = [ pkgs.yubikey-personalization pkgs.android-udev-rules ]; - security.pam = { - services = { - login.u2fAuth = true; - doas.u2fAuth = true; - }; - yubico = { - enable = true; - mode = "challenge-response"; - control = "optional"; - }; - }; - - /* environment.systemPackages = with pkgs; [ */ - /* yubioath-flutter */ - /* yubikey-personalization */ - /* ]; */ -} diff --git a/systems/tau/zsh.nix b/systems/tau/zsh.nix deleted file mode 100644 index 3aab6fb..0000000 --- a/systems/tau/zsh.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, pkgs, ... }: - -{ - programs.zsh = { - enable = true; - autosuggestions.enable = true; - syntaxHighlighting.enable = true; - }; - users.defaultUserShell = pkgs.zsh; -}