Merge pull request #104 from erictossell/swww

swww

README.md

@@ -11,42 +11,51 @@ So anyways. Here's my dots. I hope you like them.
 There are many paths to the top of the mountain, but the view is always the same.
 ```
 
-[How to use this repo](docs/usage.md)
+<details>
+<summary> 📚 Docs </summary>
+
+[Why Nix and NixOS](docs/why-nix.md)
 
 [Getting Started with NixOS Minimal](docs/minimal-install.md)
 
-[Why Nix and NixOS](docs/why-nix.md)
+[How to use this repo](docs/usage.md)
+
+[NixOS as a Hypervisor](docs/hypervisor.md)
+
+[Keybindings Implemented by this Configuration](docs/keybinds.md) 
 
-Got questions? Send them in the form of an [issue](https://github.com/erictossell/nixflakes/issues/new) or reach me at any of my other points of contact available on my [GitHub Profile](https://github.com/erictossell) - I make no guarantees but I'm happy to do my best.
+If you have questions you are welcome to send them in the form of an [issue](https://github.com/erictossell/nixflakes/issues/new) or reach me at any of my other points of contact available on my [GitHub Profile](https://github.com/erictossell) - I make no guarantees but I'm happy to do my best.
+
+</details>
 
 <details>
 <summary>📁 What is in this repo?</summary>
 
-#### 1. A [modular](https://github.com/erictossell/nixflakes/blob/main/docs/screens/FlakeStructure9.png) (opinionated) Configuration Structure
+1. A [modular](https://github.com/erictossell/nixflakes/blob/main/docs/screens/FlakeStructure9.png) (opinionated) Configuration Structure
 
-#### 2. Flake templates - Quickly grab this configuration and make it your own with:
+2. Flake templates - Quickly grab this configuration and make it your own with:
 
 ```nix
 nix flake new -t github:erictossell/nixflakes ./<your-repo-name-here>
 ```
 
-#### 3. An interactive build script for adding new [`hosts`](https://github.com/erictossell/nixflakes/tree/main/hosts)/[`users`](https://github.com/erictossell/nixflakes/tree/main/users) at [`sh/build.sh`](https://github.com/erictossell/nixflakes/blob/main/sh/build.sh)
+3. An interactive build script for adding new [`hosts`](https://github.com/erictossell/nixflakes/tree/main/hosts)/[`users`](https://github.com/erictossell/nixflakes/tree/main/users) at [`sh/build.sh`](https://github.com/erictossell/nixflakes/blob/main/sh/build.sh)
 
-#### 4. [`eriixvim`](https://github.com/erictossell/eriixvim) - a fully reproducible neovim configuration built with [`nixvim`](https://github.com/nix-community/nixvim).
+4. [`eriixvim`](https://github.com/erictossell/eriixvim) - a fully reproducible neovim configuration built with [`nixvim`](https://github.com/nix-community/nixvim).
 
 Try it out with:
 
 ```nix
 nix run github:erictossell/eriixvim
 ```
 
-#### 5. A simple example of a custom built `rust` package: [`russh`](https://github.com/erictossell/russh). 
+5. A simple example of a custom built `rust` package: [`russh`](https://github.com/erictossell/russh). 
 
 The highlight being how simple it is to package any application with `flakes` and import them into a `configuration` and ***not*** my `rust` code.
 
-#### 6. Semi up-to-date diagrams of the [structure](https://github.com/erictossell/nixflakes/blob/main/docs/screens/FlakeStructure9.png) of this flake and the [configurations](https://github.com/erictossell/nixflakes/blob/main/docs/screens/FlakeProfiles9.png) managed by [me](https://github.com/erictossell).
+6. Semi up-to-date diagrams of the [structure](https://github.com/erictossell/nixflakes/blob/main/docs/screens/FlakeStructure9.png) of this flake and the [configurations](https://github.com/erictossell/nixflakes/blob/main/docs/screens/FlakeProfiles9.png) managed by [me](https://github.com/erictossell).
 
-#### 7. `nix flake show github:erictossell/nixflakes` 
+7. `nix flake show github:erictossell/nixflakes` 
 
 ```nix
 github:erictossell/nixflakes/bbca96ce85416b025d652d752c87d3816b2bf8ad
