From b616da4a06c705762987f34aa5c759cb52c72598 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Sat, 16 Dec 2023 16:12:13 +0100
Subject: [PATCH] show configuration diffs add formatting for nix and elixir

---
 flake.lock                      | 34 ++++++++++++++++-----------------
 home-manager/neovim/default.nix |  1 +
 home-manager/neovim/none-ls.lua |  2 ++
 nixos/default.nix               | 22 +++++++++++++++++++--
 4 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/flake.lock b/flake.lock
index b9cc240..2f81c87 100644
--- a/flake.lock
+++ b/flake.lock
@@ -11,11 +11,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696775529,
-        "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
+        "lastModified": 1701216516,
+        "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4",
+        "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247",
         "type": "github"
       },
       "original": {
@@ -53,8 +53,8 @@
         ]
       },
       "locked": {
-        "lastModified": 1700814205,
-        "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
+        "lastModified": 1702195709,
+        "narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=",
         "type": "tarball",
         "url": "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz"
       },
@@ -85,11 +85,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1700559156,
-        "narHash": "sha256-gL4epO/qf+wo30JjC3g+b5Bs8UrpxzkhNBBsUYxpw2g=",
+        "lastModified": 1702336390,
+        "narHash": "sha256-BRO8J8QbmyuS0XMh4UfY11akgTGZj1YhkqNvR83JrsI=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c3abafb01cd7045dba522af29b625bd1e170c2fb",
+        "rev": "fef05bf9c8e818f4ca1425ef4c18e6680becd072",
         "type": "github"
       },
       "original": {
@@ -101,11 +101,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701389149,
-        "narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=",
+        "lastModified": 1702233072,
+        "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5de0b32be6e85dc1a9404c75131316e4ffbc634c",
+        "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348",
         "type": "github"
       },
       "original": {
@@ -117,11 +117,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1701040486,
-        "narHash": "sha256-vawYwoHA5CwvjfqaT3A5CT9V36Eq43gxdwpux32Qkjw=",
+        "lastModified": 1702272962,
+        "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "45827faa2132b8eade424f6bdd48d8828754341a",
+        "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
         "type": "github"
       },
       "original": {
@@ -133,11 +133,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1700923974,
-        "narHash": "sha256-3SWdqep5XzFEuK+5iJkDe/mTIvidS3Gs47W/DVXuRnE=",
+        "lastModified": 1702408331,
+        "narHash": "sha256-wUO8C8LoQv31udnmWsp9FSR2QSdazM50ltJrhuShQJw=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "2644c4a32642a32ea01dc63fd780404c21c82d7a",
+        "rev": "82d6c2887abbcc767962134c212b2b766390f7c7",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix
index 29c0f68..8686368 100644
--- a/home-manager/neovim/default.nix
+++ b/home-manager/neovim/default.nix
@@ -17,6 +17,7 @@
         nixfmt
         stylua
         black
+        nixpkgs-fmt
       ];
 
       plugins = with pkgs.vimPlugins; [
diff --git a/home-manager/neovim/none-ls.lua b/home-manager/neovim/none-ls.lua
index 47d76a2..1840b2d 100644
--- a/home-manager/neovim/none-ls.lua
+++ b/home-manager/neovim/none-ls.lua
@@ -15,6 +15,8 @@ require("null-ls").setup({
 	sources = {
 		formatting.stylua,
 		formatting.black,
+		formatting.nixpkgs_fmt,
+		formatting.mix,
 	},
 
 	-- configure format on save
diff --git a/nixos/default.nix b/nixos/default.nix
index 6694d59..7822e83 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -39,7 +39,17 @@
   };
 
   environment = {
-    systemPackages = with pkgs; [ wget curl git btop ripgrep vim dogdns tree dig ];
+    systemPackages = with pkgs; [
+      wget
+      curl
+      git
+      btop
+      ripgrep
+      vim
+      dogdns
+      tree
+      dig
+    ];
     gnome.excludePackages = with pkgs; [
       gnome.totem
       gnome-tour
@@ -50,7 +60,15 @@
     ];
   };
 
-  system.stateVersion = "23.05";
+  system = {
+    stateVersion = "23.05";
+
+    activationScripts.diff = ''
+      if [[ -e  /run/current-system ]]; then
+        ${pkgs.nix}/bin/nix store diff-closures /run/current-system "$systemConfig"
+      fi
+    '';
+  };
 
   programs.ssh = {
     startAgent = true;