From 12ee3af03e81487b55f52de53187274317a0bc46 Mon Sep 17 00:00:00 2001 From: iFargle Date: Sat, 23 Sep 2023 22:32:23 +0900 Subject: [PATCH] Update folder structure --- README.md | 13 +++--- docs/complete.md | 4 +- docs/setup.sh | 3 +- .../wlogout/hibernate.png | Bin .../{_default => default}/wlogout/lock.png | Bin .../{_default => default}/wlogout/logout.png | Bin .../{_default => default}/wlogout/reboot.png | Bin .../wlogout/shutdown.png | Bin .../{_default => default}/wlogout/suspend.png | Bin .../hyprland/gruvbox/wlogout-conf.nix | 12 ++--- nixos/hosts/nixos-vm-02/disks-ext4.nix | 41 ------------------ 11 files changed, 17 insertions(+), 56 deletions(-) rename home-manager/common/desktops/hyprland/{_default => default}/wlogout/hibernate.png (100%) rename home-manager/common/desktops/hyprland/{_default => default}/wlogout/lock.png (100%) rename home-manager/common/desktops/hyprland/{_default => default}/wlogout/logout.png (100%) rename home-manager/common/desktops/hyprland/{_default => default}/wlogout/reboot.png (100%) rename home-manager/common/desktops/hyprland/{_default => default}/wlogout/shutdown.png (100%) rename home-manager/common/desktops/hyprland/{_default => default}/wlogout/suspend.png (100%) delete mode 100644 nixos/hosts/nixos-vm-02/disks-ext4.nix diff --git a/README.md b/README.md index b5a83a37..a04a1d7a 100644 --- a/README.md +++ b/README.md @@ -6,16 +6,18 @@ ``` nixos-install [] ``` +* 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 [] * [ ] 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 snapshotsd +* [ ] btrfs snapshots? * [ ] 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 diff --git a/docs/complete.md b/docs/complete.md index 13ab9ed7..e093b756 100644 --- a/docs/complete.md +++ b/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 \ No newline at end of file +* [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) \ No newline at end of file diff --git a/docs/setup.sh b/docs/setup.sh index ead570f9..795d5b6a 100755 --- a/docs/setup.sh +++ b/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 diff --git a/home-manager/common/desktops/hyprland/_default/wlogout/hibernate.png b/home-manager/common/desktops/hyprland/default/wlogout/hibernate.png similarity index 100% rename from home-manager/common/desktops/hyprland/_default/wlogout/hibernate.png rename to home-manager/common/desktops/hyprland/default/wlogout/hibernate.png diff --git a/home-manager/common/desktops/hyprland/_default/wlogout/lock.png b/home-manager/common/desktops/hyprland/default/wlogout/lock.png similarity index 100% rename from home-manager/common/desktops/hyprland/_default/wlogout/lock.png rename to home-manager/common/desktops/hyprland/default/wlogout/lock.png diff --git a/home-manager/common/desktops/hyprland/_default/wlogout/logout.png b/home-manager/common/desktops/hyprland/default/wlogout/logout.png similarity index 100% rename from home-manager/common/desktops/hyprland/_default/wlogout/logout.png rename to home-manager/common/desktops/hyprland/default/wlogout/logout.png diff --git a/home-manager/common/desktops/hyprland/_default/wlogout/reboot.png b/home-manager/common/desktops/hyprland/default/wlogout/reboot.png similarity index 100% rename from home-manager/common/desktops/hyprland/_default/wlogout/reboot.png rename to home-manager/common/desktops/hyprland/default/wlogout/reboot.png diff --git a/home-manager/common/desktops/hyprland/_default/wlogout/shutdown.png b/home-manager/common/desktops/hyprland/default/wlogout/shutdown.png similarity index 100% rename from home-manager/common/desktops/hyprland/_default/wlogout/shutdown.png rename to home-manager/common/desktops/hyprland/default/wlogout/shutdown.png diff --git a/home-manager/common/desktops/hyprland/_default/wlogout/suspend.png b/home-manager/common/desktops/hyprland/default/wlogout/suspend.png similarity index 100% rename from home-manager/common/desktops/hyprland/_default/wlogout/suspend.png rename to home-manager/common/desktops/hyprland/default/wlogout/suspend.png diff --git a/home-manager/common/desktops/hyprland/gruvbox/wlogout-conf.nix b/home-manager/common/desktops/hyprland/gruvbox/wlogout-conf.nix index 678482d3..34fa4fc6 100644 --- a/home-manager/common/desktops/hyprland/gruvbox/wlogout-conf.nix +++ b/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"); } ''; }; diff --git a/nixos/hosts/nixos-vm-02/disks-ext4.nix b/nixos/hosts/nixos-vm-02/disks-ext4.nix deleted file mode 100644 index 929e7bdc..00000000 --- a/nixos/hosts/nixos-vm-02/disks-ext4.nix +++ /dev/null @@ -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 \ No newline at end of file