From 27d4fcd8642a53e3eb8b039487ce06394856fb09 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Sat, 27 Apr 2024 20:12:26 +0200
Subject: [PATCH 1/2] configuration/common: Reorganize default programs

---
 configuration/common/programs.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/configuration/common/programs.nix b/configuration/common/programs.nix
index b37a656..85adaa8 100644
--- a/configuration/common/programs.nix
+++ b/configuration/common/programs.nix
@@ -3,14 +3,23 @@
 {
 
   environment.systemPackages = with pkgs; [
+    # My system is fucked
     gptfdisk
-    htop
     parted
+
+    # Normal usage
+    htop
     tmux
+    vim
+
+    # Deployment
     bij
     colmena
-    vim
     agenix
+    clerie-sops
+    sops
+
+    # Debugging
     jq
     curl
   ];
@@ -18,7 +27,6 @@
   programs.mtr.enable = true;
 
   programs.git.enable = true;
-
   programs.git.config = {
     user = {
       name = "clerie";

From f47c1ae001e2a28abf19f7604dd201f99dccafec Mon Sep 17 00:00:00 2001
From: Flake Update Bot <flake-update-bot@clerie.de>
Date: Sun, 28 Apr 2024 03:03:03 +0200
Subject: [PATCH 2/2] Update nixpkgs 2024-04-28-01-03

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index ac3e4da..79a14db 100644
--- a/flake.lock
+++ b/flake.lock
@@ -283,11 +283,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1712963716,
-        "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
+        "lastModified": 1714076141,
+        "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
+        "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
         "type": "github"
       },
       "original": {