Add thablet stuff

flake.nix

@@ -117,15 +117,11 @@
     in {
       base = base;
       nixos = base; # alias
-      dragon = mkNixosSystem "x86_64-linux" [./nixos/dragon] (with outputs.homeManagerModules; [
+      thablet = mkNixosSystem "x86_64-linux" [./nixos/thablet] [outputs.homeManagerModules.base];
-        dragon
+      thinker = mkNixosSystem "x86_64-linux" [./nixos/thinker] [outputs.homeManagerModules.thinker];
-      ]);
+      foxtrot = mkNixosSystem "x86_64-linux" [./nixos/foxtrot] [
-      thinker = mkNixosSystem "x86_64-linux" [./nixos/thinker] (with outputs.homeManagerModules; [
+        outputs.homeManagerModules.foxtrot
-        thinker
+      ];
-      ]);
-      foxtrot = mkNixosSystem "x86_64-linux" [./nixos/foxtrot] (with outputs.homeManagerModules; [
-        foxtrot
-      ]);
       beefcake =
         mkNixosSystem "x86_64-linux" [
           inputs.api-lyte-dev.nixosModules.x86_64-linux.api-lyte-dev
@@ -133,15 +129,11 @@
         ] (with outputs.homeManagerModules; [
           linux
         ]);
-      rascal = mkNixosSystem "x86_64-linux" [./nixos/rascal] (with outputs.homeManagerModules; [
+      rascal = mkNixosSystem "x86_64-linux" [./nixos/rascal] [
-        linux
+        outputs.homeManagerModules.linux
-      ]);
+      ];
-      musicbox = mkNixosSystem "x86_64-linux" [./nixos/musicbox] (with outputs.homeManagerModules; [
+      musicbox = mkNixosSystem "x86_64-linux" [./nixos/musicbox] [outputs.homeManagerModules.sway];
-        sway
+      router = mkNixosSystem "x86_64-linux" [./nixos/router] [outputs.homeManagerModules.common];
-      ]);
-      router = mkNixosSystem "x86_64-linux" [./nixos/router] (with outputs.homeManagerModules; [
-        common
-      ]);
     };
 
     # Standalone home-manager configuration entrypoint

modules/nixos/default.nix

@@ -14,5 +14,6 @@
   hyprland = import ./hyprland.nix;
   user-installed-applications = import ./user-installed-applications.nix;
   wifi = import ./wifi.nix;
+  gnome = import ./gnome.nix;
   kde-connect = import ./kde-connect.nix;
 }

modules/nixos/gnome.nix

@@ -0,0 +1,74 @@
+{pkgs, ...}: {
+  imports = [./pipewire.nix];
+
+  services.xserver.enable = true;
+  services.xserver.displayManager.gdm = {
+    enable = true;
+  };
+
+  hardware.pulseaudio.enable = false;
+
+  services.xserver.desktopManager.gnome = {
+    enable = true;
+  };
+
+  programs.gnupg.agent = {
+    enable = true;
+    pinentryFlavor = "gnome3";
+    enableSSHSupport = true;
+  };
+
+  xdg.portal = {
+    enable = true;
+  };
+
+  services.dbus.enable = true;
+
+  services.gvfs = {
+    enable = true;
+  };
+
+  environment = {
+    variables = {
+      GTK_THEME = "Catppuccin-Mocha-Compact-Sapphire-Dark";
+      VISUAL = "hx";
+      PAGER = "less";
+      MANPAGER = "less";
+    };
+
+    systemPackages = with pkgs; [
+      brightnessctl
+      feh
+      # gimp
+      grim
+      # inkscape
+      # krita
+      libinput
+      libinput-gestures
+      libnotify
+      # lutris
+      # nil
+      # nixpkgs-fmt
+      noto-fonts
+      pamixer
+      # pavucontrol
+      playerctl
+      # pulseaudio
+      pulsemixer
+      # rclone
+      # restic
+      slurp
+      # steam
+      swaybg
+      swayidle
+      swaylock
+      # vlc
+      # vulkan-tools
+      waybar
+      # weechat
+      # wine
+      wl-clipboard
+      zathura
+    ];
+  };
+}

modules/nixos/sway.nix

@@ -21,7 +21,6 @@
 
     extraPortals = with pkgs; [
       xdg-desktop-portal-wlr
-      xdg-desktop-portal-gtk
     ];
   };
 

nixos/thablet/default.nix

@@ -0,0 +1,79 @@
+{
+  flake,
+  inputs,
+  outputs,
+  lib,
+  config,
+  modulesPath,
+  ...
+}: {
+  imports =
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
+      inputs.disko.nixosModules.disko
+      flake.diskoConfigurations.standard
+      inputs.hardware.nixosModules.lenovo-thinkpad-x1-yoga
+    ]
+    ++ (with outputs.nixosModules; [
+      desktop-usage
+      gnome
+      wifi
+    ]);
+
+  nixpkgs = {
+    overlays = [
+      outputs.overlays.additions
+      outputs.overlays.modifications
+      outputs.overlays.unstable-packages
+    ];
+    config = {
+      allowUnfree = true;
+    };
+  };
+
+  nix = {
+    registry = lib.mapAttrs (_: value: {flake = value;}) inputs;
+    nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
+
+    settings = {
+      experimental-features = "nix-command flakes";
+      auto-optimise-store = true;
+    };
+  };
+
+  # not necessarily "base", but all my machines are UEFI so...
+  boot.loader.systemd-boot.enable = true;
+
+  services.fprintd = {
+    enable = true;
+    # tod.enable = true;
+    # tod.driver = pkgs.libfprint-2-tod1-goodix;
+  };
+
+  environment.systemPackages =
+    #with pkgs;
+    [];
+
+  programs.steam.enable = true;
+  programs.steam.remotePlay.openFirewall = true;
+
+  networking = {
+    firewall = {
+      enable = true;
+      allowPing = true;
+      allowedTCPPorts = [22];
+      allowedUDPPorts = [];
+    };
+  };
+
+  boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];
+
+  networking.useDHCP = lib.mkDefault true;
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  system.stateVersion = "23.11";
+}