@@ -66,7 +75,7 @@ github:erictossell/nixflakes/bbca96ce85416b025d652d752c87d3816b2bf8ad
     └───default: template: The default template for Eriim's nixflakes.
 ```
 
-#### 8. [Nix CI/CD with Github Actions](https://github.com/erictossell/nixflakes/blob/main/.github/workflows/flake_check.yml) - Built with: [Cachix - Install Nix](https://github.com/cachix/install-nix-action), [Determiniate Systems - Flake Check](https://github.com/DeterminateSystems/flake-checker-action), [stefanzweifel - Commit Action](https://github.com/stefanzweifel/git-auto-commit-action), [statix](https://github.com/nerdypepper/statix), [nixpkgs-fmt](https://github.com/nix-community/nixpkgs-fmt)
+8. [Nix CI/CD with Github Actions](https://github.com/erictossell/nixflakes/blob/main/.github/workflows/flake_check.yml) - Built with: [Cachix - Install Nix](https://github.com/cachix/install-nix-action), [Determiniate Systems - Flake Check](https://github.com/DeterminateSystems/flake-checker-action), [stefanzweifel - Commit Action](https://github.com/stefanzweifel/git-auto-commit-action), [statix](https://github.com/nerdypepper/statix), [nixpkgs-fmt](https://github.com/nix-community/nixpkgs-fmt)
 
 </details>
 
@@ -84,11 +93,11 @@ This repo has become more opinionated over time and now requires passing down va
 
 ```nix
 Resolved URL:  git+file:///home/runner/work/nixflakes/nixflakes?shallow=1
-Locked URL:    git+file:///home/runner/work/nixflakes/nixflakes?ref=e79cc8ae1e1a1abbd76e892e8ad94b3a455f0de6&rev=e79cc8ae1e1a1abbd76e892e8ad94b3a455f0de6&shallow=1
+Locked URL:    git+file:///home/runner/work/nixflakes/nixflakes?ref=c485b07f581b9ada3e532ce4254422f41933fbed&rev=c485b07f581b9ada3e532ce4254422f41933fbed&shallow=1
 Description:   Eriim's machine specific configuration flake.
-Path:          /nix/store/61z69falf46fmr6413drpdpk72yhgvgn-source
-Revision:      e79cc8ae1e1a1abbd76e892e8ad94b3a455f0de6
-Last modified: 2024-02-21 21:18:32
+Path:          /nix/store/b3dykiivxsg1kxqzwg88dgvqj1k7sfc3-source
+Revision:      c485b07f581b9ada3e532ce4254422f41933fbed
+Last modified: 2024-02-22 18:50:43
 Inputs:
 ├───NixOS-WSL: github:nix-community/NixOS-WSL/e6bbc01a35626b8db741bcbc0af807379d372218
 │   ├───flake-compat: github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33
