nixos: rearrange services

LICENSE

@@ -0,0 +1,45 @@
+MIT License
+
+Copyright (c) 2023 John Bowdre
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+* * *
+
+nix-starter-configs: https://github.com/Misterio77/nix-starter-configs
+
+Version: N/A
+
+Copyright:
+
+License: [CCO 1.0 Universal](https://github.com/Misterio77/nix-starter-configs/blob/fe21fa16704972126a9660622b8464bd215c7894/LICENSE)
+
+* * *
+
+nixos-config: https://github.com/Misterio77/nix-config
+
+Version: N/A
+
+Copyright: Copyright (c) 2021 Gabriel Fontes
+
+License: [MIT License](https://github.com/Misterio77/nix-config/blob/f0818e26954febad31036ea5b6725cc33b57ca7a/LICENSE)
+
+* * *
+
+

README.md

@@ -1,9 +1,8 @@
 # Config files
 
 ## Nix
-I've started the process of leveraging [Nix](https://nixos.org/explore.html) to manage my system configurations. This repo holds files used for managing user environments with [Home Manager](https://github.com/nix-community/home-manager), largely adapted from the wonderful examples at [nix-starter-configs](https://github.com/Misterio77/nix-starter-configs).
-
-I've preserved my previous configs in the [.legacy_dotfiles](./.legacy_dotfiles) directory, but I'm not actively maintaining them anymore.
+I've started the process of leveraging [Nix](https://nixos.org/explore.html) to manage my system configurations. This repo holds files used for managing user environments with [Home Manager](https://github.com/nix-community/home-manager), largely adapted from the wonderful examples at [nix-starter-configs](https://github.com/Misterio77/nix-starter-configs) and the same author's more advanced [nix-config](https://github.com/Misterio77/nix-config).
 
 The [.example_work_profile](./.example_work_profile) directory demonstrates how I use a private repo to overlay my work-specific configurations on top of my personal ones.
 
+*I've preserved my previous configs in the [.legacy_dotfiles](./.legacy_dotfiles) directory, but I'm not actively maintaining them anymore.*

hosts/common/global/default.nix

@@ -2,6 +2,8 @@
   imports = [
     inputs.home-manager.nixosModules.home-manager
     ./fish.nix
+    ./locale.nix
+    ./nix.nix
     ./tailscale.nix
   ] ++ (builtins.attrValues outputs.nixosModules);
 
@@ -19,19 +21,4 @@
   hardware.enableRedistributableFirmware = true;
   networking.domain = "vim.wtf";
 
-  i18n = {
-    defaultLocale = "en_US.UTF-8";
-    extraLocaleSettings = {
-      LC_ADDRESS = "en_US.UTF-8";
-      LC_IDENTIFICATION = "en_US.UTF-8";
-      LC_MEASUREMENT = "en_US.UTF-8";
-      LC_MONETARY = "en_US.UTF-8";
-      LC_NAME = "en_US.UTF-8";
-      LC_NUMERIC = "en_US.UTF-8";
-      LC_PAPER = "en_US.UTF-8";
-      LC_TELEPHONE = "en_US.UTF-8";
-      LC_TIME = "en_US.UTF-8";
-    };
-  };
-
 }

hosts/common/global/locale.nix

@@ -0,0 +1,17 @@
+{ lib, ... }: {
+  i18n = {
+    defaultLocale = lib.mkDefault "en_US.UTF-8";
+    extraLocaleSettings = {
+      LC_ADDRESS = "en_US.UTF-8";
+      LC_IDENTIFICATION = "en_US.UTF-8";
+      LC_MEASUREMENT = "en_US.UTF-8";
+      LC_MONETARY = "en_US.UTF-8";
+      LC_NAME = "en_US.UTF-8";
+      LC_NUMERIC = "en_US.UTF-8";
+      LC_PAPER = "en_US.UTF-8";
+      LC_TELEPHONE = "en_US.UTF-8";
+      LC_TIME = "en_US.UTF-8";
+    };
+  };
+  time.timeZone = lib.mkDefault "America/Chicago";
+}

hosts/common/global/nix.nix

@@ -0,0 +1,22 @@
+{ inputs, lib, ... }:
+{
+  nix = {
+    settings = {
+      trusted-users = [ "root" "@wheel" ];
+      auto-optimise-store = lib.mkDefault true;
+      experimental-features = [ "nix-command" "flakes" "repl-flake" ];
+      warn-dirty = false;
+      system-features = [ "kvm" "big-parallel" "nixos-test" ];
+      flake-registry = "";
+    };
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than +3";
+    };
+
+    registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
+
+    nixPath = [ "nixpkgs=${inputs.nixpkgs.outPath}" ];
+  };
+}

hosts/common/optional/gnome.nix

@@ -0,0 +1,13 @@
+{
+  services.xserver = {
+    enable = true;
+    displayManager = {
+      gdm.enable = true;
+    };
+    desktopManager = {
+      gnome.enable = true;
+    };
+    layout = "us";
+    xkbVariant = "";
+  };
+}

hosts/common/optional/pipewire.nix

@@ -7,5 +7,6 @@
     alsa.enable = true;
     alsa.support32Bit = true;
     pulse.enable = true;
+    jack.enable = true;
   };
 }

hosts/pixnix/default.nix

@@ -4,13 +4,15 @@
     inputs.hardware.nixosModules.common-pc-ssd
 
     ./hardware-configuration.nix
-    ./services
 
     ../common/global
     ../common/users/john
 
     ../common/optional/docker.nix
+    ../common/optional/gnome.nix
     ../common/optional/libvirtd.nix
+    ../common/optional/pipewire.nix
+    ../common/optional/printing.nix
     ../common/optional/sshd.nix
   ];
 
@@ -26,8 +28,6 @@
     networkmanager.enable = true;
   };
 
-  time.timeZone = "America/Chicago";
-
   system.stateVersion = "23.05";
 
 }

hosts/pixnix/services/default.nix

@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./pipewire.nix
-    ./printing.nix
-    ./xserver.nix
-  ];
-}

hosts/pixnix/services/xserver.nix

@@ -1,9 +0,0 @@
-{
-  services.xserver = {
-    enable = true;
-    displayManager.gdm.enable = true;
-    desktopManager.gnome.enable = true;
-    layout = "us";
-    xkbVariant = "";
-  };
-}