dotfiles

commit cb30147048b6274f6192ecf12de3257c18c69a1d
parent cf6cdf561b35981a7ed2716ce8f0bbae377f141e
Author: maydayv7 <maydayv7@gmail.com>
Date:   Fri,  9 Feb 2024 13:14:58 +0530

fix: `install` Script

Also reference `systems` as a branch rather than a relative input to circumvent some bugs

Diffstat:

10 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -50,7 +50,5 @@ jobs:
         with:
           name: maydayv7-dotfiles
           authToken: "${{ secrets.CACHIX_TOKEN }}"
-      - name: Fix Relative Flake Inputs
-        run: nix flake update systems
       - name: Build Configuration
         run: nix build .#nixosConfigurations.${{ matrix.device }}.config.system.build.toplevel -L --show-trace
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -32,7 +32,5 @@ jobs:
             experimental-features = nix-command flakes
             accept-flake-config = true
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-      - name: Fix Relative Flake Inputs
-        run: nix flake update systems
       - name: Check Syntax
         run: nix flake check . --keep-going
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,8 +21,6 @@ jobs:
             experimental-features = nix-command flakes
             accept-flake-config = true
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-      - name: Fix Relative Flake Inputs
-        run: nix flake update systems
       - name: Build Default Install Media
         run: nix build .#installMedia.default.config.system.build.isoImage -L --show-trace
       - name: Draft Release
diff --git a/.github/workflows/shell.yml b/.github/workflows/shell.yml
@@ -29,7 +29,5 @@ jobs:
         with:
           name: maydayv7-dotfiles
           authToken: "${{ secrets.CACHIX_TOKEN }}"
-      - name: Fix Relative Flake Inputs
-        run: nix flake update systems
       - name: Check Shells
         run: nix develop .#${{ matrix.shell }}
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -22,8 +22,6 @@ jobs:
             experimental-features = nix-command flakes
             accept-flake-config = true
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-      - name: Fix Relative Flake Inputs
-        run: nix flake update systems
       - name: Update Flake Lock File
         uses: DeterminateSystems/update-flake-lock@v20
         with:
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -22,8 +22,6 @@ jobs:
             experimental-features = nix-command flakes
             accept-flake-config = true
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-      - name: Fix Relative Flake Inputs
-        run: nix flake update systems
       - name: Build Zola Site
         run: nix build .#website
       - name: Deploy to GitHub Pages
diff --git a/flake.lock b/flake.lock
@@ -968,14 +968,18 @@
     "systems_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-yJg569/Wc8hgG64XgA72/nLsZthk+InI5N+Hhmcc+kA=",
-        "path": "devices/systems.nix",
-        "type": "path"
+        "lastModified": 1707463813,
+        "narHash": "sha256-qUyPFG6yjwI4b3wya7aEFDYSIxf1fZeapi0dF46+pAk=",
+        "owner": "maydayv7",
+        "repo": "dotfiles",
+        "rev": "5d24bade1fb3e0186e28a33908519f65ec774c2d",
+        "type": "github"
       },
       "original": {
-        "path": "devices/systems.nix",
-        "type": "path"
+        "owner": "maydayv7",
+        "ref": "systems",
+        "repo": "dotfiles",
+        "type": "github"
       }
     },
     "systems_3": {
diff --git a/flake.nix b/flake.nix
@@ -72,7 +72,7 @@
     ## Language Addendum
     # Supported Architectures
     systems = {
-      url = "path:devices/systems.nix";
+      url = "github:maydayv7/dotfiles?ref=systems";
       flake = false;
     };
 
diff --git a/modules/gui/desktop/hyprland/settings/keybindings.nix b/modules/gui/desktop/hyprland/settings/keybindings.nix
@@ -6,7 +6,7 @@ _: {
       [
         # Compositor Commands
         "$mod, Q, killactive,"
-        "$mod, I, pin"
+        "$mod, P, pin"
         "$mod, M, fullscreen, 1"
         "$mod SHIFT, M, fullscreen,"
         "ALT, Q, hych:minimize"
@@ -31,8 +31,8 @@ _: {
         "$mod SHIFT, Tab, changegroupactive, b"
 
         # Floating Mode
-        "$mod, O, togglefloating,"
-        "$mod, P, workspaceopt, allfloat"
+        "$mod, semicolon, togglefloating,"
+        "$mod, apostrophe, workspaceopt, allfloat"
         "$mod, C, centerwindow"
 
         # Window Switcher
diff --git a/scripts/install.nix b/scripts/install.nix
@@ -62,6 +62,7 @@ with files.path; let
       mount -t zfs fspool/system/root /mnt
       mkdir -p /mnt/{nix,data}
       mount -t zfs fspool/system/nix /mnt/nix
+      mkdir -p /mnt/nix/state
       mount -t zfs fspool/data /mnt/data
     }
 
@@ -140,6 +141,7 @@ in
       newline
 
       mount_other
+      systemd-machine-id-setup --root=/mnt
       newline
 
       read -rp "Enter Path to Repository (path/URL): " URL
@@ -155,6 +157,7 @@ in
       newline
 
       info "Run 'nixos setup' after rebooting to finish the install"
+      info "Select the (Recovery) boot menu option and run the above script as the 'recovery' user"
       restart
     '';
   })