From db0493863f4d89a074eea0b4e230ff00cea67611 Mon Sep 17 00:00:00 2001
From: Raghuram Subramani <raghus2247@gmail.com>
Date: Sat, 9 Mar 2024 21:52:19 +0530
Subject: update

---
 modules/audio.nix          | 13 -------------
 modules/bluetooth.nix      |  7 -------
 modules/core/audio.nix     | 13 +++++++++++++
 modules/core/bluetooth.nix |  7 +++++++
 modules/core/fonts.nix     | 11 +++++++++++
 modules/fonts.nix          | 11 -----------
 modules/polkit.nix         | 21 +++++++++++++++++++++
 modules/wm.nix             | 32 --------------------------------
 modules/wm_utils.nix       | 13 +++++++++++++
 9 files changed, 65 insertions(+), 63 deletions(-)
 delete mode 100644 modules/audio.nix
 delete mode 100644 modules/bluetooth.nix
 create mode 100644 modules/core/audio.nix
 create mode 100644 modules/core/bluetooth.nix
 create mode 100644 modules/core/fonts.nix
 delete mode 100644 modules/fonts.nix
 create mode 100644 modules/polkit.nix
 delete mode 100644 modules/wm.nix
 create mode 100644 modules/wm_utils.nix

(limited to 'modules')

diff --git a/modules/audio.nix b/modules/audio.nix
deleted file mode 100644
index f358c2c..0000000
--- a/modules/audio.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, ... }:
-
-{
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    jack.enable = true;
-  };
-}
diff --git a/modules/bluetooth.nix b/modules/bluetooth.nix
deleted file mode 100644
index fbd9b48..0000000
--- a/modules/bluetooth.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, ... }:
-
-{
-  hardware.bluetooth.enable = true;
-  hardware.bluetooth.powerOnBoot = true;
-  # services.blueman.enable = true;
-}
diff --git a/modules/core/audio.nix b/modules/core/audio.nix
new file mode 100644
index 0000000..f358c2c
--- /dev/null
+++ b/modules/core/audio.nix
@@ -0,0 +1,13 @@
+{ config, ... }:
+
+{
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+  };
+}
diff --git a/modules/core/bluetooth.nix b/modules/core/bluetooth.nix
new file mode 100644
index 0000000..fbd9b48
--- /dev/null
+++ b/modules/core/bluetooth.nix
@@ -0,0 +1,7 @@
+{ config, ... }:
+
+{
+  hardware.bluetooth.enable = true;
+  hardware.bluetooth.powerOnBoot = true;
+  # services.blueman.enable = true;
+}
diff --git a/modules/core/fonts.nix b/modules/core/fonts.nix
new file mode 100644
index 0000000..8a56aa7
--- /dev/null
+++ b/modules/core/fonts.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  fonts.packages = with pkgs; [
+    (nerdfonts.override { fonts = [ "UbuntuMono" ]; })
+    noto-fonts
+    noto-fonts-cjk
+    noto-fonts-emoji
+    liberation_ttf
+  ];
+}
diff --git a/modules/fonts.nix b/modules/fonts.nix
deleted file mode 100644
index 8a56aa7..0000000
--- a/modules/fonts.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-
-{
-  fonts.packages = with pkgs; [
-    (nerdfonts.override { fonts = [ "UbuntuMono" ]; })
-    noto-fonts
-    noto-fonts-cjk
-    noto-fonts-emoji
-    liberation_ttf
-  ];
-}
diff --git a/modules/polkit.nix b/modules/polkit.nix
new file mode 100644
index 0000000..ebfd03a
--- /dev/null
+++ b/modules/polkit.nix
@@ -0,0 +1,21 @@
+{ pkgs, ... }:
+
+{
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+  systemd = {
+    user.services.polkit-gnome-authentication-agent-1 = {
+      description = "polkit-gnome-authentication-agent-1";
+      wantedBy = [ "graphical-session.target" ];
+      wants = [ "graphical-session.target" ];
+      after = [ "graphical-session.target" ];
+      serviceConfig = {
+          Type = "simple";
+          ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+          Restart = "on-failure";
+          RestartSec = 1;
+          TimeoutStopSec = 10;
+        };
+    };
+  };
+}
diff --git a/modules/wm.nix b/modules/wm.nix
deleted file mode 100644
index 327ac41..0000000
--- a/modules/wm.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
-  environment.systemPackages = with pkgs; [
-    networkmanagerapplet
-
-    polkit_gnome
-
-    libnotify
-    libappindicator
-
-    inotify-tools
-  ];
-
-  systemd = {
-    user.services.polkit-gnome-authentication-agent-1 = {
-      description = "polkit-gnome-authentication-agent-1";
-      wantedBy = [ "graphical-session.target" ];
-      wants = [ "graphical-session.target" ];
-      after = [ "graphical-session.target" ];
-      serviceConfig = {
-          Type = "simple";
-          ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
-          Restart = "on-failure";
-          RestartSec = 1;
-          TimeoutStopSec = 10;
-        };
-    };
-  };
-}
diff --git a/modules/wm_utils.nix b/modules/wm_utils.nix
new file mode 100644
index 0000000..7ddaca6
--- /dev/null
+++ b/modules/wm_utils.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    networkmanagerapplet
+
+    polkit_gnome
+
+    libnotify
+    libappindicator
+
+    inotify-tools
+  ];
+}
-- 
cgit v1.2.3