Add alloy, split graphical into PC and laptop

flake.nix

@@ -48,7 +48,10 @@
         ansi-utils = ansi-utils.packages.${system};
         unambig-path = unambig-path.packages.${system}.unambig-path;
       };
-      mkLaptop = {system, pkgs} : import ./home/graphical.nix {
+      mkPC = {system, pkgs} : import ./home/graphical.nix {
+        inherit pkgs xdg-runtime-dir;
+      };
+      mkLaptop = {system, pkgs} : import ./home/apps.nix {
         inherit pkgs xdg-runtime-dir;
       };
       mkMac = {system, pkgs, laptop} : import ./home/mac.nix {
@@ -74,6 +77,7 @@
             prompt-color = 172;
             inherit system pkgs;
           };
+          pc = mkPC { inherit system pkgs; };
           laptop = mkLaptop { inherit system pkgs; };
           mac = mkMac { inherit system pkgs laptop; };
         in home-manager.lib.homeManagerConfiguration {
@@ -81,6 +85,7 @@
 
           modules = [
             home
+            pc
             laptop
             mac
           ];
@@ -114,13 +119,13 @@
             prompt-color = 205;
             inherit system pkgs;
           };
-          laptop = mkLaptop { inherit system pkgs; };
+          pc = mkPC { inherit system pkgs; };
         in home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
 
           modules = [
             home
-            laptop
+            pc
           ];
         };
 

home/alacritty/alacritty.nix

@@ -40,6 +40,8 @@ case $CHOICE in
         ;;
 esac";
 
+  font-size = if pkgs.stdenv.isLinux then 8 else 15;
+
   base-cfg = {
     window = {
       padding.x = 0;
@@ -50,7 +52,7 @@ esac";
     mouse.hide_when_typing = true;
     font = {
       normal.family = "SAX2";
-      size = 15;
+      size = font-size;
     };
     colors.primary = {
       background = "#282828";

home/apps.nix

@@ -0,0 +1,8 @@
+{ pkgs, xdg-runtime-dir }:
+{
+  home.packages = with pkgs; [
+    discord-canary
+
+    alloy6
+  ];
+}

home/graphical.nix

@@ -4,8 +4,6 @@ let
   alacritty = import ./alacritty/alacritty.nix pkgs;
 in rec {
   home.packages = with pkgs; [
-    discord-canary
-    # libreoffice-bin
     fira-code ibm-plex
   ];
 

nixos/graphical.nix

@@ -19,6 +19,7 @@
     };
 
     layout = "fox";
+    xkbOptions = "caps:escape";
     extraLayouts.fox = {
       description = "Layout suitable to be used by a fox";
       languages = ["se"];