Summary Files Commits Branches @commit @diff @stats
diff options
context:
space:
mode:
Commit105d70318e7620cd2596791711f17e5a7ab6b275 (patch)
Author
 Syndamia <kamen@syndamia.com>
2024-07-12 16:46:32 +0300
Committer
 Syndamia <kamen@syndamia.com>
2024-07-12 16:46:32 +0300
Filescbad5ff7cac1d3d2facf7b5bdc89aaa52891e1a1
nix-105d70318e7620cd2596791711f17e5a7ab6b275.tar
nix-105d70318e7620cd2596791711f17e5a7ab6b275.tar.gz
nix-105d70318e7620cd2596791711f17e5a7ab6b275.zip
Parentcb613ed855f6661ecac17b696bafc17472256215 (diff)
[modules] Moved most of configuration into its own module
3 files changed, 113 insertions, 137 deletions
-rw-r--r--autoconfig.nix1
-rw-r--r--configuration.nix137
-rw-r--r--modules/personal/essential.nix112
diff --git a/autoconfig.nix b/autoconfig.nix
index 7534315..c39f974 100644
--- a/autoconfig.nix
+++ b/autoconfig.nix
@@ -61,6 +61,7 @@ in {
modules = [
./machines/${dir}/hardware-configuration.nix
./configuration.nix
+ (modules-dir + "/essential.nix")
({ ... }: {
networking.hostName = sysidentity.name;
nixpkgs.overlays = [ (_: _: inputs-overlays) (_: _: custom-packages-overlays) ] ++ package-overlays;
diff --git a/configuration.nix b/configuration.nix
index 6957c00..edf504a 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -16,141 +16,4 @@
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nixpkgs.config.allowUnfree = true;
-
- environment.systemPackages = with pkgs; [
- networkmanager
- ];
-
- #
- # Kernel
- #
-
- boot.kernelModules = [ "kvm-intel" ];
-
- # Is this for kernel?
- # console = {
- # font = "Lat2-Terminus16";
- # keyMap = "us";
- # useXkbConfig = true; # use xkbOptions in tty.
- # };
-
- #
- # 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";
-
- #
- # Users
- #
-
-
- # TODO
- # Enable the OpenSSH daemon.
- # services.openssh.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 ];
- };
-
- #
- # 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
- '';
-
- # Configure network proxy if necessary
- # networking.proxy.default = "http://user:password@proxy:port/";
- # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
- # Open ports in the firewall.
- # networking.firewall.allowedTCPPorts = [ ... ];
- # networking.firewall.allowedUDPPorts = [ ... ];
- # Or disable the firewall altogether.
- # networking.firewall.enable = false;
-
- # 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/essential.nix b/modules/personal/essential.nix
new file mode 100644
index 0000000..8edd525
--- /dev/null
+++ b/modules/personal/essential.nix
@@ -0,0 +1,112 @@
+{ 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;
+}