decommissioning cgs, jp fonts

7 files changed, 10 insertions, 143 deletions

diff --git a/flake.nix b/flake.nix
index 09483c6..5f9a821 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,11 +62,6 @@
 
           hostName = "meowbook";
         };
-
-        canadian-government-system = mkSystem {
-          additionalModules = [ disko.nixosModules.disko ];
-          hostName = "canadian-government-system";
-        };
       };
     };
 }
diff --git a/hosts/canadian-government-system/default.nix b/hosts/canadian-government-system/default.nix
deleted file mode 100644
index 3086ec9..0000000
--- a/hosts/canadian-government-system/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, ... }:
-{
-  imports = [ ./disks.nix ];
-  networking.domain = "eviltransgenders.club";
-  security.doas.enable = true;
-  services.openssh.enable = true;
-  system.stateVersion = "26.05";
-  users.users = {
-    root.openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICcEZBikGjnGveif3TsfBkWCl1Qrw0yZoOAn/LxS8oAa rosa@lust"
-    ];
-
-    rosa.enable = true;
-  };
-}
diff --git a/hosts/canadian-government-system/disks.nix b/hosts/canadian-government-system/disks.nix
deleted file mode 100644
index e8d3ab8..0000000
--- a/hosts/canadian-government-system/disks.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  disko.devices.disk = {
-    boot1 = {
-      content = {
-        partitions = {
-          efi = {
-            content = {
-              format = "vfat";
-              mountOptions = [ "umask=0077" ];
-              mountpoint = "/boot";
-              type = "filesystem";
-            };
-
-            size = "512M";
-            type = "EF00";
-          };
-
-          # the root partition is set up in boot2
-          root.size = "100%";
-        };
-
-        type = "gpt";
-      };
-
-      device = "/dev/sda";
-      type = "disk";
-    };
-
-    boot2 = {
-      content = {
-        partitions = {
-          efi = {
-            content = {
-              format = "vfat";
-              mountOptions = [ "umask=0077" ];
-              #mountpoint = "/boot";
-              type = "filesystem";
-            };
-
-            size = "512M";
-            type = "EF00";
-          };
-
-          root = {
-            content = {
-              extraArgs = [
-                "-f"
-                "-d raid1"
-                "/dev/sda2"
-              ];
-
-              subvolumes = {
-                "/nix" = {
-                  mountOptions = [
-                    "compress=zstd"
-                    "noatime"
-                  ];
-
-                  mountpoint = "/nix";
-                };
-
-                "/root" = {
-                  mountpoint = "/";
-                  mountOptions = [ "noatime" ];
-                };
-              };
-
-              type = "btrfs";
-            };
-
-            size = "100%";
-          };
-        };
-
-        type = "gpt";
-      };
-
-      device = "/dev/sdb";
-      type = "disk";
-    };
-
-    mass-storage = {
-      content = {
-        partitions.data = {
-          content = {
-            extraArgs = [ "-f" ];
-            subvolumes."/data" = {
-              mountOptions = [ "noatime" ];
-              mountpoint = "/mnt/data";
-            };
-
-            type = "btrfs";
-          };
-
-          size = "100%";
-        };
-
-        type = "gpt";
-      };
-
-      device = "/dev/sdc";
-      type = "disk";
-    };
-  };
-}
diff --git a/hosts/canadian-government-system/hardware-configuration.nix b/hosts/canadian-government-system/hardware-configuration.nix
deleted file mode 100644
index 4d805aa..0000000
--- a/hosts/canadian-government-system/hardware-configuration.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/modules/default.nix b/modules/default.nix
index 26267b6..081a3d9 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -9,5 +9,6 @@
     ./desktop.nix
     ./doas.nix
     ./nonfree.nix
+    ./steam.nix
   ];
 }
diff --git a/modules/steam.nix b/modules/steam.nix
new file mode 100644
index 0000000..5680511
--- /dev/null
+++ b/modules/steam.nix
@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+{
+  programs.steam = {
+    extraPackages = with pkgs; [ freetype ];
+    protontricks.enable = lib.mkDefault config.programs.steam.enable;
+  };
+}
diff --git a/modules/user/default.nix b/modules/user/default.nix
index bca67fe..737f3ff 100644
--- a/modules/user/default.nix
+++ b/modules/user/default.nix
@@ -7,8 +7,10 @@
     ./zsh
   ];
 
+  fonts.fontconfig.enable = true;
   home.packages = with pkgs; [
     fira-code
+    ipaexfont
     keepassxc
   ];
 }