From 10f11ec042ab468821274636d438f84781cb2408 Mon Sep 17 00:00:00 2001
From: Caroline Larimore <caroline@larimo.re>
Date: Tue, 4 Feb 2025 18:50:11 -0800
Subject: migration: desktop role

---
 roles/desktop/default.nix | 78 -----------------------------------------------
 roles/desktop/input.nix   | 37 ----------------------
 roles/desktop/xserver.nix | 18 -----------
 3 files changed, 133 deletions(-)
 delete mode 100644 roles/desktop/default.nix
 delete mode 100644 roles/desktop/input.nix
 delete mode 100644 roles/desktop/xserver.nix

(limited to 'roles/desktop')

diff --git a/roles/desktop/default.nix b/roles/desktop/default.nix
deleted file mode 100644
index 7acd1d8..0000000
--- a/roles/desktop/default.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{ config, pkgs, lib, ... }:
-with lib;
-
-let cfg = config.roles.desktop; in {
-  imports = [
-    ./input.nix
-    ./xserver.nix
-  ];
-
-  options.roles.desktop = {
-    enable = mkEnableOption "desktop";
-
-    videoDrivers = mkOption {
-      type = types.listOf types.str;
-      default = [ "modesetting" "fbdev" ];
-    };
-    
-    setupCommands = mkOption {
-      type = types.lines;
-      default = "";
-      description = ''
-        Shell commands executed just after the X server has started.
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      pulseaudio
-      playerctl
-    ];
-
-    security.rtkit.enable = true;
-
-    i18n.inputMethod.enable = true;
-
-    services = {
-      displayManager.enable = true;
-
-      xserver = {
-        enable = true;
-        displayManager.lightdm.enable = true;
-        windowManager.i3.enable = true;
-      };
-      
-      libinput.enable = true;
-      keyd.enable = true;
-
-      pipewire = {
-        enable = true;
-
-        pulse.enable = true;
-        alsa.enable = true;
-        alsa.support32Bit = true;
-        #jack.enable = true;
-      };
-    };
-
-    fonts = {
-      packages = with pkgs; [
-        noto-fonts
-        noto-fonts-cjk-sans
-        noto-fonts-cjk-serif
-        noto-fonts-emoji
-
-        minecraftia
-      ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
-
-      fontconfig = {
-        defaultFonts = {
-          monospace = [ "CaskaydiaMono Nerd Font" ];
-          sansSerif = [ "DejaVu Sans" "Noto Sans CJK JP" "Noto Sans" ];
-          serif = [ "DejaVu Serif" "Noto Serif CJK JP" "Noto Serif" ];
-        };
-      };
-    };
-  };
-}
diff --git a/roles/desktop/input.nix b/roles/desktop/input.nix
deleted file mode 100644
index c0a722f..0000000
--- a/roles/desktop/input.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ pkgs, ... }:
-
-{
-  services = {
-    libinput = {
-      touchpad.naturalScrolling = true;
-    };
-
-    keyd = {
-      keyboards."*".settings = {
-        main = {
-          # Swap alt and meta keys.
-          # I prefer (physical) alt as my WM modifier key because it
-          #   is easier to reach. This can collide with some programs
-          #   shortcuts if they inlcude alt. Swapping alt and meta fixes
-          #   this by making my WM mod key (software) meta, freeing up alt.
-
-          leftalt = "leftmeta";
-          leftmeta = "leftalt";
-
-          rightalt = "rightmeta";
-          rightmeta = "rightalt";
-        };
-      };
-    };
-  };
-
-  i18n.inputMethod = {
-    type = "fcitx5";
-    fcitx5.addons = with pkgs; [ fcitx5-mozc ];
-  };
-
-  environment.variables = {
-    # Required for fcitx5 support in kitty
-    GLFW_IM_MODULE = "ibus";
-  };
-}
diff --git a/roles/desktop/xserver.nix b/roles/desktop/xserver.nix
deleted file mode 100644
index 4d6a876..0000000
--- a/roles/desktop/xserver.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  services.displayManager = {
-    defaultSession = "none+i3";
-  };
-
-  services.xserver = {
-    videoDrivers = config.roles.desktop.videoDrivers;
-
-    displayManager = {
-      setupCommands = config.roles.desktop.setupCommands;
-    };
-
-    xkb.layout = "us";
-#    xkb.options = "eurosign:e,caps:escape";
-  };
-}
-- 
cgit v1.2.3