From d52929052ee7099945495737edd608178b832f5c Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Fri, 18 Oct 2024 15:44:19 -0400 Subject: [PATCH] tree-wide: drop petalburg (#129) * github: remove petalburg build * flake, hosts: drop petalburg * secrets: drop petalburg * aly/syncthing: drop petalburg * aly/openssh: drop petalburg * users: drop petalburg * hwModules: drop yoga 9i --- .github/workflows/nix-build.yml | 16 ---- flake.nix | 2 - hosts/petalburg/README.md | 25 ----- hosts/petalburg/default.nix | 94 ------------------- hosts/petalburg/home.nix | 62 ------------ hosts/petalburg/secrets.nix | 6 -- hosts/petalburg/stylix.nix | 50 ---------- hwModules/lenovo/yoga-9i/common.nix | 3 - .../lenovo/yoga-9i/intel-13th/default.nix | 23 ----- secrets/publicKeys/aly_petalburg.pub | 1 - secrets/publicKeys/root_petalburg.pub | 1 - secrets/secrets.nix | 4 - userModules/aly/default.nix | 1 - userModules/aly/syncthing.nix | 7 +- userModules/default.nix | 1 - 15 files changed, 3 insertions(+), 293 deletions(-) delete mode 100644 hosts/petalburg/README.md delete mode 100644 hosts/petalburg/default.nix delete mode 100644 hosts/petalburg/home.nix delete mode 100644 hosts/petalburg/secrets.nix delete mode 100644 hosts/petalburg/stylix.nix delete mode 100644 hwModules/lenovo/yoga-9i/common.nix delete mode 100644 hwModules/lenovo/yoga-9i/intel-13th/default.nix delete mode 100644 secrets/publicKeys/aly_petalburg.pub delete mode 100644 secrets/publicKeys/root_petalburg.pub diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml index c2856446..8fe74274 100644 --- a/.github/workflows/nix-build.yml +++ b/.github/workflows/nix-build.yml @@ -86,22 +86,6 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Build pacifidlog run: nix build --accept-flake-config .#nixosConfigurations.pacifidlog.config.system.build.toplevel - petalburg-build: - runs-on: ubuntu-latest - steps: - - name: Free Disk Space (Ubuntu) - uses: jlumbroso/free-disk-space@main - - uses: actions/checkout@main - with: - fetch-depth: 1 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main - - uses: cachix/cachix-action@master - with: - name: alyraffauf - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - name: Build petalburg - run: nix build --accept-flake-config .#nixosConfigurations.petalburg.config.system.build.toplevel rustboro-build: runs-on: ubuntu-latest steps: diff --git a/flake.nix b/flake.nix index d13dd45d..61254eb1 100644 --- a/flake.nix +++ b/flake.nix @@ -100,7 +100,6 @@ "lavaridge" "mauville" "pacifidlog" - "petalburg" "rustboro" "slateport" ]; @@ -165,7 +164,6 @@ hw-framework-13-amd-7000 = import ./hwModules/framework/13/amd-7000; hw-framework-13-intel-11th = import ./hwModules/framework/13/intel-11th; hw-lenovo-legion-go = import ./hwModules/lenovo/legion/go; - hw-lenovo-yoga-9i-intel-13th = import ./hwModules/lenovo/yoga-9i/intel-13th; hw-thinkpad-t440p = import ./hwModules/thinkpad/t440p; nixos = import ./nixosModules self; diff --git a/hosts/petalburg/README.md b/hosts/petalburg/README.md deleted file mode 100644 index 4d416f87..00000000 --- a/hosts/petalburg/README.md +++ /dev/null @@ -1,25 +0,0 @@ -# petalburg - -## Overview - -Lenovo Yoga 9i 2023. Secondary convertible mainly used for media, light dev work, and anything that might use a stylus or touch screen. - -## Specs - -| Model | Lenovo Yoga 9i Gen 8 | -|---------|----------------------------------------| -| Display | 14" 2880x1800 90hz OLED | -| CPU | Intel Core i7-1360P | -| RAM | 16GB (8GBx2) LPDDR5-5200Mhz (soldered) | -| GPU | Intel Iris Xe Graphics | -| Disks | 512GB M.2 PCIe 4.0 | - -## Filesystems - -### / - -Encrypted LUKS btrfs volume. - -## Display - -Scales perfectly at 2x. diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix deleted file mode 100644 index 5306986c..00000000 --- a/hosts/petalburg/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -# Lenovo Yoga 9i Convertible with Intel Core i7-1360P, 16GB RAM, 512GB SSD. -{ - config, - lib, - self, - ... -}: { - imports = [ - ./home.nix - ./secrets.nix - ./stylix.nix - (import ./../../disko/luks-btrfs-subvolumes.nix {disks = ["/dev/nvme0n1"];}) - self.nixosModules.common-auto-upgrade - self.nixosModules.common-base - self.nixosModules.common-locale - self.nixosModules.common-mauville-share - self.nixosModules.common-nix - self.nixosModules.common-overlays - self.nixosModules.common-pkgs - self.nixosModules.common-tailscale - self.nixosModules.common-wifi-profiles - self.nixosModules.hw-lenovo-yoga-9i-intel-13th - ]; - - boot = { - initrd.systemd.enable = true; - extraModulePackages = with config.boot.kernelPackages; [acpi_call]; - - lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - }; - - loader = { - efi.canTouchEfiVariables = true; - systemd-boot.enable = lib.mkForce false; - }; - }; - - environment.variables.GDK_SCALE = "2"; - networking.hostName = "petalburg"; - - nixpkgs.overlays = [ - (final: prev: { - brave = prev.brave.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";}; - - obsidian = prev.obsidian.overrideAttrs (old: { - installPhase = - builtins.replaceStrings ["--ozone-platform=wayland"] - ["--ozone-platform=wayland --enable-wayland-ime"] - old.installPhase; - }); - - vscodium = prev.vscodium.override {commandLineArgs = "--enable-wayland-ime";}; - - webcord = prev.webcord.overrideAttrs (old: { - installPhase = - builtins.replaceStrings ["--ozone-platform-hint=auto"] - ["--ozone-platform-hint=auto --enable-wayland-ime"] - old.installPhase; - }); - }) - ]; - - system.stateVersion = "24.05"; - - ar = { - apps = { - firefox.enable = true; - podman.enable = true; - steam.enable = true; - }; - - desktop = { - greetd.enable = true; - hyprland.enable = true; - sway.enable = true; - }; - - laptopMode = true; - - services.flatpak.enable = true; - - users.aly = { - enable = true; - password = "$y$j9T$TitXX3J690cnK41XciNMg/$APKHM/os6FKd9H9aXGxaHaQ8zP5SenO9EO94VYafl43"; - syncthing = { - enable = true; - certFile = config.age.secrets.syncthingCert.path; - keyFile = config.age.secrets.syncthingKey.path; - }; - }; - }; -} diff --git a/hosts/petalburg/home.nix b/hosts/petalburg/home.nix deleted file mode 100644 index 6f44a188..00000000 --- a/hosts/petalburg/home.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - pkgs, - self, - ... -}: { - home-manager = { - sharedModules = [ - { - wayland.windowManager = { - hyprland.settings = { - bind = [ - ",xf86launch2,exec,${lib.getExe pkgs.playerctl} play-pause" - ]; - - exec-once = [''${ - lib.getExe self.inputs.iio-hyprland.packages.${pkgs.system}.default - } "desc:Samsung Display Corp. 0x4152"'']; - - input = { - tablet.output = "eDP-1"; - touchdevice.output = "eDP-1"; - }; - }; - - sway.config = { - input = { - "1386:21186:Wacom_HID_52C2_Finger" = { - map_to_output = "'Samsung Display Corp. 0x4152 Unknown'"; - }; - - "1386:21186:Wacom_HID_52C2_Pen" = { - map_to_output = "'Samsung Display Corp. 0x4152 Unknown'"; - }; - }; - - keybindings = { - "XF86Launch2" = "exec ${lib.getExe pkgs.playerctl} play-pause"; - }; - - output = {"Samsung Display Corp. 0x4152 Unknown".scale = "2.0";}; - }; - }; - - ar.home = { - desktop.hyprland = { - laptopMonitors = ["desc:Samsung Display Corp. 0x4152,preferred,auto,2,transform,0"]; - - tabletMode = { - enable = true; - switches = ["Lenovo Yoga Tablet Mode Control switch"]; - }; - }; - - services.gammastep.enable = true; - }; - } - ]; - - users.aly = self.homeManagerModules.aly; - }; -} diff --git a/hosts/petalburg/secrets.nix b/hosts/petalburg/secrets.nix deleted file mode 100644 index cc7459e1..00000000 --- a/hosts/petalburg/secrets.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - age.secrets = { - syncthingCert.file = ../../secrets/aly/syncthing/petalburg/cert.age; - syncthingKey.file = ../../secrets/aly/syncthing/petalburg/key.age; - }; -} diff --git a/hosts/petalburg/stylix.nix b/hosts/petalburg/stylix.nix deleted file mode 100644 index 61bedf74..00000000 --- a/hosts/petalburg/stylix.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - pkgs, - self, - ... -}: { - stylix = { - enable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; - image = "${self.inputs.wallpapers}/wallhaven-3lyrvy.png"; - imageScalingMode = "fill"; - polarity = "dark"; - - cursor = { - name = "Bibata-Modern-Classic"; - package = pkgs.bibata-cursors; - size = 24; - }; - - fonts = { - monospace = { - name = "CaskaydiaCove Nerd Font"; - package = pkgs.nerdfonts.override {fonts = ["CascadiaCode"];}; - }; - - sansSerif = { - name = "UbuntuSans Nerd Font"; - package = pkgs.nerdfonts.override {fonts = ["UbuntuSans"];}; - }; - - serif = { - name = "Source Serif Pro"; - package = pkgs.source-serif-pro; - }; - - sizes = { - applications = 11; - desktop = 10; - popups = 11; - terminal = 12; - }; - }; - - opacity = { - applications = 1.0; - desktop = 0.8; - terminal = 0.8; - popups = 0.8; - }; - }; -} diff --git a/hwModules/lenovo/yoga-9i/common.nix b/hwModules/lenovo/yoga-9i/common.nix deleted file mode 100644 index 4562e269..00000000 --- a/hwModules/lenovo/yoga-9i/common.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - hardware.sensor.iio.enable = true; -} diff --git a/hwModules/lenovo/yoga-9i/intel-13th/default.nix b/hwModules/lenovo/yoga-9i/intel-13th/default.nix deleted file mode 100644 index 5d2e827d..00000000 --- a/hwModules/lenovo/yoga-9i/intel-13th/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - lib, - pkgs, - self, - ... -}: { - imports = [ - ../common.nix - self.nixosModules.hw-common-bluetooth - self.nixosModules.hw-common-intel-cpu - self.nixosModules.hw-common-intel-gpu - self.nixosModules.hw-common-laptop - self.nixosModules.hw-common-laptop-intel-cpu - self.nixosModules.hw-common-ssd - ]; - - boot = { - initrd.availableKernelModules = ["nvme" "sd_mod" "thunderbolt" "usb_storage" "xhci_pci"]; - kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; - }; - - hardware.enableAllFirmware = true; -} diff --git a/secrets/publicKeys/aly_petalburg.pub b/secrets/publicKeys/aly_petalburg.pub deleted file mode 100644 index fefea511..00000000 --- a/secrets/publicKeys/aly_petalburg.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJBK+QkM3C98BxnJtcEOuxjT7bbUG8gsUafrzW9uKuxz aly@petalburg \ No newline at end of file diff --git a/secrets/publicKeys/root_petalburg.pub b/secrets/publicKeys/root_petalburg.pub deleted file mode 100644 index 2775c311..00000000 --- a/secrets/publicKeys/root_petalburg.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHjcWpeYMjNaICoHwedu3tBt7/5tKxXQHCKaUx4ez4jm root@petalburg diff --git a/secrets/secrets.nix b/secrets/secrets.nix index a0f2e7a6..52e56436 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -4,7 +4,6 @@ let "lavaridge" "mauville" "pacifidlog" - "petalburg" "rustboro" "slateport" ]; @@ -13,7 +12,6 @@ let "aly_lavaridge" "aly_mauville" "aly_pacifidlog" - "aly_petalburg" "aly_rustboro" "aly_slateport" ]; @@ -33,8 +31,6 @@ in { "aly/syncthing/mauville/key.age".publicKeys = keys; "aly/syncthing/pacifidlog/cert.age".publicKeys = keys; "aly/syncthing/pacifidlog/key.age".publicKeys = keys; - "aly/syncthing/petalburg/cert.age".publicKeys = keys; - "aly/syncthing/petalburg/key.age".publicKeys = keys; "aly/syncthing/rustboro/cert.age".publicKeys = keys; "aly/syncthing/rustboro/key.age".publicKeys = keys; "aly/syncthing/slateport/cert.age".publicKeys = keys; diff --git a/userModules/aly/default.nix b/userModules/aly/default.nix index 37fd714c..ab024300 100644 --- a/userModules/aly/default.nix +++ b/userModules/aly/default.nix @@ -21,7 +21,6 @@ keyFiles = [ ../../secrets/publicKeys/aly_lavaridge.pub ../../secrets/publicKeys/aly_mauville.pub - ../../secrets/publicKeys/aly_petalburg.pub ../../secrets/publicKeys/aly_rustboro.pub ]; }; diff --git a/userModules/aly/syncthing.nix b/userModules/aly/syncthing.nix index 3cca2498..af839c49 100644 --- a/userModules/aly/syncthing.nix +++ b/userModules/aly/syncthing.nix @@ -31,7 +31,6 @@ in { "mauville" = {id = "52MTCMC-PKEWSAU-HADMTZU-DY5EKFO-B323P7V-OBXLNTQ-EJY7F7Y-EUWFBQX";}; # Desktop/homelab "norman" = {id = "IVFUFD4-LUQMX5V-FMUZQD2-EP6GOGQ-LPGYF5M-GFQDTNL-DVNQEA7-WWSWEQL";}; # Pixel 8a "pacifidlog" = {id = "6EBVXYI-HZW4LQI-T6L3TTI-DZEBXJM-RP3DW7N-BCAG6FC-G2654DN-XJFSLQD";}; # Lenovo Legion Go - "petalburg" = {id = "ECTD3LW-YZTJIXX-HLQYXT7-UGZSGST-3DDKF72-DJPMDHE-SUYDWIT-ASTKTAE";}; # Yoga 9i "rustboro" = {id = "7CXGPQN-7DYDYJN-DKELOR3-RD4HZUW-SSUDGLZ-WVXYFUT-DPT2MGD-6PO5BQF";}; # Thinkpad t440p "slateport" = {id = "MDJFDUG-UJAXQXI-AMEF2AR-PBMD5QK-Z5ZG6AA-RCJCU3M-GZHQQEA-X2JGOAK";}; # homelab "winona" = {id = "IGAW5SS-WY2QN6J-5TF74YZ-6XPNPTC-RCH3HIT-ZZQKCAI-6L54IS2-SNRIMA2";}; # Pixel Tablet @@ -42,7 +41,7 @@ in { "sync" = { id = "default"; path = "/home/aly/sync"; - devices = ["fallarbor" "gsgmba" "iphone12" "lavaridge" "mauville" "norman" "pacifidlog" "petalburg" "rustboro" "slateport" "winona"]; + devices = ["fallarbor" "gsgmba" "iphone12" "lavaridge" "mauville" "norman" "pacifidlog" "rustboro" "slateport" "winona"]; versioning = { type = "staggered"; params = { @@ -55,7 +54,7 @@ in { "screenshots" = { id = "screenshots"; path = "/home/aly/pics/screenshots"; - devices = ["fallarbor" "lavaridge" "mauville" "norman" "petalburg" "rustboro" "slateport" "winona"]; + devices = ["fallarbor" "lavaridge" "mauville" "norman" "rustboro" "slateport" "winona"]; versioning = { params.cleanoutDays = "5"; type = "trashcan"; @@ -66,7 +65,7 @@ in { "music" = { id = "6nzmu-z9der"; path = config.ar.users.aly.syncthing.musicPath; - devices = ["lavaridge" "mauville" "petalburg" "rustboro"]; + devices = ["lavaridge" "mauville" "rustboro"]; }; }; }; diff --git a/userModules/default.nix b/userModules/default.nix index f355932c..f90a036b 100644 --- a/userModules/default.nix +++ b/userModules/default.nix @@ -14,7 +14,6 @@ self: { "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGcJBb7+ZxkDdk06A0csNsbgT9kARUN185M8k3Lq7E/d u0_a336@localhost" # termux on winona (builtins.readFile ../secrets/publicKeys/aly_lavaridge.pub) (builtins.readFile ../secrets/publicKeys/aly_mauville.pub) - (builtins.readFile ../secrets/publicKeys/aly_petalburg.pub) (builtins.readFile ../secrets/publicKeys/aly_rustboro.pub) ]; };