From 2869a3893a8aa5d9ef6846ec09a40180fe5cbcf9 Mon Sep 17 00:00:00 2001
From: Syndamia <kamen@syndamia.com>
Date: Sun, 8 Sep 2024 10:12:57 +0300
Subject: feat(modules/personal): Rearranged certain configs between files and
 renamed essential to default

---
 modules/personal/default.nix          |  57 +++++++++++++++++
 modules/personal/essential.nix        | 112 ----------------------------------
 modules/personal/hardware-general.nix |  52 ++++++++++++++++
 modules/personal/web-server.nix       |   4 ++
 4 files changed, 113 insertions(+), 112 deletions(-)
 create mode 100644 modules/personal/default.nix
 delete mode 100644 modules/personal/essential.nix

(limited to 'modules')

diff --git a/modules/personal/default.nix b/modules/personal/default.nix
new file mode 100644
index 0000000..1b28c00
--- /dev/null
+++ b/modules/personal/default.nix
@@ -0,0 +1,57 @@
+{ config, pkgs, ... }: {
+  environment.systemPackages = with pkgs; [
+    networkmanager
+  ];
+
+  #
+  # Kernel
+  #
+
+  boot.kernelModules = [ "kvm-intel" ];
+
+  #
+  # Bootloader
+  #
+
+  # Use the systemd-boot EFI boot loader.
+  # boot.loader.systemd-boot.enable = true;
+  # boot.loader.efi.canTouchEfiVariables = true;
+  # boot.loader.efi.efiSysMountPoint = "/boot/efi";
+
+  # Use the GRUB 2 boot loader
+  boot.loader = {
+    grub = {
+      enable = true;
+      copyKernels = true;
+      efiSupport = true;
+      efiInstallAsRemovable = true;
+      # Define on which hard drive you want to install Grub
+      device = "nodev"; # or "nodev" for efi only
+    };
+    timeout = 1;
+  };
+
+  #
+  # Timezone and locale
+  #
+
+  # Set your time zone.
+  time.timeZone = "Europe/Sofia";
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  #
+  # Networking
+  #
+
+  # Pick only one of the below networking options.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+
+  # zeroconf networking
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    openFirewall = true;
+  };
+}
diff --git a/modules/personal/essential.nix b/modules/personal/essential.nix
deleted file mode 100644
index 8edd525..0000000
--- a/modules/personal/essential.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-{ config, pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    networkmanager
-  ];
-
-  #
-  # Kernel
-  #
-
-  boot.kernelModules = [ "kvm-intel" ];
-
-  #
-  # Bootloader
-  #
-
-  # Use the systemd-boot EFI boot loader.
-  # boot.loader.systemd-boot.enable = true;
-  # boot.loader.efi.canTouchEfiVariables = true;
-  # boot.loader.efi.efiSysMountPoint = "/boot/efi";
-
-  # Use the GRUB 2 boot loader
-  boot.loader = {
-    grub = {
-      enable = true;
-      copyKernels = true;
-      efiSupport = true;
-      efiInstallAsRemovable = true;
-      # Define on which hard drive you want to install Grub
-      device = "nodev"; # or "nodev" for efi only
-    };
-    timeout = 1;
-  };
-
-  #
-  # Timezone and locale
-  #
-
-  # Set your time zone.
-  time.timeZone = "Europe/Sofia";
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  #
-  # Graphics
-  #
-
-  # https://nixos.wiki/wiki/Accelerated_Video_Playback
-  hardware.opengl = {
-    enable = true;
-    extraPackages = with pkgs; [
-      vaapiVdpau
-      libvdpau-va-gl
-    ];
-  };
-
-  #
-  # Sound
-  #
-
-  sound.enable = false;
-  # hardware.pulseaudio.enable = true;
-
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-  services.dbus = {
-    enable = true;
-    packages = [ pkgs.dconf ];
-  };
-
-  #
-  # Networking
-  #
-
-  # Pick only one of the below networking options.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
-  networking.extraHosts = ''
-    127.0.0.1 synd.local
-  '';
-
-  # zeroconf networking
-  services.avahi = {
-    enable = true;
-    nssmdns4 = true;
-    openFirewall = true;
-  };
-
-  #
-  # Bluetooth
-  #
-
-  hardware.bluetooth.enable = true;
-
-  #
-  # Printers and scanners
-  #
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-  hardware.sane.enable = true;
-
-  #
-  # Other hardware
-  #
-
-  hardware.rtl-sdr.enable = true;
-}
diff --git a/modules/personal/hardware-general.nix b/modules/personal/hardware-general.nix
index 4f83454..3f6b681 100644
--- a/modules/personal/hardware-general.nix
+++ b/modules/personal/hardware-general.nix
@@ -6,4 +6,56 @@
   programs = {
     mtr.enable = true;
   };
+
+  #
+  # Graphics
+  #
+
+  # https://nixos.wiki/wiki/Accelerated_Video_Playback
+  hardware.opengl = {
+    enable = true;
+    extraPackages = with pkgs; [
+      vaapiVdpau
+      libvdpau-va-gl
+    ];
+  };
+
+  #
+  # Sound
+  #
+
+  sound.enable = false;
+  # hardware.pulseaudio.enable = true;
+
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+  services.dbus = {
+    enable = true;
+    packages = [ pkgs.dconf ];
+  };
+
+  #
+  # Bluetooth
+  #
+
+  hardware.bluetooth.enable = true;
+
+  #
+  # Printers and scanners
+  #
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+  hardware.sane.enable = true;
+
+  #
+  # Other hardware
+  #
+
+  hardware.rtl-sdr.enable = true;
 }
diff --git a/modules/personal/web-server.nix b/modules/personal/web-server.nix
index bb4a968..62bae7b 100644
--- a/modules/personal/web-server.nix
+++ b/modules/personal/web-server.nix
@@ -14,4 +14,8 @@
       };
     };
   };
+
+  networking.extraHosts = ''
+    127.0.0.1 synd.local
+  '';
 }
-- 
cgit v1.3.1-23-gd82d