@@ -182,7 +191,7 @@ Inputs:
 ### Flake Outputs
 
 ```nix
-git+file:///home/runner/work/nixflakes/nixflakes?ref=e79cc8ae1e1a1abbd76e892e8ad94b3a455f0de6&rev=e79cc8ae1e1a1abbd76e892e8ad94b3a455f0de6&shallow=1
+git+file:///home/runner/work/nixflakes/nixflakes?ref=c485b07f581b9ada3e532ce4254422f41933fbed&rev=c485b07f581b9ada3e532ce4254422f41933fbed&shallow=1
 ├───devShells
 │   └───x86_64-linux
 │       └───default: development environment 'nix-shell'
@@ -207,9 +216,9 @@ git+file:///home/runner/work/nixflakes/nixflakes?ref=e79cc8ae1e1a1abbd76e892e8ad
 <details>
 <summary>📊 Diagrams</summary>
 
-![Flake Structure](docs/screens/FlakeStructure9.png)
+![Flake Structure](docs/screens/FlakeStructure10.png)
 
-![Flake Profiles](docs/screens/FlakeProfiles9.png)
+![Flake Profiles](docs/screens/FlakeProfiles10.png)
 
 </details> 
 

docs/keybinds.md

@@ -0,0 +1,38 @@
+### Hyprland Hotkeys
+
+| Key | Action |
+| --- | --- |
+|`Super + q` | Launch foot ina new window |
+|`Super + w` | Kill Window |
+|`Super + e` | Launch `thunar` in a new window |
+|`Super + r` | Launch Wofi |
+|`Super + t` | Open Tmux in a new window |
+|`Super + g` | Launch Firefox |
+|`Super + f` | Fullscreen window mode |
+|`Super + l` | Lock Screen |
+|`Super + s` | Take a Screenshot - Outputs to `~/Pictures/Screenshots` |
+|`Super + a` | Open Audio Controls |
+|`Super + o` | Toggle Waybar On/Off |
+|`Super + v` | Launch Neovim in a new Window |
+|`Super + 0` | Exit Hyprland |
+|`Super + p` | Psudeo window mode |
+|`Super + j` | Toggle split |
+|`Super + 1-9` | Workspace 1-9 |
+
+### Hyprland Mouse actions
+
+| Key | Action |
+| --- | --- |
+|`Super + Left Click` | Move Window |
+|`Super + Right Click` | Resize Window |
+
+### Bash Aliases
+
+Can be found here: [bash aliases](https://github.com/erictossell/nixflakes/blob/main/modules/core/terminal/bash/default.nix)
+
+
+### Eriixvim Keybindings
+
+Can be found here: [eriixvim keybindings](https://github.com/erictossell/eriixvim/blob/main/docs/keybinds.md)
+
+

docs/readme/footer.md

@@ -5,9 +5,9 @@
 <details>
 <summary>📊 Diagrams</summary>
 
-![Flake Structure](docs/screens/FlakeStructure9.png)
+![Flake Structure](docs/screens/FlakeStructure10.png)
 
-![Flake Profiles](docs/screens/FlakeProfiles9.png)
+![Flake Profiles](docs/screens/FlakeProfiles10.png)
 
 </details> 
 

docs/readme/header.md

@@ -11,42 +11,51 @@ So anyways. Here's my dots. I hope you like them.
 There are many paths to the top of the mountain, but the view is always the same.
 ```
 
-[How to use this repo](docs/usage.md)
+<details>
+<summary> 📚 Docs </summary>
+
+[Why Nix and NixOS](docs/why-nix.md)
 
 [Getting Started with NixOS Minimal](docs/minimal-install.md)
 
-[Why Nix and NixOS](docs/why-nix.md)
+[How to use this repo](docs/usage.md)
+
+[NixOS as a Hypervisor](docs/hypervisor.md)
+
+[Keybindings Implemented by this Configuration](docs/keybinds.md) 
 
