From 7c948f74b93a495d1b2dbcca358efebdc990237e Mon Sep 17 00:00:00 2001
From: twoneis <sanjay29@sapura.de>
Date: Wed, 27 Dec 2023 16:38:38 +0100
Subject: [PATCH] bit structure changed and voice init

---
 flake.nix                      |  9 ++++++++-
 modules/home/voice/default.nix |  5 +++++
 modules/system/audio.nix       | 18 ++++++++++++++++++
 modules/system/default.nix     | 33 ++++-----------------------------
 modules/system/docker.nix      |  3 +++
 modules/system/fonts.nix       | 16 ++++++++++++++++
 modules/virt/default.nix       |  6 ------
 7 files changed, 54 insertions(+), 36 deletions(-)
 create mode 100644 modules/home/voice/default.nix
 create mode 100644 modules/system/audio.nix
 create mode 100644 modules/system/docker.nix
 create mode 100644 modules/system/fonts.nix
 delete mode 100644 modules/virt/default.nix

diff --git a/flake.nix b/flake.nix
index 66d0936..ec7d47a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,9 +18,14 @@
     nur = {
       url = "github:nix-community/nur";
     };
+
+    talon-nix = {
+      url = "github:nix-community/talon-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { nixpkgs, home-manager, nixos-hardware, nur, ... }:
+  outputs = { nixpkgs, home-manager, nixos-hardware, nur, talon-nix, ... }:
   let
     x86 = "x86_64-linux";
     common = ./modules/system;
@@ -38,6 +43,7 @@
           home-manager.nixosModules.home-manager {
             nixpkgs.overlays = [
               nur.overlay
+              talon-nix.overlays
             ];
             home-manager = {
               useGlobalPkgs = true;
@@ -61,6 +67,7 @@
           home-manager.nixosModules.home-manager {
             nixpkgs.overlays = [
               nur.overlay
+              talon-nix.overlays
             ];
             home-manager = {
               useGlobalPkgs = true;
diff --git a/modules/home/voice/default.nix b/modules/home/voice/default.nix
new file mode 100644
index 0000000..77afe93
--- /dev/null
+++ b/modules/home/voice/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    talon
+  ];
+}
diff --git a/modules/system/audio.nix b/modules/system/audio.nix
new file mode 100644
index 0000000..78ab4f2
--- /dev/null
+++ b/modules/system/audio.nix
@@ -0,0 +1,18 @@
+{ pkgs, ... }: {
+  # Enable sound with pipewire.
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    #jack.enable = true;
+  };
+
+  programs.noisetorch.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    pamixer
+  ];
+}
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 09d3b3d..fc73b23 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -4,8 +4,10 @@
 
 { pkgs, ... }: {
   imports = [
+    ./audio.nix
+    ./fonts.nix
+    ./docker.nix
     ../gnome
-    ../virt
   ];
 
   # Allow packages from nixpkgs
@@ -70,20 +72,8 @@
   # Enable CUPS to print documents.
   services.printing.enable = false;
 
-  # Enable sound with pipewire.
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
+  # Security
   security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    #jack.enable = true;
-  };
-  environment.systemPackages = with pkgs; [
-    pamixer
-  ];
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.twoneis = {
@@ -91,19 +81,4 @@
     description = "twoneis";
     extraGroups = [ "networkmanager" "wheel" "surface-control" "docker" ];
   };
-
-  # Configure fonts
-  fonts.packages = with pkgs; [
-    alegreya
-    alegreya-sans
-    (nerdfonts.override { fonts = [ "FiraCode" ]; })
-  ];
-
-  fonts.fontconfig = {
-    defaultFonts = {
-      serif = [ "Alegreya" ];
-      sansSerif = [ "Alegreya Sans" ];
-      monospace = [ "Fira Code Nerd Font" ];
-    };
-  };
 }
diff --git a/modules/system/docker.nix b/modules/system/docker.nix
new file mode 100644
index 0000000..8814f80
--- /dev/null
+++ b/modules/system/docker.nix
@@ -0,0 +1,3 @@
+{ ... }: {
+  virtualisation.docker.enable = true;
+}
diff --git a/modules/system/fonts.nix b/modules/system/fonts.nix
new file mode 100644
index 0000000..5331921
--- /dev/null
+++ b/modules/system/fonts.nix
@@ -0,0 +1,16 @@
+{ pkgs, ... }: {
+  # Configure fonts
+  fonts.packages = with pkgs; [
+    alegreya
+    alegreya-sans
+    (nerdfonts.override { fonts = [ "FiraCode" ]; })
+  ];
+
+  fonts.fontconfig = {
+    defaultFonts = {
+      serif = [ "Alegreya" ];
+      sansSerif = [ "Alegreya Sans" ];
+      monospace = [ "Fira Code Nerd Font" ];
+    };
+  };
+}
diff --git a/modules/virt/default.nix b/modules/virt/default.nix
deleted file mode 100644
index db0b992..0000000
--- a/modules/virt/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, ... }: {
-  virtualisation.docker.enable = true;
-  environment.systemPackages = with pkgs; [
-    distrobox
-  ];
-}