From f85ef16b427c62cd3b86e2bbaaf238be9ae83884 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Tue, 12 Dec 2023 18:59:06 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=A6=EF=B8=8F=20rework=20some=20base=20?=
 =?UTF-8?q?packages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flake.lock               | 24 ++++++++++++------------
 modules/base/common.nix  |  9 ++++++++-
 modules/base/default.nix |  7 +------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/flake.lock b/flake.lock
index 18e55ea..c05fb00 100644
--- a/flake.lock
+++ b/flake.lock
@@ -30,11 +30,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1702302389,
-        "narHash": "sha256-T+R3vX31dQH/qb+ojf/rGrOVbY6/fR9X6H+hb0nEnHw=",
+        "lastModified": 1702378423,
+        "narHash": "sha256-tuJ8NWjaH/OuZSZukS6T+suia7E1QIPXW2nzkuUCCNA=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "514fa3bc3d24fa85f338fa6a8247ca7e116ab9de",
+        "rev": "2ccd5d9939d41ac797c3ce769a689fdbc76fdebb",
         "type": "github"
       },
       "original": {
@@ -216,11 +216,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1702203126,
-        "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=",
+        "lastModified": 1702423270,
+        "narHash": "sha256-3ZA5E+b2XBP+c9qGhWpRApzPq/PZtIPgkeEDpTBV4g8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883",
+        "rev": "d9297efd3a1c3ebb9027dc68f9da0ac002ae94db",
         "type": "github"
       },
       "original": {
@@ -267,11 +267,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1702245580,
-        "narHash": "sha256-tTVRB42Ljo2uWGP7ei5h5/qQjOsdXoz0GHRy9hrVrdw=",
+        "lastModified": 1702336390,
+        "narHash": "sha256-BRO8J8QbmyuS0XMh4UfY11akgTGZj1YhkqNvR83JrsI=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "030edbb68e69f2b97231479f98a9597024650df2",
+        "rev": "fef05bf9c8e818f4ca1425ef4c18e6680becd072",
         "type": "github"
       },
       "original": {
@@ -331,11 +331,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1702206697,
-        "narHash": "sha256-vE9oEx3Y8TO5MnWwFlmopjHd1JoEBno+EhsfUCq5iR8=",
+        "lastModified": 1702272962,
+        "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "29d6c96900b9b576c2fb89491452f283aa979819",
+        "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
         "type": "github"
       },
       "original": {
diff --git a/modules/base/common.nix b/modules/base/common.nix
index 7084955..a83f72b 100644
--- a/modules/base/common.nix
+++ b/modules/base/common.nix
@@ -1,6 +1,13 @@
-_:
+{ pkgs, ... }:
 
 {
+  environment.systemPackages = with pkgs; [
+    dogdns
+    htop
+    inetutils
+    vim
+  ];
+
   nix = {
     extraOptions = ''
       experimental-features = nix-command flakes
diff --git a/modules/base/default.nix b/modules/base/default.nix
index 72cf53d..f542b86 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -1,12 +1,7 @@
-{ pkgs, ... }: {
+_: {
 
   imports = [ ./common.nix ];
 
-  environment.systemPackages = with pkgs; [
-    inetutils
-    vim
-  ];
-
   nix = {
     gc = {
       persistent = true;