feat: MIT license and some changes

computers/python/configs/river/init

@@ -6,8 +6,8 @@ riverctl spawn "swaybg -i ~/.local/share/wallpapers/02.jpg -m fill"
 riverctl spawn "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
 riverctl spawn "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river"
 
-riverctl map normal Super T spawn alacritty
-riverctl map normal Super R spawn fuzzel
+riverctl map normal Super+Shift Return spawn alacritty
+riverctl map normal Super P spawn fuzzel
 riverctl map normal Super Q close
 riverctl map normal Super+Shift E exit
 riverctl map normal Super+Shift C spawn "~/.config/river/init"

computers/python/default.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   imports = [
-    ./hardware-configuration.nix
+    ./hardware.nix
     ./disks.nix
     ./theme.nix
     ./apps.nix

computers/python/fonts.nix

@@ -1,17 +1,20 @@
 {pkgs, ...}: {
   alqueva.fonts = {
     names = {
-      sansSerif = ["Iosevka Comfy Wide Fixed"];
-      monospace = ["Iosevka Comfy Wide Fixed"];
-      serif = ["Iosevka Comfy Wide Motion Fixed"];
+      sansSerif = ["Source Sans Pro"];
+      monospace = ["Source Code Pro"];
+      serif = ["Source Serif Pro"];
+      emoji = ["OpenMoji Color"];
     };
-    packages = builtins.attrValues {
-      inherit
-        (pkgs.iosevka-comfy)
-        comfy-wide-fixed
-        comfy-wide-motion-fixed
-        ;
-      nerdfonts = pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];};
+    packages = {
+      sansSerif = [pkgs.source-sans-pro];
+      monospace = [pkgs.source-code-pro];
+      serif = [pkgs.source-serif-pro];
+      emoji = [pkgs.openmoji-color];
+      extra = [
+        pkgs.source-han-sans
+        (pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
+      ];
     };
     enable = true;
   };

computers/python/theme.nix

@@ -1,5 +1,4 @@
 {
-  inputs,
   pkgs,
   lib,
   ...

computers/shared/fonts.nix

@@ -10,16 +10,43 @@
     mkOption {
       type = types.listOf types.str;
       inherit default;
-      description = "Which ${letterform} font packages you want to use.";
+      description = "The default fonts for ${letterform}.";
+    };
+  mkPackagesOption = default: letterform:
+    mkOption {
+      type = types.listOf types.package;
+      inherit default;
+      description = "The packages you want to use for your ${letterform} fonts.";
     };
 in {
   options.alqueva.fonts = {
     enable = lib.mkEnableOption "" // {description = "Whether you want to use this fonts module.";};
-    packages = mkOption {
-      type = types.listOf types.package;
-      default = [pkgs.roboto pkgs.roboto-serif pkgs.roboto-mono pkgs.noto-fonts-color-emoji];
-      description = "Packages related to fonts to be installed.";
-    };
+    packages =
+      {
+        extra = mkOption {
+          type = types.listOf types.package;
+          default = [];
+          description = "Extra font packages you want installed.";
+        };
+      }
+      // builtins.mapAttrs (_n: v: mkPackagesOption v.default v.letterform) {
+        sansSerif = {
+          default = [pkgs.roboto];
+          letterform = "sans-serif";
+        };
+        monospace = {
+          default = [pkgs.roboto-mono];
+          letterform = "monospace";
+        };
+        serif = {
+          default = [pkgs.roboto-serif];
+          letterform = "serif";
+        };
+        emoji = {
+          default = [pkgs.noto-fonts-color-emoji];
+          letterform = "emoji";
+        };
+      };
     names = builtins.mapAttrs (_n: v: mkStringsOption v.default v.letterform) {
       sansSerif = {
         default = ["Roboto"];
@@ -41,7 +68,7 @@ in {
   };
   config = lib.mkIf cfg.enable {
     fonts = {
-      inherit (cfg) packages;
+      packages = builtins.concatLists (builtins.attrValues cfg.packages);
       fontconfig = {
         defaultFonts = {
           inherit (cfg.names) sansSerif monospace serif emoji;