-Got questions? Send them in the form of an [issue](https://github.com/erictossell/nixflakes/issues/new) or reach me at any of my other points of contact available on my [GitHub Profile](https://github.com/erictossell) - I make no guarantees but I'm happy to do my best.
+If you have questions you are welcome to send them in the form of an [issue](https://github.com/erictossell/nixflakes/issues/new) or reach me at any of my other points of contact available on my [GitHub Profile](https://github.com/erictossell) - I make no guarantees but I'm happy to do my best.
+
+</details>
 
 <details>
 <summary>📁 What is in this repo?</summary>
 
-#### 1. A [modular](https://github.com/erictossell/nixflakes/blob/main/docs/screens/FlakeStructure9.png) (opinionated) Configuration Structure
+1. A [modular](https://github.com/erictossell/nixflakes/blob/main/docs/screens/FlakeStructure9.png) (opinionated) Configuration Structure
 
-#### 2. Flake templates - Quickly grab this configuration and make it your own with:
+2. Flake templates - Quickly grab this configuration and make it your own with:
 
 ```nix
 nix flake new -t github:erictossell/nixflakes ./<your-repo-name-here>
 ```
 
-#### 3. An interactive build script for adding new [`hosts`](https://github.com/erictossell/nixflakes/tree/main/hosts)/[`users`](https://github.com/erictossell/nixflakes/tree/main/users) at [`sh/build.sh`](https://github.com/erictossell/nixflakes/blob/main/sh/build.sh)
+3. An interactive build script for adding new [`hosts`](https://github.com/erictossell/nixflakes/tree/main/hosts)/[`users`](https://github.com/erictossell/nixflakes/tree/main/users) at [`sh/build.sh`](https://github.com/erictossell/nixflakes/blob/main/sh/build.sh)
 
-#### 4. [`eriixvim`](https://github.com/erictossell/eriixvim) - a fully reproducible neovim configuration built with [`nixvim`](https://github.com/nix-community/nixvim).
+4. [`eriixvim`](https://github.com/erictossell/eriixvim) - a fully reproducible neovim configuration built with [`nixvim`](https://github.com/nix-community/nixvim).
 
 Try it out with:
 
 ```nix
 nix run github:erictossell/eriixvim
 ```
 
-#### 5. A simple example of a custom built `rust` package: [`russh`](https://github.com/erictossell/russh). 
+5. A simple example of a custom built `rust` package: [`russh`](https://github.com/erictossell/russh). 
 
 The highlight being how simple it is to package any application with `flakes` and import them into a `configuration` and ***not*** my `rust` code.
 
-#### 6. Semi up-to-date diagrams of the [structure](https://github.com/erictossell/nixflakes/blob/main/docs/screens/FlakeStructure9.png) of this flake and the [configurations](https://github.com/erictossell/nixflakes/blob/main/docs/screens/FlakeProfiles9.png) managed by [me](https://github.com/erictossell).
+6. Semi up-to-date diagrams of the [structure](https://github.com/erictossell/nixflakes/blob/main/docs/screens/FlakeStructure9.png) of this flake and the [configurations](https://github.com/erictossell/nixflakes/blob/main/docs/screens/FlakeProfiles9.png) managed by [me](https://github.com/erictossell).
 
-#### 7. `nix flake show github:erictossell/nixflakes` 
+7. `nix flake show github:erictossell/nixflakes` 
 
 ```nix
 github:erictossell/nixflakes/bbca96ce85416b025d652d752c87d3816b2bf8ad
@@ -66,7 +75,7 @@ github:erictossell/nixflakes/bbca96ce85416b025d652d752c87d3816b2bf8ad
     └───default: template: The default template for Eriim's nixflakes.
 ```
 
-#### 8. [Nix CI/CD with Github Actions](https://github.com/erictossell/nixflakes/blob/main/.github/workflows/flake_check.yml) - Built with: [Cachix - Install Nix](https://github.com/cachix/install-nix-action), [Determiniate Systems - Flake Check](https://github.com/DeterminateSystems/flake-checker-action), [stefanzweifel - Commit Action](https://github.com/stefanzweifel/git-auto-commit-action), [statix](https://github.com/nerdypepper/statix), [nixpkgs-fmt](https://github.com/nix-community/nixpkgs-fmt)
+8. [Nix CI/CD with Github Actions](https://github.com/erictossell/nixflakes/blob/main/.github/workflows/flake_check.yml) - Built with: [Cachix - Install Nix](https://github.com/cachix/install-nix-action), [Determiniate Systems - Flake Check](https://github.com/DeterminateSystems/flake-checker-action), [stefanzweifel - Commit Action](https://github.com/stefanzweifel/git-auto-commit-action), [statix](https://github.com/nerdypepper/statix), [nixpkgs-fmt](https://github.com/nix-community/nixpkgs-fmt)
 
 </details>
 

flake.nix

@@ -63,7 +63,7 @@
               ./.
               ./modules/hardware/nvidia
               ./modules/apps/obs
-              ./modules/toys
+              ./modules/steam
               ./modules/virt
             ];
           }; #principium

modules/core/terminal/default.nix

@@ -36,6 +36,7 @@
     ranger
     ripgrep
     todoist
+    tty-clock
     unzip
     wget
     vim

modules/hardware/default.nix

@@ -3,6 +3,6 @@
   imports = [
     ./bluetooth
     ./network
-    ./sound
+    ./audio
   ];
 }

modules/hyprland/config/desktop.nix

@@ -2,18 +2,6 @@
 {
   home-manager.users.${username} = _: {
     home.file = {
-      ".config/hypr/hyprpaper.conf".text = ''
-                splash = false
-        	preload = ~/.config/backgrounds/porthole.jpg
-                preload = ~/.config/backgrounds/232136.png
-                preload = ~/.config/backgrounds/1A1C23.png
-                preload = ~/.config/backgrounds/keyboard.png
-                preload = ~/.config/backgrounds/storage.jpg
-
-                wallpaper = DP-1, ~/.config/backgrounds/232136.png
-                wallpaper = DP-2, ~/.config/backgrounds/porthole.jpg
-                wallpaper = HDMI-A-1, ~/.config/backgrounds/232136.png
-      '';
 
       ".config/hypr/vol.sh" = {
         source = ../../../sh/vol.sh;
@@ -31,7 +19,7 @@
                 monitor=DP-1,preferred,0x0,1,transform,3
                 monitor=,preferred,auto,auto
 
-                exec-once = waybar & hyprpaper & mako & lxqt-policykit-agent & dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+                exec-once = swww init & swww img ~/.config/backgrounds/porthole.jpg & mako & lxqt-policykit-agent & dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 
                 # some default env vars.
                 env=BROWSER,firefox
@@ -57,7 +45,7 @@
                 bind = $mainMod, a, exec, pavucontrol
         	bind = $mainMod, v, exec, foot -e nvim
                 bind = $mainMod, 0, exit, 
-                bind = $mainMod, e, exec, kitty -e ranger
+                bind = $mainMod, e, exec, thunar
                 bind = $mainMod, b, exec, foot -e btop
         	bind = $mainMod, t, exec, foot -e tmux
         	bind = $mainMod, g, exec, foot -e firefox

modules/hyprland/config/laptop.nix

@@ -2,12 +2,6 @@
 {
   home-manager.users.${username} = _: {
     home.file = {
-      ".config/hypr/hyprpaper.conf".text = ''
-        splash = false
-        preload = ~/.config/backgrounds/232136.png
-        preload = ~/.config/backgrounds/1A1C23.png
-        wallpaper = eDP-1, ~/.config/backgrounds/232136.png
-      '';
 
       ".config/hypr/vol.sh" = {
         source = ../../../sh/vol.sh;
@@ -23,7 +17,7 @@
                 #monitor=edp-1,3840 x 2160,auto,auto
                 monitor=,preferred,auto,auto
 
-                exec-once = hyprpaper & waybar & mako & lxqt-policykit-agent & dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+                exec-once = swww init & swww img ~/.config/backgrounds/porthole.jpg & mako & lxqt-policykit-agent & dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 
                 # some default env vars.
                 env=BROWSER, firefox
@@ -42,7 +36,7 @@
                 bind = $mainMod, a, exec, pavucontrol
         	bind = $mainMod, v, exec, foot -e nvim
                 bind = $mainMod, 0, exit, 
-                bind = $mainMod, e, exec, kitty -e ranger
+                bind = $mainMod, e, exec, thunar
                 bind = $mainMod, b, exec, foot -e btop
         	bind = $mainMod, t, exec, foot -e tmux
         	bind = $mainMod, g, exec, foot -e firefox