From dee6a979f21f8aac8b069d0bd8692c1202854b5d Mon Sep 17 00:00:00 2001
From: Ranomier <>
Date: Tue, 15 Apr 2025 17:56:59 +0200
Subject: [PATCH] organise

---
 modules/software/default.nix                  | 16 +++++++++-------
 modules/software/fonts.nix                    | 19 +++++++++++++++++++
 .../software/{software.nix => packages.nix}   |  5 -----
 modules/software/programs.nix                 |  4 ++++
 4 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 modules/software/fonts.nix
 rename modules/software/{software.nix => packages.nix} (86%)
 create mode 100644 modules/software/programs.nix

diff --git a/modules/software/default.nix b/modules/software/default.nix
index 53958b1..792d1b1 100644
--- a/modules/software/default.nix
+++ b/modules/software/default.nix
@@ -1,14 +1,16 @@
 {
   imports = [
-    ./audio_video.nix
-    ./flatpak.nix
-    ./game.nix
-    ./obs-studio.nix
-    ./shell.nix
-    ./software.nix
-    ./virt.nix
     ./android.nix
+    ./audio_video
+    ./flatpak.nix
+    ./fonts.nix
+    ./game.nix
     #./mpv.nix
     ./neovim.nix
+    ./obs-studio.nix
+    ./packages.nix
+    ./programs.nix
+    ./shell.nix
+    ./virt.nix
   ];
 }
diff --git a/modules/software/fonts.nix b/modules/software/fonts.nix
new file mode 100644
index 0000000..015f0c4
--- /dev/null
+++ b/modules/software/fonts.nix
@@ -0,0 +1,19 @@
+{pkgs, ...} {
+  fonts.packages = with pkgs; [
+    noto-fonts
+    noto-fonts-cjk-sans
+    noto-fonts-emoji
+    liberation_ttf
+    dina-font
+    proggyfonts
+    font-awesome
+
+    jetbrains-mono
+    fira-code
+    fira-code-symbols
+    #droid-sans-mono
+    (nerdfonts.override {
+      fonts = ["FiraCode" "DroidSansMono" "JetBrainsMono"];
+    })
+  ];
+}
diff --git a/modules/software/software.nix b/modules/software/packages.nix
similarity index 86%
rename from modules/software/software.nix
rename to modules/software/packages.nix
index d9df130..9c80223 100644
--- a/modules/software/software.nix
+++ b/modules/software/packages.nix
@@ -1,9 +1,4 @@
 {pkgs, ...}: {
-  # also opens the TCP and UDP port from 1714 to 1764
-  programs.kdeconnect.enable = true;
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
   environment.systemPackages = with pkgs; [
     # low level stuff
     efibootmgr
diff --git a/modules/software/programs.nix b/modules/software/programs.nix
new file mode 100644
index 0000000..b312ee4
--- /dev/null
+++ b/modules/software/programs.nix
@@ -0,0 +1,4 @@
+{
+  # also opens the TCP and UDP port from 1714 to 1764
+  programs.kdeconnect.enable = true;
+}