dotfiles

commit 58af08b9fb7283a33f0ec3acc643bfe7f50dab3e
parent 660f873205dbbb18a2e84a8fcb1ff962ee275126
Author: maydayv7 <maydayv7@gmail.com>
Date:   Fri,  1 Dec 2023 18:17:03 +0530

docs: Update images

Also expose `lib.hm` in toplevel `lib`

Diffstat:

7 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/README.md b/README.md
@@ -8,10 +8,19 @@
 
 This [repository](https://github.com/maydayv7/dotfiles) contains the configuration and `dotfiles` for my continuously evolving multi-PC setup (using [Nix](https://nixos.org/)). All the devices I own, controlled by code. It also builds and deploys my website to [maydayv7.tk](https://maydayv7.tk). You can follow along with my [NixOS Desktop](https://maydayv7.tk/series/nixos-desktop/) Series
 
-[![GNOME Desktop](./files/images/desktop/gnome.png)](https://www.reddit.com/r/unixporn/comments/ssb7mf/gnome_my_dream/)
+![GNOME Desktop](./files/images/desktop/gnome.png)
+
+<details>
+<summary><i>More...</i></summary>
 
 ![XFCE Desktop](./files/images/desktop/xfce.png)
 
+![GNOME 44](./files/images/desktop/old/gnome_44.png)
+
+[![GNOME 41](./files/images/desktop/old/gnome_41.png)](https://www.reddit.com/r/unixporn/comments/ssb7mf/gnome_my_dream/)
+
+</details>
+
 ## Features
 
 <img alt="Built with Nix" src="https://raw.githubusercontent.com/nix-community/builtwithnix.org/62897617ceefe428f135e82c3a87ea093e29e045/img/built_with_nix.svg" width="130" height="50"/>
diff --git a/files/images/desktop/gnome.png b/files/images/desktop/gnome.png
Binary files differ.
diff --git a/files/images/desktop/old/gnome_41.png b/files/images/desktop/old/gnome_41.png
Binary files differ.
diff --git a/files/images/desktop/gnome.png b/files/images/desktop/old/gnome_44.png
Binary files differ.
diff --git a/modules/apps/discord.nix b/modules/apps/discord.nix
@@ -13,22 +13,18 @@ in {
 
     user = {
       persist.directories = [".config/BetterDiscord" ".config/discord"];
-      home = {
+      home.home = {
         # Plugins
-        home.file.".config/BetterDiscord/plugins" = {
+        file.".config/BetterDiscord/plugins" = {
           source = files.proprietary.discord;
           recursive = true;
         };
 
         # Discord Activation
-        imports = [
-          ({lib, ...}: {
-            home.activation.discordSetup = lib.hm.dag.entryAfter ["writeBoundary"] ''
-              echo "Setting up Discord..."
-              $DRY_RUN_CMD /usr/bin/env betterdiscordctl $VERBOSE_ARG install || true
-            '';
-          })
-        ];
+        activation.discordSetup = lib.hm.dag.entryAfter ["writeBoundary"] ''
+          echo "Setting up Discord..."
+          $DRY_RUN_CMD /usr/bin/env betterdiscordctl $VERBOSE_ARG install || true
+        '';
       };
     };
   };
diff --git a/modules/configuration.nix b/modules/configuration.nix
@@ -6,7 +6,7 @@
   util = self.lib;
   inherit (self) files;
 
-  inherit (lib) extend fileContents makeOverridable mkIf;
+  inherit (lib) fileContents makeOverridable mkIf;
   inherit
     (builtins)
     attrValues
@@ -73,7 +73,10 @@ in {
     ## Device Configuration ##
       (makeOverridable lib.nixosSystem) {
         inherit system;
-        specialArgs = {inherit system util inputs files;};
+        specialArgs = {
+          inherit system util inputs files;
+          lib = with inputs; nixpkgs.lib // {inherit (home.lib) hm;};
+        };
 
         modules = [
           {
diff --git a/modules/user/home.nix b/modules/user/home.nix
@@ -1,5 +1,6 @@
 {
   config,
+  lib,
   pkgs,
   ...
 }: {
@@ -14,16 +15,7 @@
     };
 
     user.home = {
-      imports = [
-        ../../users
-
-        # Package Delta
-        ({lib, ...}: {
-          home.activation.delta = lib.hm.dag.entryAnywhere ''
-            ${pkgs.nvd}/bin/nvd diff $oldGenPath $newGenPath
-          '';
-        })
-      ];
+      imports = [../../users];
 
       # Package Configuration
       home = {
@@ -33,6 +25,11 @@
           ".config/nix/nix.conf".source =
             config.environment.etc."nix/nix.conf".source;
         };
+
+        # Package Delta
+        activation.delta = lib.hm.dag.entryAnywhere ''
+          ${pkgs.nvd}/bin/nvd diff $oldGenPath $newGenPath
+        '';
       };
     };
   };