Update folder structure

README.md

@@ -6,16 +6,18 @@
 ```
 nixos-install <Hostname> [<Username>]
 ```
+* Post install:
+```
+nix develop -c /etc/nixos/git/docs/setup.sh
+```
 
 ![Gruv'd Hyprland](./screenshot.png "Hyprland with a Gruvboxy theme")
 ---
 # To Do List
+* [ ] Look into hosting a binary cache locally - [Link](https://nixos.wiki/wiki/Binary_Cache)
 * [ ] vscode / emacs
   * Add the nix lsp - [Link](https://github.com/nix-community/rnix-lsp)
-* [ ] Automated ISO Creation
-  * Forgejo Actions
 * [ ] Fix Grafana
-* [x] Look into `nix develop` - [Link](https://zero-to-nix.com/concepts/nix#unified-cli)
 * [ ] Build a better dashboard to monitor all my nixified devices
 * [ ] Look into Remote Builds - [Link](https://nixos.org/manual/nix/stable/advanced-topics/distributed-builds.html)
 * [ ] Find a way to remove all default search engines in Firefox (Google, Amazon, etc)
@@ -27,8 +29,7 @@ nixos-install <Hostname> [<Username>]
 * [ ] emacs
   * [ ] Add bracket auto-completion
   * [ ] Find a way to have magit save login credentials
-* [x] Try disko - [Link](https://github.com/nix-community/disko)
+* [ ] btrfs snapshots?
-* [ ] btrfs snapshotsd
 * [ ] vscodium and user-config.js file?
 * [ ] rofi - bitwarden-cli / bitwarden-menu ([Link](https://search.nixos.org/packages?channel=23.05&show=bitwarden-menu&from=0&size=50&sort=relevance&type=packages&query=bitwarden))
 
@@ -42,7 +43,7 @@ Completed ToDo List [here](docs/complete.md)
 │   ├── common
 │   │   ├── desktops
 │   │   │   └── hyprland
-│   │   │       ├── _default
+│   │   │       ├── default
 │   │   │       │   └── wlogout
 │   │   │       └── gruvbox
 │   │   └── software

docs/complete.md

@@ -57,4 +57,6 @@
   * [x] Set up Tailscale with pre-auth keys (services.tailscale.authKeyFile, add the key to secrets/secrets.yaml)
     * `${hostname}-tailscale-key`
   * [x] Set up sops and gpg
-* [x] Configure GameMode / Gamescope
+* [x] Configure GameMode / Gamescope
+* [x] Try disko - [Link](https://github.com/nix-community/disko)
+* [x] Look into `nix develop` - [Link](https://zero-to-nix.com/concepts/nix#unified-cli)

docs/setup.sh

@@ -1,10 +1,9 @@
 #!/usr/bin/env bash
-
+pushd /etc/nixos/git
 
 # Home-Manager Setup
 echo "Setting up Home Manager..... "
 sudo mkdir /nix/var/nix/profiles/per-user/albert
-pushd /etc/nixos/git
 home-manager switch -b backup --flake /etc/nixos/git
 source ~/.bashrc
 

home-manager/common/desktops/hyprland/gruvbox/wlogout-conf.nix

@@ -70,22 +70,22 @@
             }
 
             #lock { 
-                background-image: url("/etc/nixos/git/home-manager/common/desktops/hyprland/_default/wlogout/lock.png");
+                background-image: url("/etc/nixos/git/home-manager/common/desktops/hyprland/default/wlogout/lock.png");
             }
             #logout { 
-                background-image: url("/etc/nixos/git/home-manager/common/desktops/hyprland/_default/wlogout/logout.png");
+                background-image: url("/etc/nixos/git/home-manager/common/desktops/hyprland/default/wlogout/logout.png");
             }
             #suspend { 
-                background-image: url("/etc/nixos/git/home-manager/common/desktops/hyprland/_default/wlogout/suspend.png");
+                background-image: url("/etc/nixos/git/home-manager/common/desktops/hyprland/default/wlogout/suspend.png");
             }
             #hibernate { 
-                background-image: url("/etc/nixos/git/home-manager/common/desktops/hyprland/_default/wlogout/hibernate.png");
+                background-image: url("/etc/nixos/git/home-manager/common/desktops/hyprland/default/wlogout/hibernate.png");
             }
             #shutdown { 
-                background-image: url("/etc/nixos/git/home-manager/common/desktops/hyprland/_default/wlogout/shutdown.png");
+                background-image: url("/etc/nixos/git/home-manager/common/desktops/hyprland/default/wlogout/shutdown.png");
             }
             #reboot { 
-                background-image: url("/etc/nixos/git/home-manager/common/desktops/hyprland/_default/wlogout/reboot.png");
+                background-image: url("/etc/nixos/git/home-manager/common/desktops/hyprland/default/wlogout/reboot.png");
             }
         '';
     };

nixos/hosts/nixos-vm-02/disks-ext4.nix

@@ -1,41 +0,0 @@
-{
-  boot.loader.grub.device = "/dev/sda";
-  boot.initrd.luks.devices."sda2".device = "/dev/sda2";
-
-  disko.devices.disk.sda = {
-    device = "/dev/sda";
-    content = {
-      type = "table";
-      format = "gpt";
-      partitions = [ 
-        {
-          name = "BOOT";
-          start = "0%";
-          end = "550MiB";
-          bootable = true;
-          flags = [ "esp" ];
-          fs-type = "fat32";
-          content = {
-            type = "filesystem";
-            format = "vfat";
-            mountpoint = "/boot";
-          };
-        } # partition 1
-        { 
-          name = "LUKS";
-          start = "550MiB";
-          end = "100%";
-          content = {
-            type = "luks";
-            name = "ROOT";
-            content = {
-              type = "filesystem";
-              format = "ext4";
-              mountpoint = "/";
-            }; # content.content
-          }; # content
-        } # partition 2
-      ]; # partitions
-    }; # content
-  }; # disko.devices.disk.sda
-} # root