From 5afc59f7bcad21800118c921f90d690bce3c6d51 Mon Sep 17 00:00:00 2001
From: Daniel Patterson <me@danielpatterson.dev>
Date: Wed, 10 Nov 2021 01:45:39 +0000
Subject: [PATCH] Add host-specific config for miniding

---
 hosts/common/default.nix         |   8 ---
 hosts/dingbox/configuration.nix  |  12 ++++
 hosts/miniding/configuration.nix | 108 ++-----------------------------
 3 files changed, 17 insertions(+), 111 deletions(-)

diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index 11a9be3..e940355 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -36,14 +36,6 @@
     enable = true;
     layout = "gb";
 
-    dpi = 144;
-    videoDrivers = [ "nvidia" ];
-    screenSection = ''
-      Option	"metamodes" "nvidia-auto-select +0+0 {ForceCompositionPipeline=On}"
-      Option	"AllowIndirectGLXProtocol" "off"
-      Option	"TripleBuffer" "on"
-    '';
-
     libinput = {
       enable = true;
       mouse = {
diff --git a/hosts/dingbox/configuration.nix b/hosts/dingbox/configuration.nix
index c2c696d..8587f88 100644
--- a/hosts/dingbox/configuration.nix
+++ b/hosts/dingbox/configuration.nix
@@ -11,6 +11,18 @@
       ../common
     ];
 
+  services.xserver = {
+
+    dpi = 144;
+    videoDrivers = [ "nvidia" ];
+    screenSection = ''
+      Option	"metamodes" "nvidia-auto-select +0+0 {ForceCompositionPipeline=On}"
+      Option	"AllowIndirectGLXProtocol" "off"
+      Option	"TripleBuffer" "on"
+    '';
+
+  };
+
   networking.hostName = "dingbox"; # Define your hostname.
   networking.interfaces.enp5s0.useDHCP = true;
   networking.interfaces.wlp6s0.useDHCP = true;
diff --git a/hosts/miniding/configuration.nix b/hosts/miniding/configuration.nix
index 640c83b..a61f20c 100644
--- a/hosts/miniding/configuration.nix
+++ b/hosts/miniding/configuration.nix
@@ -8,116 +8,18 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ../common
     ];
 
-  # Use the systemd-boot EFI boot loader.
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_14;
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  nixpkgs.config.allowUnfree = true;
-
-  # nix flakes compatibility
-  nix = {
-    package = pkgs.nix_2_4;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-   };
-
-  networking.hostName = "miniding"; # Define your hostname.
-  networking.networkmanager.enable = true;
-  programs.nm-applet.enable = true;
-
-  # Set time zone.
-  time.timeZone = "Europe/London";
-
-  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
-  # Per-interface useDHCP will be mandatory in the future, so this generated config
-  # replicates the default behaviour.
-  networking.useDHCP = false;
-  networking.interfaces.wlp2s0.useDHCP = true;
-
-  console = {
-    useXkbConfig = true;
+  networking = {
+    hostName = "miniding";
+    interfaces.wlp2s0.useDHCP = true;
   };
 
   # Enable the X11 windowing system.
   services.xserver = {
-    enable = true;
-    layout = "gb";
-
-    libinput = {
-      enable = true;
-    };
-
-    displayManager = {
-      gdm.enable = true;
-    };
-
-    windowManager.i3.enable = true;
-
+    dpi = 144;
   };
   
-
-  # Enable sound.
-  sound = {
-    enable = true;
-
-    mediaKeys = {
-      enable = true;
-
-      volumeStep = "2";
-    };
-  };
-
-  hardware.pulseaudio.enable = true;
-
-  hardware.opengl.driSupport32Bit = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.daniel = {
-    isNormalUser = true;
-    home = "/home/daniel";
-    initialPassword = "password";
-    extraGroups = [ "wheel" "networkmanager" ]; # Enable ‘sudo’ for the user.
-    shell = pkgs.zsh;
-  };
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    curl
-    fd
-    firefox
-    git
-    i3
-    ripgrep
-    wget
-    zsh
-  ];
-
-  environment.homeBinInPath = true;
-  
-  programs.zsh = {
-    enable = true;
-    ohMyZsh = {
-      enable = true;
-      plugins = [ "git" "fzf" ];
-      theme = "agnoster";
-    };
-  };
-
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "21.05"; # Did you read the comment?
-
 }