dotfiles

commit 73d415ede60509da3da2b82d634745ea58019d0b
parent f7bf03c6a1cd2a9b7f417f5719db3c16250b64c0
Author: maydayv7 <maydayv7@gmail.com>
Date:   Mon,  4 Dec 2023 21:38:54 +0530

fix: Fix `path.system` Permissions

Also modify file scheme

Diffstat:

9 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/README.md b/README.md
@@ -36,7 +36,6 @@ This [repository](https://github.com/maydayv7/dotfiles) contains the configurati
 - Supports multiple users and devices
 - Configuration for multiple Desktop Environments
 - Incorporates PipeWire, Wayland, ...!
-- Interactive [`repl`](./repl.nix) to explore syntax and configuration
 - Automatically builds and deploys my [Website](./site)
 - Authentication Credentials Management using the [`sops`](https://github.com/Mic92/sops-nix) Module and [`gnupg`](https://gnupg.org/) Keys
 - Comprehensive User Configuration using the tightly integrated [`home-manager`](https://github.com/nix-community/home-manager) module, with [support](./modules/user/default.nix) for configuring shared user configuration, global conditionals and user-specific configuration
@@ -140,7 +139,6 @@ github:maydayv7/dotfiles
 ├── secrets
 ├── shells
 ├── site
-├── repl.nix
 ├── users
 ├── devices
 │   ├── systems.nix
@@ -172,7 +170,6 @@ github:maydayv7/dotfiles
 - [`secrets`](./secrets/README.md): authentication credentials management using [`sops-nix`](https://github.com/Mic92/sops-nix)
 - `shells`: sand-boxed shells for development purposes
 - [`site`](./site/README.md): personal website generated using [`zola`](https://www.getzola.org/)
-- `repl.nix`: interactive shell to explore syntax and configuration
 - [`users`](./users/README.md): individual user-specific configuration
 - [`devices`](./devices/README.md): system configuration for various devices
 - `systems.nix`: list of supported system architectures
diff --git a/files/README.md b/files/README.md
@@ -15,6 +15,7 @@ The `files` directory is used to store all my plain-text program configuration f
 - [`neofetch`](./neofetch) - `neofetch` CLI Theming
 - [`plank`](./plank) - `plank` Dock Theming
 - [`proprietary`](https://github.com/maydayv7/proprietary) - Custom Proprietary Files
+- [`repl.nix`](./repl.nix): Interactive Nix Shell to explore syntax and configuration
 - [`templates`](./templates) - Document Templates
 - [`vscode`](./vscode) - Visual Studio Code Editor Configuration
 - [`wine`](./wine) - Configuration and Theming for `wine` applications
diff --git a/files/flake.nix b/files/flake.nix
@@ -69,7 +69,7 @@
     nano = readFile ./nano/nanorc;
 
     # Interactive Nix Shell
-    repl = ../repl.nix;
+    repl = ./repl.nix;
 
     # Bash Scripts
     scripts = map.files ../scripts build.script ".sh";
diff --git a/repl.nix b/files/repl.nix
diff --git a/flake.lock b/flake.lock
@@ -297,11 +297,11 @@
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
         "type": "github"
       },
       "original": {
diff --git a/modules/apps/git/default.nix b/modules/apps/git/default.nix
@@ -79,8 +79,12 @@
 
             # Additional Parameters
             extraConfig = {
+              core = {
+                hooksPath = "~/.git-hooks";
+                fileMode = "false";
+              };
+
               color.ui = "auto";
-              core.hooksPath = "~/.git-hooks";
               credential.helper = "libsecret";
               diff.colorMoved = "default";
               init.defaultBranch = "main";
diff --git a/modules/hardware/filesystem.nix b/modules/hardware/filesystem.nix
@@ -147,15 +147,18 @@ in {
         };
 
         # Persisted Files
+        system.activationScripts.dotfiles = let
+          dir = with files; "${persist}/${path.system}";
+        in ''
+          chown root:keys ${dir}
+          chmod 774 -R ${dir}
+        '';
+
         environment.persistence = {
           "${files.persist}" = {
             files = ["/etc/machine-id"];
             directories = [
-              {
-                directory = "/etc/nixos";
-                group = "keys";
-                mode = "774";
-              }
+              files.path.system
               "/var/log"
               "/var/lib/AccountsService"
               "/var/lib/nixos"
diff --git a/netlify.toml b/netlify.toml
@@ -5,6 +5,6 @@ export NP_GIT=$(which git)
 wget -nv https://github.com/DavHau/nix-portable/releases/latest/download/nix-portable
 chmod +x nix-portable
 ./nix-portable nix flake update systems
-./nix-portable nix build --impure --expr "with import ./.; callPackage ./site { site = ${DEPLOY_PRIME_URL}; }"
+./nix-portable nix build --impure --expr "with import ./packages; callPackage ./site { site = ${DEPLOY_PRIME_URL}; }"
 ./nix-portable nix shell nixpkgs#bash -c "bash" -c "cp -rL result build"
 """
diff --git a/default.nix b/packages/default.nix