From 65174b4b5c05bb143e6681a4cbcd0a95f04987e2 Mon Sep 17 00:00:00 2001
From: Caroline Larimore <caroline@larimo.re>
Date: Thu, 18 Jul 2024 23:39:42 -0700
Subject: Begin modularization!

---
 system/default.nix    | 11 -----------
 system/fonts.nix      | 24 ------------------------
 system/keyboard.nix   | 34 ----------------------------------
 system/networking.nix | 27 ---------------------------
 system/pipewire.nix   | 13 -------------
 system/xserver.nix    | 37 -------------------------------------
 6 files changed, 146 deletions(-)
 delete mode 100644 system/default.nix
 delete mode 100644 system/fonts.nix
 delete mode 100644 system/keyboard.nix
 delete mode 100644 system/networking.nix
 delete mode 100644 system/pipewire.nix
 delete mode 100644 system/xserver.nix

(limited to 'system')

diff --git a/system/default.nix b/system/default.nix
deleted file mode 100644
index 6178ae8..0000000
--- a/system/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./fonts.nix
-    ./keyboard.nix
-    ./networking.nix
-    ./pipewire.nix
-    ./xserver.nix
-  ];
-}
diff --git a/system/fonts.nix b/system/fonts.nix
deleted file mode 100644
index d582448..0000000
--- a/system/fonts.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ pkgs, ... }:
-
-{
-  fonts = {
-    packages = with pkgs; [
-      nerdfonts
-      noto-fonts
-      noto-fonts-cjk
-      noto-fonts-cjk-sans
-      noto-fonts-cjk-serif
-      noto-fonts-emoji
-
-      minecraftia
-    ];
-
-    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/system/keyboard.nix b/system/keyboard.nix
deleted file mode 100644
index 1a3de2f..0000000
--- a/system/keyboard.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ pkgs, ... }:
-
-{
-  services.keyd = {
-    enable = true;
-
-    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 = { 
-    enable = true;
-    type = "fcitx5";
-    fcitx5.addons = with pkgs; [ fcitx5-mozc ];
-  };
-
-  environment.variables = {
-    # Required for fcitx5 support in kitty
-    GLFW_IM_MODULE = "ibus";
-  };
-}
diff --git a/system/networking.nix b/system/networking.nix
deleted file mode 100644
index 31632c1..0000000
--- a/system/networking.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ ... }:
-
-{
-  networking = {
-    hostName = "c-pc";
-    hostId = "23ce94ff";
-
-    useDHCP = true;
-
-    wireless = {
-      enable = true;
-
-      environmentFile = "/persist/secrets/wireless.env";
-      networks = {
-        "The Dwyers".psk = "@PSK@";
-      };
-    };
-
-    firewall = {
-      enable = false;
-
-      allowedTCPPorts = [ 8096 50000 ];
-      allowedUDPPorts = [ ];
-    };
-  };
-}
-
diff --git a/system/pipewire.nix b/system/pipewire.nix
deleted file mode 100644
index 0dfb230..0000000
--- a/system/pipewire.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ ... }:
-
-{
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-
-    pulse.enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    #jack.enable = true;
-  };
-}
diff --git a/system/xserver.nix b/system/xserver.nix
deleted file mode 100644
index 38eaf21..0000000
--- a/system/xserver.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ pkgs, ... }:
-
-{
-  services.displayManager = {
-    enable = true;
-    defaultSession = "none+i3";
-  };
-
-  services.xserver = {
-    enable = true;
-
-    videoDrivers = [ "amdgpu" ];
-
-    displayManager = {
-      lightdm.enable = true;
-
-      setupCommands = ''
-        if ${pkgs.xorg.xrandr}/bin/xrandr --query | grep 2560x1080; then
-          ${pkgs.xorg.xrandr}/bin/xrandr --output DVI-D-0 --mode 1920x1080  --rate 60  --pos 0x0
-          ${pkgs.xorg.xrandr}/bin/xrandr --output DisplayPort-2 --mode 2560x1080  --rate 60  --pos 1920x0 --primary
-          ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-A-0 --mode 1920x1080  --rate 75  --pos 4480x0
-        elif ${pkgs.xorg.xrandr}/bin/xrandr --query | grep 2560x1440; then
-          ${pkgs.xorg.xrandr}/bin/xrandr --output DVI-D-0 --mode 1920x1080 --rate 60 --pos 0x360
-          ${pkgs.xorg.xrandr}/bin/xrandr --output DisplayPort-2 --mode 2560x1440 --rate 165 --pos 1920x0 --primary
-          ${pkgs.xorg.xrandr}/bin/xrandr --output DisplayPort-1 --mode 1920x1200 --rate 60 --pos 4480x0
-        fi
-      '';
-    };
-
-    windowManager.i3 = {
-      enable = true;
-    };
-
-    xkb.layout = "us";
-#    xkb.options = "eurosign:e,caps:escape";
-  };
-}
-- 
cgit v1.2.3