enable dunst notifications

also rebuilds with shortcuts
fix: flake app for rebuilds
2025-07-07 20:40:14 +00:00 · 2023-04-02 19:19:40 -04:00 · 2023-04-02 18:47:06 -04:00 · 2023-04-02 18:46:22 -04:00 · 2023-04-02 16:53:01 -04:00 · 2023-04-02 15:52:45 -04:00
51 changed files with 926 additions and 248 deletions
--- a/README.md
+++ b/README.md
@ -6,21 +6,56 @@ hosts.
 They are organized and managed by [Nix](https://nixos.org), so some of the
 configuration may be difficult to translate to a non-Nix system.

-However, some of the configurations are easier to lift directly:
+## System Features

- [Neovim](https://github.com/nmasur/dotfiles/tree/master/modules/common/neovim/config)
- [Fish functions](https://github.com/nmasur/dotfiles/tree/master/modules/common/shell/fish/functions)
- [More fish aliases](https://github.com/nmasur/dotfiles/blob/master/modules/common/shell/fish/default.nix)
- [Git aliases](https://github.com/nmasur/dotfiles/blob/master/modules/common/shell/git.nix)
- [Hammerspoon](https://github.com/nmasur/dotfiles/tree/master/modules/darwin/hammerspoon)
+| Feature        | Program                                             | Configuration                                 |
+| ---            | ---                                                 | ---                                           |
+| OS             | [NixOS](https://nixos.org)                          | [Link](./modules/nixos)                       |
+| Display Server | [X11](https://www.x.org/wiki/)                      | [Link](./modules/nixos/graphical/xorg.nix)    |
+| Compositor     | [Picom](https://github.com/yshui/picom)             | [Link](./modules/nixos/graphical/picom.nix)   |
+| Window Manager | [i3](https://i3wm.org/)                             | [Link](./modules/nixos/graphical/i3.nix)      |
+| Panel          | [Polybar](https://polybar.github.io/)               | [Link](./modules/nixos/graphical/polybar.nix) |
+| Font           | [Victor Mono](https://rubjo.github.io/victor-mono/) | [Link](./modules/nixos/graphical/fonts.nix)   |
+| Launcher       | [Rofi](https://github.com/davatorium/rofi)          | [Link](./modules/nixos/graphical/rofi.nix)    |

-Try out my Neovim config (requires [nix](https://nixos.org/download.html)):
+## User Features
+
+| Feature      | Program                                                                          | Configuration                                      |
+| ---          | ---                                                                              | ---                                                |
+| Dotfiles     | [Home-Manager](https://github.com/nix-community/home-manager)                    | [Link](./modules/common)                           |
+| Terminal     | [Kitty](https://sw.kovidgoyal.net/kitty/)                                        | [Link](./modules/common/applications/kitty.nix)    |
+| Shell        | [Fish](https://fishshell.com/)                                                   | [Link](./modules/common/shell/fish)                |
+| Shell Prompt | [Starship](https://starship.rs/)                                                 | [Link](./modules/common/shell/starhip.nix)         |
+| Colorscheme  | [Gruvbox](https://github.com/morhetz/gruvbox)                                    | [Link](./colorscheme/gruvbox)                      |
+| Wallpaper    | [Road](https://gitlab.com/exorcist365/wallpapers/-/blob/master/gruvbox/road.jpg) | [Link](./hosts/tempest/default.nix)
+| Text Editor  | [Neovim](https://neovim.io/)                                                     | [Link](./modules/common/neovim/config)             |
+| Browser      | [Firefox](https://www.mozilla.org/en-US/firefox/new/)                            | [Link](./modules/common/applications/firefox.nix)  |
+| E-Mail       | [Aerc](https://aerc-mail.org/)                                                   | [Link](./modules/common/mail/aerc.nix)             |
+| File Manager | [Nautilus](https://wiki.gnome.org/action/show/Apps/Files)                        | [Link](./modules/common/applications/nautilus.nix) |
+| PDF Reader   | [Zathura](https://pwmt.org/projects/zathura/)                                    | [Link](./modules/common/applications/media.nix)    |
+| Video Player | [mpv](https://mpv.io/)                                                           | [Link](./modules/common/applications/media.nix)    |
+
+## macOS Features
+
+| Feature  | Program                                     | Configuration                        |
+| ---      | ---                                         | ---                                  |
+| Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./modules/darwin/hammerspoon) |
+
+---
+
+# Installation
+
+Click [here](./docs/installation.md) for detailed installation instructions.
+
+# Neovim
+
+Try out my Neovim config with nix:

 ```bash
 nix run github:nmasur/dotfiles#neovim
 ```

-Or build it as a package (requires [nix](https://nixos.org/download.html)):
+Or build it as a package:

 ```bash
 nix build github:nmasur/dotfiles#neovim
@ -30,73 +65,6 @@ If you already have a Neovim configuration, you may need to move it out of
 `~/.config/nvim` or set `XDG_CONFIG_HOME` to another value; otherwise both
 configs might conflict with each other.

---
-
-# Full Installation
-
-## NixOS - From Live Disk
-
-Format drives and build system from any NixOS host, including the live
-installer disk:
-
-**This will erase your drives; use at your own risk!**
-
-```bash
-lsblk # Choose the disk you want to wipe
-nix-shell -p nixVersions.stable
-nix run github:nmasur/dotfiles#installer -- nvme0n1 tempest
-```
-
-## NixOS - From Existing System
-
-If you're already running NixOS, you can switch to this configuration with the
-following command:
-
-```bash
-nix-shell -p nixVersions.stable
-sudo nixos-rebuild switch --flake github:nmasur/dotfiles#tempest
-```
-
-## Windows - From NixOS WSL
-
-After [installing NixOS on
-WSL](https://xeiaso.net/blog/nix-flakes-4-wsl-2022-05-01), you can switch to
-the WSL configuration:
-
-```
-nix-shell -p nixVersions.stable
-sudo nixos-rebuild switch --flake github:nmasur/dotfiles#hydra
-```
-
-You should also download the
-[FiraCode](https://github.com/ryanoasis/nerd-fonts/releases/download/v2.2.2/FiraCode.zip)
-font and install it on Windows. Install [Alacritty](https://alacritty.org/) and
-move the `windows/alacritty.yml` file to
-`C:\Users\<user>\AppData\Roaming\alacritty`.
-
-## macOS
-
-To get started on a bare macOS installation, first install Nix:
-
-```bash
-sh -c "$(curl -L https://nixos.org/nix/install)"
-```
-
-Then use Nix to build nix-darwin:
-
-```bash
-nix-build https://github.com/LnL7/nix-darwin/archive/master.tar.gz -A installer
-./result/bin/darwin-installer
-```
-
-Then switch to the macOS configuration:
-
-```bash
-darwin-rebuild switch --flake github:nmasur/dotfiles#lookingglass
-```
-
---
-
 # Flake Templates

 You can also use the [templates](./templates/) as flakes for starting new
--- a/apps/rebuild.nix
+++ b/apps/rebuild.nix
@ -6,9 +6,9 @@
    echo ${pkgs.system}
    SYSTEM=${if pkgs.stdenv.isDarwin then "darwin" else "linux"}
    if [ "$SYSTEM" == "darwin" ]; then
-        darwin-rebuild switch --flake github:nmasur/dotfiles#lookingglass
+        sudo darwin-rebuild switch --flake ${builtins.toString ../.}
    else
-        nixos-rebuild switch --flake github:nmasur/dotfiles
+        doas nixos-rebuild switch --flake ${builtins.toString ../.}
    fi
  '');

--- a/docs/installation.md
+++ b/docs/installation.md
@ -0,0 +1,67 @@
+[Back to README](../README.md)
+
+---
+
+# Installation
+
+## NixOS - From Live Disk
+
+Format drives and build system from any NixOS host, including the live
+installer disk:
+
+**This will erase your drives; use at your own risk!**
+
+```bash
+lsblk # Choose the disk you want to wipe
+nix-shell -p nixVersions.stable
+nix run github:nmasur/dotfiles#installer -- nvme0n1 tempest
+```
+
+## NixOS - From Existing System
+
+If you're already running NixOS, you can switch to this configuration with the
+following command:
+
+```bash
+nix-shell -p nixVersions.stable
+sudo nixos-rebuild switch --flake github:nmasur/dotfiles#tempest
+```
+
+## Windows - From NixOS WSL
+
+After [installing NixOS on
+WSL](https://xeiaso.net/blog/nix-flakes-4-wsl-2022-05-01), you can switch to
+the WSL configuration:
+
+```
+nix-shell -p nixVersions.stable
+sudo nixos-rebuild switch --flake github:nmasur/dotfiles#hydra
+```
+
+You should also download the
+[FiraCode](https://github.com/ryanoasis/nerd-fonts/releases/download/v2.2.2/FiraCode.zip)
+font and install it on Windows. Install [Alacritty](https://alacritty.org/) and
+move the `windows/alacritty.yml` file to
+`C:\Users\<user>\AppData\Roaming\alacritty`.
+
+## macOS
+
+To get started on a bare macOS installation, first install Nix:
+
+```bash
+sh -c "$(curl -L https://nixos.org/nix/install)"
+```
+
+Then use Nix to build nix-darwin:
+
+```bash
+nix-build https://github.com/LnL7/nix-darwin/archive/master.tar.gz -A installer
+./result/bin/darwin-installer
+```
+
+Then switch to the macOS configuration:
+
+```bash
+darwin-rebuild switch --flake github:nmasur/dotfiles#lookingglass
+```
+
--- a/flake.lock
+++ b/flake.lock
@ -3,11 +3,11 @@
    "Comment-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1674040818,
-        "narHash": "sha256-7UtZAE9tPlnpeHS2LLol/LGVOxptDXNKWXHNHvFBNk4=",
+        "lastModified": 1678452935,
+        "narHash": "sha256-mVJJJ9fUJYgVyGZnW8e6P5QWB0K8nuhTwSWzlBvxv2M=",
        "owner": "numToStr",
        "repo": "Comment.nvim",
-        "rev": "eab2c83a0207369900e92783f56990808082eac2",
+        "rev": "8d3aa5c22c2d45e788c7a5fe13ad77368b783c20",
        "type": "github"
      },
      "original": {
@ -19,11 +19,11 @@
    "bufferline-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1676130961,
-        "narHash": "sha256-3LT45i0eSMfUV9EBrtdtzHxFKRATIhRy/faDd3lI3mA=",
+        "lastModified": 1677796018,
+        "narHash": "sha256-tuGitJQ2eXB9/SIHAyPrEVgy2n++GOlBOPLvFv3Ds4E=",
        "owner": "akinsho",
        "repo": "bufferline.nvim",
-        "rev": "84b0822b2af478d0b4f7b0f9249ca218855331db",
+        "rev": "3677aceb9a72630b0613e56516c8f7151b86f95c",
        "type": "github"
      },
      "original": {
@ -76,11 +76,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1677116397,
-        "narHash": "sha256-2OHwhv4k1SDEuNxhq+zluvrd5pbW8d4TP9NKW4B8iO8=",
+        "lastModified": 1678912468,
+        "narHash": "sha256-oUo6ZrsuqymuMLLvGfgnQ464OMKnUONv+ryea07iGrE=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "8fddb2fd721365fa77ff68b709539639d4dc65d7",
+        "rev": "e8650fc36bf9d2acb411ba0047f863b8e481e3bb",
        "type": "github"
      },
      "original": {
@ -94,11 +94,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1676854489,
-        "narHash": "sha256-hWmx3JFLNPGMtflyjgEn5GZydbLW3msjXvarS1NsBDM=",
+        "lastModified": 1679446046,
+        "narHash": "sha256-CBjVE3Sj7Ls1pffxGavqPXRkaLYy1+O88NzBwNdgNcY=",
        "owner": "bandithedoge",
        "repo": "nixpkgs-firefox-darwin",
-        "rev": "6a5cca0ea8dfab4718e1e43e243c80ba110c2364",
+        "rev": "1531f1477881e76c67b123a55f3d44ed7f83a4ba",
        "type": "github"
      },
      "original": {
@ -125,11 +125,11 @@
    },
    "flake-utils": {
      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
        "type": "github"
      },
      "original": {
@ -155,11 +155,11 @@
    },
    "flake-utils_3": {
      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
        "type": "github"
      },
      "original": {
@ -176,11 +176,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1678271387,
-        "narHash": "sha256-H2dv/i1LRlunRtrESirELzfPWdlG/6ElDB1ksO529H4=",
+        "lastModified": 1679067095,
+        "narHash": "sha256-G2dJQURL/CCi+8RP6jNJG8VqgtzEMCA+6mNodd3VR6E=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "36999b8d19eb6eebb41983ef017d7e0095316af2",
+        "rev": "3239e0b40f242f47bf6c0c37b2fd35ab3e76e370",
        "type": "github"
      },
      "original": {
@ -197,11 +197,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1676110678,
-        "narHash": "sha256-hemg8rMKS2me2Wua9ZG/0aQ8fEOfytjyKB+WYcXfEKE=",
+        "lastModified": 1678728829,
+        "narHash": "sha256-KbA8uakGfjfvRH+Td/VegiLdHrnqIZHkMTQ5XBjL2dE=",
        "owner": "oxalica",
        "repo": "nil",
-        "rev": "ce2e0b5d60fe497134050796f7d12ffb6b50eb28",
+        "rev": "e7045f1779fd202a3316f84b864c304f339cccea",
        "type": "github"
      },
      "original": {
@ -233,11 +233,11 @@
    },
    "nixlib": {
      "locked": {
-        "lastModified": 1636849918,
-        "narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=",
+        "lastModified": 1677373009,
+        "narHash": "sha256-kxhz4QUP8tXa/yVSpEzDDZSEp9FvhzRqZzb+SeUaekw=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5",
+        "rev": "c9d4f2476046c6a7a2ce3c2118c48455bf0272ea",
        "type": "github"
      },
      "original": {
@ -254,11 +254,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1674666581,
-        "narHash": "sha256-KNI2s/xrL7WOYaPJAWKBtb7cCH3335rLfsL+B+ssuGY=",
+        "lastModified": 1678351966,
+        "narHash": "sha256-tRFEU0lu3imZb3dtELBY+UbEhWXbb0xlBrsIlpICb+A=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "6a5dc1d3d557ea7b5c19b15ff91955124d0400fa",
+        "rev": "0c043999b16caba6fb571af2d228775729829943",
        "type": "github"
      },
      "original": {
@ -285,11 +285,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1675309347,
-        "narHash": "sha256-D3CQ6HRDT2m3XJlrzb5jKq4vNFR5xFTEFKC7iSjlFpM=",
+        "lastModified": 1678298120,
+        "narHash": "sha256-iaV5xqgn29xy765Js3EoZePQyZIlLZA3pTYtTnKkejg=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "006c3bd4dd2f5d1d2094047f307cbf9e2b73d9c5",
+        "rev": "1e383aada51b416c6c27d4884d2e258df201bc11",
        "type": "github"
      },
      "original": {
@ -301,11 +301,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1676885936,
-        "narHash": "sha256-ZRKb6zBfTvdCOXI7nGC1L9UWSU5ay2ltxg+f5UIzBOU=",
+        "lastModified": 1679262748,
+        "narHash": "sha256-DQCrrAFrkxijC6haUzOC5ZoFqpcv/tg2WxnyW3np1Cc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b69883faca9542d135fa6bab7928ff1b233c167f",
+        "rev": "60c1d71f2ba4c80178ec84523c2ca0801522e0a6",
        "type": "github"
      },
      "original": {
@ -317,11 +317,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1674868155,
-        "narHash": "sha256-eFNm2h6fNbgD7ZpO4MHikCB5pSnCJ7DTmwPisjetmwc=",
+        "lastModified": 1677779205,
+        "narHash": "sha256-6DBjL9wjq86p2GczmwnHtFRnWPBPItc67gapWENBgX8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ce20e9ebe1903ea2ba1ab006ec63093020c761cb",
+        "rev": "96e18717904dfedcd884541e5a92bf9ff632cf39",
        "type": "github"
      },
      "original": {
@ -334,11 +334,11 @@
    "null-ls-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1676246878,
-        "narHash": "sha256-hAUEa2zNsYXQ+TsHYHBzcW67lCxhiD7x+uPbdOZwY8o=",
+        "lastModified": 1679325581,
+        "narHash": "sha256-ixhy8qgP2GEPqrMdI+GsHzeHxESwhRw6cjf5hcpwP1w=",
        "owner": "jose-elias-alvarez",
        "repo": "null-ls.nvim",
-        "rev": "d4594231a06cecce73a78a256b0d7c7ab51f7dd5",
+        "rev": "13dd1fc13063681ca7e039436c88f6eca7e3e937",
        "type": "github"
      },
      "original": {
@ -349,11 +349,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1676251563,
-        "narHash": "sha256-itLKR2Haeh5wQ6dxkuZ8L5gwp3+CAggpN+w2e7cLQPg=",
+        "lastModified": 1679482366,
+        "narHash": "sha256-88K2ABCsdsVwq6Go/uEn/fds1fUeeeoixOALjrrUI0Q=",
        "owner": "nix-community",
        "repo": "nur",
-        "rev": "9a8b28a9d6611f6af9f7abb3e690fc755d6906fe",
+        "rev": "e9088dc6f9f289fbff984744ad04dccbd5c1f8ac",
        "type": "github"
      },
      "original": {
@ -365,11 +365,11 @@
    "nvim-lspconfig-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1676175675,
-        "narHash": "sha256-Wg3NatT4DRBMF6hCxK4C2DC+geFMpfFUFogPbqeMt6E=",
+        "lastModified": 1679319980,
+        "narHash": "sha256-UQ/Zng1/9rXRnQeAjemA21qfCltmZRq9QekQ0vGYlX8=",
        "owner": "neovim",
        "repo": "nvim-lspconfig",
-        "rev": "1712672e4da3003a0dd9f771d30389600b360f42",
+        "rev": "0f94c5fded29c0024254259f3d8a0284bfb507ea",
        "type": "github"
      },
      "original": {
@ -381,11 +381,11 @@
    "nvim-tree-lua-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1676244722,
-        "narHash": "sha256-xoSekdZhWr59qTOM0/ihYiuKiwHiKYb42Ep5JHn65UM=",
+        "lastModified": 1678748807,
+        "narHash": "sha256-u9ZLBL4FY/bkvl4+ofKifyEHM9+KhqeYovhr9VQYG7c=",
        "owner": "kyazdani42",
        "repo": "nvim-tree.lua",
-        "rev": "ba1778e061f25814bc5940be886a7f41d7d7736e",
+        "rev": "1d79a64a88af47ddbb55f4805ab537d11d5b908e",
        "type": "github"
      },
      "original": {
@ -397,15 +397,16 @@
    "nvim-treesitter-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1676240774,
-        "narHash": "sha256-eRSU/9ysSvTyYxBrp9Whg0eXgAOsCdmIHMlYZK7bjRg=",
+        "lastModified": 1677248832,
+        "narHash": "sha256-4TmtrufxjVpnSNfFpn6GQStEhq3KQb3JfmfMEJnSI8k=",
        "owner": "nvim-treesitter",
        "repo": "nvim-treesitter",
-        "rev": "7eb5f1a2e3949496f26c4084b521b30f2d08137a",
+        "rev": "b401b7423d18c78371c5ff1a5f8d3c14292b2047",
        "type": "github"
      },
      "original": {
        "owner": "nvim-treesitter",
+        "ref": "v0.8.5.2",
        "repo": "nvim-treesitter",
        "type": "github"
      }
@ -447,11 +448,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1675391458,
-        "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=",
+        "lastModified": 1678415622,
+        "narHash": "sha256-tems1jHETCYEen8QrW61yVVX0F4zOGy4ImB43iDc7bY=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf",
+        "rev": "9f687941160108f89dd8bd2c650d32c15a35c7c7",
        "type": "github"
      },
      "original": {
@ -463,11 +464,11 @@
    "telescope-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1675149856,
-        "narHash": "sha256-L4Kw94CUy6N7zcyy9INuR/O0fxQ7sp0IvGd/u7fHxMA=",
+        "lastModified": 1677414372,
+        "narHash": "sha256-QmyVJ/LZFtb/qqD5Q5fHsqAGgqaOT9XkVoLyOcqM14w=",
        "owner": "nvim-telescope",
        "repo": "telescope.nvim",
-        "rev": "203bf5609137600d73e8ed82703d6b0e320a5f36",
+        "rev": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2",
        "type": "github"
      },
      "original": {
@ -495,11 +496,11 @@
    "toggleterm-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1675358836,
-        "narHash": "sha256-9O7p/7tRStg51OFhMc88M5ewYquiYC9x9CV4s5veVP8=",
+        "lastModified": 1678645191,
+        "narHash": "sha256-nK9eUHeFjZtUPC4cOCILg7J54rDHGI52AIXX5j7E4rE=",
        "owner": "akinsho",
        "repo": "toggleterm.nvim",
-        "rev": "19aad0f41f47affbba1274f05e3c067e6d718e1e",
+        "rev": "c8e982ad2739eeb0b13d0fecb14820c9bf5e3da0",
        "type": "github"
      },
      "original": {
@ -546,11 +547,11 @@
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1676126384,
-        "narHash": "sha256-3aAnN891Cb1pizewAgaHIo3W1WbAjXtoWuX8n3j8YoI=",
+        "lastModified": 1678648312,
+        "narHash": "sha256-aY3CBNyenTUkStQhwigm30+BjXQyA8rCChGD+Z98qqE=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "a1c7e8bebac32cfac7aa8498bdfc60cbff13eb50",
+        "rev": "c6f663e8583912059605b55c07583b6e96b5e690",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -16,7 +16,7 @@
    # Used for Windows Subsystem for Linux compatibility
    wsl.url = "github:nix-community/NixOS-WSL";

-    # Used for user packages
+    # Used for user packages and dotfiles
    home-manager = {
      url = "github:nix-community/home-manager/master";
      inputs.nixpkgs.follows =
@ -74,7 +74,7 @@
      flake = false;
    };
    nvim-treesitter-src = {
-      url = "github:nvim-treesitter/nvim-treesitter";
+      url = "github:nvim-treesitter/nvim-treesitter/v0.8.5.2";
      flake = false;
    };
    telescope-nvim-src = {
@ -111,6 +111,8 @@
        gitName = fullName;
        gitEmail = "7386960+nmasur@users.noreply.github.com";
        mail.server = "noahmasur.com";
+        mail.imapHost = "imap.purelymail.com";
+        mail.smtpHost = "smtp.purelymail.com";
        dotfilesRepo = "git@github.com:nmasur/dotfiles";
      };

@ -119,6 +121,7 @@
        inputs.nur.overlay
        inputs.nix2vim.overlay
        (import ./overlays/neovim-plugins.nix inputs)
+        (import ./overlays/lib.nix)
        (import ./overlays/calibre-web.nix)
      ];

@ -131,6 +134,8 @@

    in rec {

+      # Contains my full system builds, including home-manager
+      # nixos-rebuild switch --flake .#tempest
      nixosConfigurations = {
        tempest = import ./hosts/tempest { inherit inputs globals overlays; };
        hydra = import ./hosts/hydra { inherit inputs globals overlays; };
@ -138,6 +143,8 @@
        swan = import ./hosts/swan { inherit inputs globals overlays; };
      };

+      # Contains my full Mac system builds, including home-manager
+      # darwin-rebuild switch --flake .#lookingglass
      darwinConfigurations = {
        lookingglass =
          import ./hosts/lookingglass { inherit inputs globals overlays; };
@ -152,23 +159,24 @@
          darwinConfigurations.lookingglass.config.home-manager.users."Noah.Masur".home;
      };

-      # Disk formatting
+      # Disk formatting, only used once
      diskoConfigurations = { root = import ./disks/root.nix; };

-      # Package servers into images with a generator
+      # Other packages, such as system images or programs
      packages = forAllSystems (system: {

+        # Package servers into images with a generator
        aws = {
          "${system}" =
            import ./generators/aws { inherit inputs globals system overlays; };
        };
-
        staff = {
          "${system}" = import ./generators/staff {
            inherit inputs globals system overlays;
          };
        };

+        # Package Neovim config into standalone package
        neovim = let pkgs = import nixpkgs { inherit system overlays; };
        in import ./modules/common/neovim/package {
          inherit pkgs;
@ -178,6 +186,7 @@

      });

+      # Programs that can be run by calling this flake
      apps = forAllSystems (system:
        let
          pkgs = import nixpkgs {
@ -190,6 +199,7 @@
          };
        in import ./apps { inherit pkgs; });

+      # Development environments
      devShells = forAllSystems (system:
        let pkgs = import nixpkgs { inherit system overlays; };
        in {
@ -199,6 +209,8 @@
            buildInputs = with pkgs; [ git stylua nixfmt shfmt shellcheck ];
          };

+          test = pkgs.mkShell { buildInputs = with pkgs; [ age ]; };
+
          # Used for cloud and systems development and administration
          devops = pkgs.mkShell {
            buildInputs = with pkgs; [
--- a/hosts/README.md
+++ b/hosts/README.md
@ -0,0 +1,10 @@
+# Hosts
+
+| Host                                       | Purpose             |
+| ---                                        | ---                 |
+| [flame](./flame/default.nix)               | Oracle cloud server |
+| [hydra](./hydra/default.nix)               | WSL config          |
+| [lookingglass](./lookingglass/default.nix) | Work macOS          |
+| [swan](./swan/default.nix)                 | Home NAS and server |
+| [tempest](./tempest/default.nix)           | Desktop             |
+
--- a/hosts/swan/default.nix
+++ b/hosts/swan/default.nix
@ -12,7 +12,7 @@ nixpkgs.lib.nixosSystem {
    ./hardware-configuration.nix
    ../../modules/common
    ../../modules/nixos
-    (removeAttrs globals [ "mail.server" ])
+    globals
    wsl.nixosModules.wsl
    home-manager.nixosModules.home-manager
    disko.nixosModules.disko
@ -42,6 +42,7 @@ nixpkgs.lib.nixosSystem {
      streamServer = "stream.masu.rs";
      nextcloudServer = "cloud.masu.rs";
      bookServer = "books.masu.rs";
+      arrServer = "download.masu.rs";
      samba.enable = true;

      backup.s3 = {
--- a/hosts/tempest/hardware-configuration.nix
+++ b/hosts/tempest/hardware-configuration.nix
@ -37,4 +37,20 @@
  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
  hardware.cpu.amd.updateMicrocode =
    lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  hardware.fancontrol.enable = true;
+  hardware.fancontrol.config = ''
+    # Configuration file generated by pwmconfig, changes will be lost
+    INTERVAL=10
+    DEVPATH=hwmon0=devices/pci0000:00/0000:00:03.1/0000:06:00.0/0000:07:00.0/0000:08:00.0
+    DEVNAME=hwmon0=amdgpu
+    FCTEMPS=hwmon0/pwm1=hwmon0/temp1_input
+    FCFANS= hwmon0/pwm1=hwmon0/fan1_input
+    MINTEMP=hwmon0/pwm1=50
+    MAXTEMP=hwmon0/pwm1=70
+    MINSTART=hwmon0/pwm1=100
+    MINSTOP=hwmon0/pwm1=10
+    MINPWM=hwmon0/pwm1=10
+    MAXPWM=hwmon0/pwm1=240
+  '';
 }
--- a/modules/README.md
+++ b/modules/README.md
@ -0,0 +1,8 @@
+# Modules
+
+| Module                         | Purpose                                     |
+| ---                            | ---                                         |
+| [common](./common/default.nix) | User programs and OS-agnostic configuration |
+| [darwin](./darwin/default.nix) | macOS-specific configuration                |
+| [nixos](./nixos/default.nix)   | NixOS-specific configuration                |
+
--- a/modules/common/applications/firefox.nix
+++ b/modules/common/applications/firefox.nix
@ -157,6 +157,24 @@
        };

      };
+
+      xsession.windowManager.i3.config.keybindings =
+        lib.mkIf pkgs.stdenv.isLinux {
+          "${
+            config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
+          }+Shift+b" = "exec ${
+            # Don't name the script `firefox` or it will affect grep
+              builtins.toString (pkgs.writeShellScript "focus-ff.sh" ''
+                count=$(ps aux | grep -c firefox)
+                if [ "$count" -eq 1 ]; then
+                    i3-msg "exec --no-startup-id firefox"
+                    sleep 0.5
+                fi
+                i3-msg "[class=firefox] focus"
+              '')
+            }";
+        };
+
    };

  };
--- a/modules/common/applications/kitty.nix
+++ b/modules/common/applications/kitty.nix
@ -10,9 +10,24 @@
  };

  config = lib.mkIf (config.gui.enable && config.kitty.enable) {
+
+    # Set the Rofi-Systemd terminal for viewing logs
+    # Using optionalAttrs because only available in NixOS
+    environment = { } // lib.attrsets.optionalAttrs
+      (builtins.hasAttr "sessionVariables" config.environment) {
+        sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.kitty}/bin/kitty";
+      };
+
    home-manager.users.${config.user} = {
-      # xsession.windowManager.i3.config.terminal = "kitty";
-      # programs.rofi.terminal = "${pkgs.kitty}/bin/kitty";
+
+      # Set the i3 terminal
+      xsession.windowManager.i3.config.terminal =
+        lib.mkIf pkgs.stdenv.isLinux "kitty";
+
+      # Set the Rofi terminal for running programs
+      programs.rofi.terminal =
+        lib.mkIf pkgs.stdenv.isLinux "${pkgs.kitty}/bin/kitty";
+
      programs.kitty = {
        enable = true;
        environment = { };
--- a/modules/common/applications/media.nix
+++ b/modules/common/applications/media.nix
@ -12,22 +12,50 @@
  config = lib.mkIf (config.gui.enable && config.media.enable) {
    home-manager.users.${config.user} = {
      home.packages = with pkgs; [
-        mpv # Video viewer
-        sxiv # Image viewer
+        nsxiv # Image viewer
        mupdf # PDF viewer
        zathura # PDF viewer
      ];

+      # Video player
+      programs.mpv = {
+        enable = true;
+        bindings = { };
+        config = { image-display-duration = 2; };
+        scripts = [
+
+          # Automatically load playlist entries before and after current file
+          pkgs.mpvScripts.autoload
+
+          # Delete current file after quitting
+          (pkgs.stdenv.mkDerivation rec {
+            pname = "mpv-delete-file";
+            version = "0.1"; # made-up
+            src = pkgs.fetchFromGitHub {
+              owner = "zenyd";
+              repo = "mpv-scripts";
+              rev = "19ea069abcb794d1bf8fac2f59b50d71ab992130";
+              sha256 = "sha256-OBCuzCtgfSwj0i/rBNranuu4LRc47jObwQIJgQQoerg=";
+            } + "/delete_file.lua";
+            dontBuild = true;
+            dontUnpack = true;
+            installPhase =
+              "install -Dm644 ${src} $out/share/mpv/scripts/delete_file.lua";
+            passthru.scriptName = "delete_file.lua";
+          })
+        ];
+      };
+
      # Set default for opening PDFs
      xdg.mimeApps = {
        associations.added = {
          "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
-          "image/*" = [ "sxiv.desktop" ];
+          "image/*" = [ "nsxiv.desktop" ];
        };
        associations.removed = { "application/pdf" = [ "mupdf.desktop" ]; };
        defaultApplications = {
          "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
-          "image/*" = [ "sxiv.desktop" ];
+          "image/*" = [ "nsxiv.desktop" ];
        };
      };

--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@ -44,11 +44,6 @@
        default = true;
      };
    };
-
-    # colorscheme = lib.mkOption {
-    #   type = types.attrs;
-    #   description = "Base16 color scheme";
-    # };
    homePath = lib.mkOption {
      type = lib.types.path;
      description = "Path of user's home directory.";
@ -57,7 +52,6 @@
      else
        "/home/${config.user}");
    };
-
    dotfilesPath = lib.mkOption {
      type = lib.types.path;
      description = "Path of dotfiles repository.";
@ -95,7 +89,8 @@
        ];

        # Scans and hard links identical files in the store
-        auto-optimise-store = true;
+        # Not working with macOS: https://github.com/NixOS/nix/issues/7273
+        auto-optimise-store = lib.mkIf (!pkgs.stdenv.isDarwin) true;

      };

--- a/modules/common/mail/aerc.nix
+++ b/modules/common/mail/aerc.nix
@ -170,6 +170,8 @@
              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
            "application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
            "application/pdf" = "${pkgs.zathura}/bin/zathura -";
+            "audio/*" = "${pkgs.mpv}/bin/mpv -";
+            "image/*" = "${pkgs.feh}/bin/feh -";
          };
        };
      };
@ -181,6 +183,27 @@
        };
      };

+      xdg.desktopEntries.aerc = lib.mkIf pkgs.stdenv.isLinux {
+        name = "aerc";
+        exec = "kitty aerc %u";
+      };
+      xsession.windowManager.i3.config.keybindings =
+        lib.mkIf pkgs.stdenv.isLinux {
+          "${
+            config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
+          }+Shift+e" = "exec ${
+            # Don't name the script `aerc` or it will affect grep
+              builtins.toString (pkgs.writeShellScript "focus-mail.sh" ''
+                count=$(ps aux | grep -c aerc)
+                if [ "$count" -eq 1 ]; then
+                    i3-msg "exec --no-startup-id kitty --class aerc aerc"
+                    sleep 0.25
+                fi
+                i3-msg "[class=aerc] focus"
+              '')
+            }";
+        };
+
      programs.fish.shellAbbrs = { ae = "aerc"; };

    };
--- a/modules/common/mail/default.nix
+++ b/modules/common/mail/default.nix
@ -10,9 +10,17 @@
      default = config.user;
    };
    mail.server = lib.mkOption {
-      type = lib.types.str;
+      type = lib.types.nullOr lib.types.str;
      description = "Server name for the email address.";
    };
+    mail.imapHost = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Server host for IMAP (reading mail).";
+    };
+    mail.smtpHost = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Server host for SMTP (sending mail).";
+    };
  };

  config = lib.mkIf config.mail.enable {
@ -42,7 +50,7 @@
            folders = { };
            getmail = { };
            imap = {
-              host = "imap.purelymail.com";
+              host = config.mail.imapHost;
              port = 993;
              tls.enable = true;
            };
@ -55,9 +63,9 @@
            maildir = { path = "main"; };
            mbsync = {
              enable = true;
-              create = "maildir";
-              expunge = "none";
-              remove = "none";
+              create = "both";
+              expunge = "both";
+              remove = "both";
              patterns = [ "*" ];
              extraConfig.channel = {
                CopyArrivalDate = "yes"; # Sync time of original message
@ -70,7 +78,7 @@
                builtins.toString ../../../private/mailpass.age
              }";
            smtp = {
-              host = "smtp.purelymail.com";
+              host = config.mail.smtpHost;
              port = 465;
              tls.enable = true;
            };
--- a/modules/common/neovim/config/syntax.nix
+++ b/modules/common/neovim/config/syntax.nix
@ -1,17 +1,7 @@
 { pkgs, ... }: {

  plugins = [
-    (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
-      with pkgs.tree-sitter-grammars; [
-        tree-sitter-hcl
-        tree-sitter-python
-        tree-sitter-lua
-        tree-sitter-nix
-        tree-sitter-fish
-        tree-sitter-toml
-        tree-sitter-yaml
-        tree-sitter-json
-      ]))
+    pkgs.vimPlugins.nvim-treesitter.withAllGrammars
    pkgs.vimPlugins.vim-matchup # Better % jumping in languages
    pkgs.vimPlugins.nginx-vim
    pkgs.vimPlugins.vim-helm
--- a/modules/common/shell/bash/default.nix
+++ b/modules/common/shell/bash/default.nix
@ -0,0 +1,20 @@
+{ config, pkgs, lib, ... }: {
+
+  config = {
+    home-manager.users.${config.user} = {
+
+      programs.bash = {
+        enable = true;
+        shellAliases =
+          config.home-manager.users.${config.user}.programs.fish.shellAliases;
+        initExtra = "";
+        profileExtra = "";
+      };
+
+      programs.starship.enableBashIntegration = false;
+      programs.zoxide.enableBashIntegration = true;
+      programs.fzf.enableBashIntegration = true;
+
+    };
+  };
+}
--- a/modules/common/shell/default.nix
+++ b/modules/common/shell/default.nix
@ -1,5 +1,6 @@
 { ... }: {
  imports = [
+    ./bash
    ./charm.nix
    ./direnv.nix
    ./fish
--- a/modules/common/shell/fish/default.nix
+++ b/modules/common/shell/fish/default.nix
@ -76,7 +76,6 @@
        set -g fish_cursor_replace_one underscore
      '';
      loginShellInit = "";
-      shellAliases = { };
      shellAbbrs = {

        # Directory aliases
--- a/modules/common/shell/fzf.nix
+++ b/modules/common/shell/fzf.nix
@ -13,9 +13,8 @@
                fd \
                    --search-path $HOME/dev \
                    --type directory \
-                    --hidden \
-                    "^.git\$" \
-                | xargs dirname \
+                    --exact-depth 2 \
+                | sed 's/\\/$//' \
                | fzf \
                    --delimiter '/' \
                    --with-nth 6.. \
--- a/modules/common/shell/github.nix
+++ b/modules/common/shell/github.nix
@ -19,6 +19,9 @@
          grf = "gh run view --log-failed";
          grl = "gh run view --log";
          ghpr = "gh pr create && sleep 3 && gh run watch";
+
+          # https://github.com/cli/cli/discussions/4067
+          prs = "gh search prs --state=open --review-requested=@me";
        };
        functions = {
          repos = {
--- a/modules/common/shell/utilities.nix
+++ b/modules/common/shell/utilities.nix
@ -18,21 +18,22 @@ in {
    home-manager.users.${config.user} = {

      home.packages = with pkgs; [
-        unzip # Extract zips
+        age # Encryption
+        bc # Calculator
+        dig # DNS lookup
+        fd # find
+        htop # Show system processes
+        inetutils # Includes telnet, whois
+        jq # JSON manipulation
+        lf # File viewer
+        qrencode # Generate qr codes
        rsync # Copy folders
        ripgrep # grep
-        fd # find
        sd # sed
-        jq # JSON manipulation
        tealdeer # Cheatsheets
        tree # View directory hierarchy
-        htop # Show system processes
-        qrencode # Generate qr codes
        vimv-rs # Batch rename files
-        dig # DNS lookup
-        lf # File viewer
-        inetutils # Includes telnet, whois
-        age # Encryption
+        unzip # Extract zips
      ];

      programs.zoxide.enable = true; # Shortcut jump command
--- a/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua
+++ b/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua
@ -90,6 +90,7 @@ function obj:init()
        self:switch("System Preferences.app")
    end)
    self.launcher:bind("", "R", function()
+        hs.console.clearConsole()
        hs.reload()
    end)
    self.launcher:bind("", "S", function()
--- a/modules/darwin/utilities.nix
+++ b/modules/darwin/utilities.nix
@ -1,19 +1,6 @@
 { config, pkgs, lib, ... }:

-let
-
-  # Quickly package shell scripts with their dependencies
-  # From https://discourse.nixos.org/t/how-to-create-a-script-with-dependencies/7970/6
-  mkScript = { name, file, env ? [ ] }:
-    pkgs.writeScriptBin name ''
-      for i in ${lib.concatStringsSep " " env}; do
-        export PATH="$i/bin:$PATH"
-      done
-
-      exec ${pkgs.bash}/bin/bash ${file} $@
-    '';
-
-in {
+{

  home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {

@ -32,7 +19,7 @@ in {
      consul
      noti # Create notifications programmatically
      ipcalc # Make IP network calculations
-      (mkScript {
+      (pkgs.extraLib.mkScript {
        name = "ocr";
        file = ../../modules/common/shell/bash/scripts/ocr.sh;
        env = [ tesseract ];
--- a/modules/nixos/gaming/legendary.nix
+++ b/modules/nixos/gaming/legendary.nix
@ -10,8 +10,8 @@ in {
  config = lib.mkIf config.gaming.legendary.enable {
    environment.systemPackages = with pkgs; [
      legendary-gl
-      rare # GUI for Legendary (not working)
      wineWowPackages.stable # 32-bit and 64-bit wineWowPackages, see https://nixos.wiki/wiki/Wine
+      heroic # GUI launcher
    ];

    home-manager.users.${config.user} = {
--- a/modules/nixos/graphical/default.nix
+++ b/modules/nixos/graphical/default.nix
@ -1,7 +1,14 @@
 { lib, ... }: {

-  imports =
-    [ ./xorg.nix ./fonts.nix ./i3.nix ./polybar.nix ./picom.nix ./rofi.nix ];
+  imports = [
+    ./dunst.nix
+    ./fonts.nix
+    ./i3.nix
+    ./picom.nix
+    ./polybar.nix
+    ./rofi.nix
+    ./xorg.nix
+  ];

  options = {

@ -17,10 +24,22 @@
      type = lib.types.str;
      description = "Command to use for choosing windows";
    };
+    audioSwitchCommand = lib.mkOption {
+      type = lib.types.str;
+      description = "Command to use for switching audio sink";
+    };
+    brightnessCommand = lib.mkOption {
+      type = lib.types.str;
+      description = "Command to use for adjusting brightness";
+    };
    toggleBarCommand = lib.mkOption {
      type = lib.types.str;
      description = "Command to hide and show the status bar.";
    };
+    powerCommand = lib.mkOption {
+      type = lib.types.str;
+      description = "Command to use for power options menu";
+    };
    wallpaper = lib.mkOption {
      type = lib.types.path;
      description = "Wallpaper background image file";
--- a/modules/nixos/graphical/dunst.nix
+++ b/modules/nixos/graphical/dunst.nix
@ -0,0 +1,31 @@
+{ config, ... }:
+
+{
+
+  config = {
+
+    home-manager.users.${config.user}.services.dunst = {
+      enable = true;
+      settings = {
+        global = {
+          width = 300;
+          height = 200;
+          offset = "30x50";
+          origin = "top-right";
+          transparency = 0;
+          padding = 20;
+          horizontal_padding = 20;
+          frame_color = config.theme.colors.base03;
+        };
+
+        urgency_normal = {
+          background = config.theme.colors.base00;
+          foreground = config.theme.colors.base05;
+          timeout = 10;
+        };
+      };
+    };
+
+  };
+
+}
--- a/modules/nixos/graphical/fonts.nix
+++ b/modules/nixos/graphical/fonts.nix
@ -22,6 +22,7 @@ in {
      programs.rofi.font = "Hack Nerd Font 14";
      programs.alacritty.settings.font.normal.family = fontName;
      programs.kitty.font.name = fontName;
+      services.dunst.settings.global.font = "Hack Nerd Font 14";
    };

  };
--- a/modules/nixos/graphical/i3.nix
+++ b/modules/nixos/graphical/i3.nix
@ -39,7 +39,11 @@ in {
          modifier = modifier;
          assigns = {
            "${ws1}" = [{ class = "Firefox"; }];
-            "${ws2}" = [{ class = "kitty"; }];
+            "${ws2}" = [
+              { class = "kitty"; }
+              { class = "aerc"; }
+              { class = "obsidian"; }
+            ];
            "${ws3}" = [{ class = "discord"; }];
            "${ws4}" = [{ class = "Steam"; }];
          };
@ -112,12 +116,22 @@ in {
              "exec --no-startup-id ${config.launcherCommand}";
            "${modifier}+Shift+s" =
              "exec --no-startup-id ${config.systemdSearch}";
+            "${modifier}+Shift+a" =
+              "exec --no-startup-id ${config.audioSwitchCommand}";
            "Mod1+Tab" = "exec --no-startup-id ${config.altTabCommand}";
+            "${modifier}+Shift+period" =
+              "exec --no-startup-id ${config.powerCommand}";
+            "${modifier}+Shift+m" =
+              "exec --no-startup-id ${config.brightnessCommand}";
            "${modifier}+Shift+c" = "reload";
            "${modifier}+Shift+r" = "restart";
            "${modifier}+Shift+q" = ''
              exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"'';
            "${modifier}+Shift+x" = "exec ${lockCmd}";
+            "${modifier}+Mod1+h" =
+              "exec --no-startup-id kitty sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName} && ${pkgs.libnotify}/bin/notify-send --transient --expire-time 3000 \"Rebuilt home.\" || read'";
+            "${modifier}+Mod1+r" =
+              "exec --no-startup-id kitty sh -c 'doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName} && ${pkgs.libnotify}/bin/notify-send --transient --expire-time 3000 \"Rebuilt NixOS.\" || read'";

            # Window options
            "${modifier}+q" = "kill";
--- a/modules/nixos/graphical/polybar.nix
+++ b/modules/nixos/graphical/polybar.nix
@ -36,7 +36,7 @@
            module-margin = 1;
            modules-left = "i3";
            modules-center = "xwindow";
-            modules-right = "pulseaudio date";
+            modules-right = "pulseaudio date power";
            cursor-click = "pointer";
            cursor-scroll = "ns-resize";
            enable-ipc = true;
@ -115,6 +115,7 @@
            ramp-volume-0 = "";
            ramp-volume-1 = "墳";
            ramp-volume-2 = "";
+            click-right = config.audioSwitchCommand;
          };
          # "module/xkeyboard" = {
          # type = "internal/xkeyboard";
@ -160,12 +161,18 @@
          "module/date" = {
            type = "internal/date";
            interval = 1;
-            date = "%d %b  %l:%M %p";
+            date = "%d %b %l:%M %p";
            date-alt = "%Y-%m-%d %H:%M:%S";
            label = "%date%";
            label-foreground = config.theme.colors.base0A;
            # format-background = colors.background;
          };
+          "module/power" = {
+            type = "custom/text";
+            content = "  ";
+            click-left = config.powerCommand;
+            content-foreground = config.theme.colors.base04;
+          };
          "settings" = {
            screenchange-reload = true;
            pseudo-transparency = false;
@ -174,7 +181,7 @@
      };

      xsession.windowManager.i3.config.startup = [{
-        command = "systemctl --user restart polybar";
+        command = "pkill polybar; polybar -r main";
        always = true;
        notification = false;
      }];
--- a/modules/nixos/graphical/rofi.nix
+++ b/modules/nixos/graphical/rofi.nix
@ -1,9 +1,19 @@
 { config, pkgs, lib, ... }:

-{
+let
+
+  rofi = config.home-manager.users.${config.user}.programs.rofi.finalPackage;
+
+in {
+
+  imports = [ ./rofi/power.nix ./rofi/brightness.nix ];

  config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {

+    # Set the Rofi-Systemd terminal for viewing logs
+    environment.sessionVariables.ROFI_SYSTEMD_TERM =
+      lib.mkIf config.kitty.enable "${pkgs.kitty}/bin/kitty";
+
    home-manager.users.${config.user} = {

      home.packages = with pkgs;
@ -70,7 +80,7 @@
            placeholder-color = mkLiteral config.theme.colors.base03;
            expand = true;
            horizontal-align = "0";
-            placeholder = "Launch Program";
+            placeholder = "";
            padding = mkLiteral "0px 0px 0px 5px";
            blink = true;
          };
@ -139,15 +149,29 @@
          show-icons = true;
          kb-cancel = "Escape,Super+space";
          modi = "window,run,ssh,emoji,calc,systemd";
+          sort = true;
+          # levenshtein-sort = true;
        };
      };

+      home.file.".local/share/rofi/themes" = {
+        recursive = true;
+        source = ./rofi/themes;
+      };
+
    };

-    launcherCommand = "${pkgs.rofi}/bin/rofi -show run -modi run";
+    launcherCommand = ''
+      ${rofi}/bin/rofi -modes drun -show drun -theme-str '@import "launcher.rasi"' '';
    systemdSearch = "${pkgs.rofi-systemd}/bin/rofi-systemd";
-    altTabCommand = "${pkgs.rofi}/bin/rofi -show window -modi window";
-
+    altTabCommand = "${rofi}/bin/rofi -show window -modi window";
+    audioSwitchCommand = "${
+        (pkgs.extraLib.mkScript {
+          name = "switch-audio";
+          file = ./rofi/pulse-sink.sh;
+          env = [ pkgs.ponymix rofi ];
+        })
+      }/bin/switch-audio";
  };

 }
--- a/modules/nixos/graphical/rofi/brightness.nix
+++ b/modules/nixos/graphical/rofi/brightness.nix
@ -0,0 +1,49 @@
+{ config, pkgs, ... }:
+let
+
+  rofi = config.home-manager.users.${config.user}.programs.rofi.finalPackage;
+
+in {
+
+  # Adapted from:
+  # A rofi powered menu to execute brightness choices.
+
+  config.brightnessCommand = builtins.toString
+    (pkgs.writeShellScript "brightness" ''
+
+      dimmer=""
+      medium=""
+      brighter=""
+
+      chosen=$(printf '%s;%s;%s\n' \
+          "$dimmer" \
+          "$medium" \
+          "$brighter" \
+          | ${rofi}/bin/rofi \
+              -theme-str '@import "brightness.rasi"' \
+              -hover-select \
+              -me-select-entry ''' \
+              -me-accept-entry MousePrimary \
+              -dmenu \
+              -sep ';' \
+              -selected-row 1)
+
+      case "$chosen" in
+          "$dimmer")
+              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 25; ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 25
+              ;;
+
+          "$medium")
+              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 75; ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 75
+              ;;
+
+          "$brighter")
+              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 100; ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 100
+              ;;
+
+          *) exit 1 ;;
+      esac
+
+    '');
+
+}
--- a/modules/nixos/graphical/rofi/brightness.sh
+++ b/modules/nixos/graphical/rofi/brightness.sh
@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# THEME="$HOME/.config/rofi/config.rasi"
-
-ICON_UP=""
-ICON_DOWN=""
-ICON_OPT=""
-options="$ICON_UP\n$ICON_OPT\n$ICON_DOWN"
-chosen="$(echo -e "$options" | rofi -theme-str 'listview { layout:horizontal; }' -dmenu)"
-echo "$chosen"
--- a/modules/nixos/graphical/rofi/power.nix
+++ b/modules/nixos/graphical/rofi/power.nix
@ -0,0 +1,61 @@
+{ config, pkgs, ... }:
+let
+
+  rofi = config.home-manager.users.${config.user}.programs.rofi.finalPackage;
+
+in {
+
+  # Adapted from:
+  # https://gitlab.com/vahnrr/rofi-menus/-/blob/b1f0e8a676eda5552e27ef631b0d43e660b23b8e/scripts/rofi-power
+  # A rofi powered menu to execute power related action.
+
+  config.powerCommand = builtins.toString (pkgs.writeShellScript "powermenu" ''
+    power_off=''
+    reboot=''
+    lock=''
+    suspend='鈴'
+    log_out=''
+
+    chosen=$(printf '%s;%s;%s;%s;%s\n' \
+        "$power_off" \
+        "$reboot" \
+        "$lock" \
+        "$suspend" \
+        "$log_out" \
+        | ${rofi}/bin/rofi \
+            -theme-str '@import "power.rasi"' \
+            -hover-select \
+            -me-select-entry ''' \
+            -me-accept-entry MousePrimary \
+            -dmenu \
+            -sep ';' \
+            -selected-row 2)
+
+    case "$chosen" in
+        "$power_off")
+            ${
+              builtins.toString ./rofi-prompt.sh
+            } 'Shutdown?' && doas shutdown now
+            ;;
+
+        "$reboot")
+            ${builtins.toString ./rofi-prompt.sh} 'Reboot?' && doas reboot
+            ;;
+
+        "$lock")
+            ${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span
+            ;;
+
+        "$suspend")
+            systemctl suspend
+            ;;
+
+        "$log_out")
+            ${builtins.toString ./rofi-prompt.sh} 'Logout?' && i3-msg exit
+            ;;
+
+        *) exit 1 ;;
+    esac
+  '');
+
+}
--- a/modules/nixos/graphical/rofi/pulse-sink.sh
+++ b/modules/nixos/graphical/rofi/pulse-sink.sh
@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Credit: https://gist.github.com/Nervengift/844a597104631c36513c
+
+sink=$(
+    ponymix -t sink list |
+        awk '/^sink/ {s=$1" "$2;getline;gsub(/^ +/,"",$0);print s" "$0}' |
+        rofi \
+            -dmenu \
+            -p 'pulseaudio sink:' \
+            -width 100 \
+            -hover-select \
+            -me-select-entry '' \
+            -me-accept-entry MousePrimary \
+            -theme-str 'inputbar { enabled: false; }' |
+        grep -Po '[0-9]+(?=:)'
+) &&
+    ponymix set-default -d "$sink" &&
+    for input in $(ponymix list -t sink-input | grep -Po '[0-9]+(?=:)'); do
+        echo "$input -> $sink"
+        ponymix -t sink-input -d "$input" move "$sink"
+    done
--- a/modules/nixos/graphical/rofi/rofi-prompt.sh
+++ b/modules/nixos/graphical/rofi/rofi-prompt.sh
@ -0,0 +1,47 @@
+#!/usr/bin/env sh
+
+# Credit: https://gitlab.com/vahnrr/rofi-menus/-/blob/b1f0e8a676eda5552e27ef631b0d43e660b23b8e/scripts/rofi-prompt
+
+# Rofi powered menu to prompt a message and get a yes/no answer.
+# Uses: rofi
+
+yes='Confirm'
+no='Cancel'
+query='Are you sure?'
+
+while [ $# -ne 0 ]; do
+    case "$1" in
+        -y | --yes)
+            [ -n "$2" ] && yes="$2" || yes=''
+            shift
+            ;;
+
+        -n | --no)
+            [ -n "$2" ] && no="$2" || no=''
+            shift
+            ;;
+
+        -q | --query)
+            [ -n "$2" ] && query="$2"
+            shift
+            ;;
+    esac
+    shift
+done
+
+chosen=$(printf '%s;%s\n' "$yes" "$no" |
+    rofi -theme-str '@import "prompt.rasi"' \
+        -hover-select \
+        -me-select-entry '' \
+        -me-accept-entry MousePrimary \
+        -p "$query" \
+        -dmenu \
+        -sep ';' \
+        -a 0 \
+        -u 1 \
+        -selected-row 1)
+
+case "$chosen" in
+    "$yes") exit 0 ;;
+    *) exit 1 ;;
+esac
--- a/modules/nixos/graphical/rofi/themes/brightness.rasi
+++ b/modules/nixos/graphical/rofi/themes/brightness.rasi
@ -0,0 +1,6 @@
+@import "common.rasi"
+
+#window {
+  width: 605px;
+  height: 230px;
+}
--- a/modules/nixos/graphical/rofi/themes/common.rasi
+++ b/modules/nixos/graphical/rofi/themes/common.rasi
@ -0,0 +1,57 @@
+/**
+ * Allows to change the settings of every menu simply by editing this file
+ * https://gitlab.com/vahnrr/rofi-menus/-/blob/b1f0e8a676eda5552e27ef631b0d43e660b23b8e/themes/shared/settings.rasi
+ */
+
+* {
+  /* General */
+  font:                                 "Hack Nerd Font 60";
+
+  /* option menus: i3-layout, music, power and screenshot
+   *
+   * Values bellow are 'no-padding' ones for a size 60 (@icon-font) font, played
+   * around using this character: ■
+   * We then add add 100 actual padding around the icons.
+   *                                    -12px 0px   -19px -96px */
+  option-element-padding:               1% 1% 1% 1%;
+  option-5-window-padding:              4% 4%;
+  option-5-listview-spacing:            15px;
+
+  prompt-text-font:                     "Hack Nerd Font 18";
+  prompt-window-height:                 300px;
+  prompt-window-width:                  627px;
+  prompt-window-border:                 2px;
+  prompt-prompt-padding:                20px 30px;
+  prompt-prompt-margin:                 8px;
+  prompt-listview-padding:              60px 114px 0px 114px;
+  /* Values bellow are 'no-padding' ones for a size 18 (@prompt-text-font) font,
+   * played around using this character: ■
+   * We then add add 30 actual padding around the text.
+   *                                    -4px  -1px  -6px  -28px */
+  prompt-element-padding:               26px  29px  24px  2px;
+
+  vpn-textbox-prompt-colon-padding:     @network-textbox-prompt-colon-padding;
+}
+
+/**
+ * Settings used in every rofi option menu:
+ */
+#window {
+  children: [ horibox ];
+}
+#horibox {
+  children: [ listview ];
+}
+#listview {
+  layout: horizontal;
+}
+element {
+  padding: 40px 68px 43px 30px;
+}
+#window {
+  padding: 20px;
+}
+#listview {
+  spacing: 10px;
+  lines: 5;
+}
--- a/modules/nixos/graphical/rofi/themes/launcher.rasi
+++ b/modules/nixos/graphical/rofi/themes/launcher.rasi
@ -0,0 +1,3 @@
+#entry {
+  placeholder: "Launch Program";
+}
--- a/modules/nixos/graphical/rofi/themes/power.rasi
+++ b/modules/nixos/graphical/rofi/themes/power.rasi
@ -0,0 +1,6 @@
+@import "common.rasi"
+
+#window {
+  width: 980px;
+  height: 230px;
+}
--- a/modules/nixos/graphical/rofi/themes/prompt.rasi
+++ b/modules/nixos/graphical/rofi/themes/prompt.rasi
@ -0,0 +1,49 @@
+/**
+ * This theme is intended for a 2 items option menu with a headerbar.
+ * https://gitlab.com/vahnrr/rofi-menus/-/blob/b1f0e8a676eda5552e27ef631b0d43e660b23b8e/themes/prompt.rasi
+ */
+@import "common.rasi"
+* {
+  font: @text-font;
+}
+#window {
+  height: @prompt-window-height;
+  width: @prompt-window-width;
+  children: [ inputbar, horibox ];
+  border: @prompt-window-border;
+  border-color: @accent;
+}
+#inputbar {
+  enabled: false;
+}
+#prompt {
+  padding: @prompt-prompt-padding;
+  margin: @prompt-prompt-margin;
+  background-color: @accent;
+  text-color: @background-light;
+}
+#listview {
+  padding: @prompt-listview-padding;
+  spacing: @option-5-listview-spacing;
+  lines: 2;
+}
+#element {
+  font: @prompt-text-font;
+  padding: @prompt-element-padding;
+}
+element.alternate.active,
+element.normal.active,
+element.alternate.urgent,
+element.normal.urgent {
+  background-color: @background-light;
+  text-color: @foreground;
+}
+element.selected.urgent {
+  background-color: @off;
+  text-color: @background;
+}
+element.selected.active {
+  background-color: @on;
+  text-color: @background;
+}
+
--- a/modules/nixos/hardware/keyboard.nix
+++ b/modules/nixos/hardware/keyboard.nix
@ -1,15 +1,22 @@
-{ ... }: {
+{ config, ... }: {

-  services.xserver = {
+  config = {

-    layout = "us";
+    services.xserver = {

-    # Keyboard responsiveness
-    autoRepeatDelay = 250;
-    autoRepeatInterval = 40;
+      layout = "us";

-    # Swap escape key with caps lock key
-    xkbOptions = "eurosign:e,caps:swapescape";
+      # Keyboard responsiveness
+      autoRepeatDelay = 250;
+      autoRepeatInterval = 40;
+
+      # Swap escape key with caps lock key
+      xkbOptions = "eurosign:e,caps:swapescape";
+
+    };
+
+    # Enable num lock on login
+    home-manager.users.${config.user}.xsession.numlock.enable = true;

  };

--- a/modules/nixos/hardware/sleep.nix
+++ b/modules/nixos/hardware/sleep.nix
@ -4,16 +4,22 @@

    # Prevent wake from keyboard
    powerManagement.powerDownCommands = ''
-      # for power in /sys/bus/usb/devices/*/power; do echo disabled > ''${power}/wakeup; done
+      set +e

-      # AMD issue: https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate#Instantaneous_wakeups_from_suspend
-      for power in /sys/bus/i2c/devices/i2c-*/device/power; do echo disabled > ''${power}/wakeup; done
+      for power in /sys/bus/i2c/devices/i2c-*/device/power; do echo disabled > ''${power}/wakeup || true; done
+      for power in /sys/bus/usb/devices/1-*/power; do echo disabled > ''${power}/wakeup || true; done
+
+      # Fix for Gigabyte motherboard
+      # /r/archlinux/comments/y7b97e/my_computer_wakes_up_immediately_after_i_suspend/isu99sr/
+      echo GPP0 > /proc/acpi/wakeup
+
+      set -e
    '';

-    # From here: https://www.reddit.com/r/NixOS/comments/wcu34f/how_would_i_do_this_in_nix/
-    # services.udev.extraRules = ''
-    #   ACTION=="add", SUBSYSTEM=="i2c", ATTRS{idVendor}=="<vendor>", ATTRS{idProduct}=="<product>" RUN+="${pkgs.bash}/bin/bash -c 'echo disabled > /sys/bus/i2c/devices/i2c-*/power/wakeup'"
-    # '';
+    services.udev.extraRules = ''
+      ACTION=="add", SUBSYSTEM=="usb", DRIVER=="usb", ATTR{power/wakeup}="disabled"
+      ACTION=="add", SUBSYSTEM=="i2c", ATTR{power/wakeup}="disabled"
+    '';

  };

--- a/modules/nixos/services/arr.nix
+++ b/modules/nixos/services/arr.nix
@ -0,0 +1,74 @@
+{ config, lib, ... }: {
+
+  options = {
+    arrServer = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Hostname for arr services";
+      default = null;
+    };
+  };
+
+  config = lib.mkIf (config.arrServer != null) {
+
+    services.sonarr.enable = true;
+    services.radarr.enable = true;
+    services.bazarr.enable = true;
+    services.prowlarr.enable = true;
+
+    # Grant users access to destination directories
+    users.users.sonarr.extraGroups = [ "jellyfin" ];
+    users.users.radarr.extraGroups = [ "jellyfin" ];
+    users.users.bazarr.extraGroups = [ "jellyfin" ];
+
+    # Requires updating the base_url config value in each service
+    # If you try to rewrite the URL, the service won't redirect properly
+    caddy.routes = [
+      {
+        group = "download";
+        match = [{
+          host = [ config.arrServer ];
+          path = [ "/sonarr*" ];
+        }];
+        handle = [{
+          handler = "reverse_proxy";
+          upstreams = [{ dial = "localhost:8989"; }];
+        }];
+      }
+      {
+        group = "download";
+        match = [{
+          host = [ config.arrServer ];
+          path = [ "/radarr*" ];
+        }];
+        handle = [{
+          handler = "reverse_proxy";
+          upstreams = [{ dial = "localhost:7878"; }];
+        }];
+      }
+      {
+        group = "download";
+        match = [{
+          host = [ config.arrServer ];
+          path = [ "/prowlarr*" ];
+        }];
+        handle = [{
+          handler = "reverse_proxy";
+          upstreams = [{ dial = "localhost:9696"; }];
+        }];
+      }
+      {
+        group = "download";
+        match = [{
+          host = [ config.arrServer ];
+          path = [ "/bazarr*" ];
+        }];
+        handle = [{
+          handler = "reverse_proxy";
+          upstreams = [{ dial = "localhost:6767"; }];
+        }];
+      }
+    ];
+
+  };
+
+}
--- a/modules/nixos/services/caddy.nix
+++ b/modules/nixos/services/caddy.nix
@ -24,6 +24,16 @@
          listen = [ ":443" ];
          routes = config.caddy.routes;
          errors.routes = config.caddy.blocks;
+          # logs = { }; # Uncomment to collect access logs
+        };
+        logging.logs.main = {
+          encoder = { format = "console"; };
+          writer = {
+            output = "file";
+            filename = "${config.services.caddy.logDir}/caddy.log";
+            roll = true;
+          };
+          level = "INFO";
        };
      });

--- a/modules/nixos/services/calibre.nix
+++ b/modules/nixos/services/calibre.nix
@ -41,6 +41,9 @@ in {
      }];
    }];

+    # Grant user access to Calibre directories
+    users.users.${config.user}.extraGroups = [ "calibre-web" ];
+
    # Run a backup on a schedule
    systemd.timers.calibre-backup = lib.mkIf config.backups.calibre {
      timerConfig = {
--- a/modules/nixos/services/default.nix
+++ b/modules/nixos/services/default.nix
@ -1,6 +1,7 @@
 { ... }: {

  imports = [
+    ./arr.nix
    ./backups.nix
    ./caddy.nix
    ./calibre.nix
--- a/modules/nixos/services/samba.nix
+++ b/modules/nixos/services/samba.nix
@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }: {
+{ config, lib, ... }: {

  options = { samba.enable = lib.mkEnableOption "Enable Samba sharing."; };

@ -12,8 +12,6 @@
        browseable = "yes";
        "read only" = "no";
        "guest ok" = "no";
-        "force user" = config.user;
-        "force group" = config.user;
        comment = "NAS";
      };
    };
--- a/modules/nixos/services/transmission.nix
+++ b/modules/nixos/services/transmission.nix
@ -41,7 +41,9 @@
    };

    # Create reverse proxy for web UI
-    caddy.routes = [{
+    caddy.routes = lib.mkAfter [{
+      group =
+        lib.mkIf (config.arrServer == config.transmissionServer) "download";
      match = [{ host = [ config.transmissionServer ]; }];
      handle = [{
        handler = "reverse_proxy";
--- a/modules/nixos/system/timezone.nix
+++ b/modules/nixos/system/timezone.nix
@ -14,6 +14,10 @@
    services.geoclue2.appConfig.localtimed.isSystem = true;
    services.geoclue2.appConfig.localtimed.isAllowed = true;

+    # Fix "Failed to set timezone"
+    # https://github.com/NixOS/nixpkgs/issues/68489#issuecomment-1484030107
+    services.geoclue2.enableDemoAgent = lib.mkForce true;
+
  };

 }
--- a/overlays/lib.nix
+++ b/overlays/lib.nix
@ -0,0 +1,16 @@
+_final: prev: {
+  extraLib = prev.lib // {
+
+    # Quickly package shell scripts with their dependencies
+    # From https://discourse.nixos.org/t/how-to-create-a-script-with-dependencies/7970/6
+    mkScript = { name, file, env ? [ ] }:
+      prev.pkgs.writeScriptBin name ''
+        for i in ${prev.lib.concatStringsSep " " env}; do
+          export PATH="$i/bin:$PATH"
+        done
+
+        exec ${prev.pkgs.bash}/bin/bash ${file} $@
+      '';
+  };
+
+}
Author	SHA1	Message	Date
Noah Masur	0833a0009c	enable dunst notifications also rebuilds with shortcuts	2023-04-02 19:19:40 -04:00
Noah Masur	e349ac35b8	fix: flake app for rebuilds	2023-04-02 18:47:06 -04:00
Noah Masur	49c2c013a2	update polybar spacing	2023-04-02 18:46:22 -04:00
Noah Masur	985b8bf13b	polybar audio and power buttons also switched from systemd because it breaks rofi	2023-04-02 16:53:01 -04:00
Noah Masur	8283480fd1	rofi brightness menu	2023-04-02 15:52:45 -04:00
Noah Masur	d6611ca7a2	rofi power menu	2023-04-02 12:25:33 -04:00
Noah Masur	a13083a264	now really fix sleep	2023-04-02 08:22:28 -04:00
Noah Masur	ff4db1463e	finally fix sleep on tempest	2023-04-01 20:21:26 -04:00
Noah Masur	afedfcf187	i3 focus or run browser and mail	2023-04-01 09:41:45 -04:00
Noah Masur	2e3c376d73	add prs shortcut	2023-03-31 12:39:10 -04:00
Noah Masur	59824adb3a	much improved speed in fzf project switcher	2023-03-30 10:24:19 -04:00
Noah Masur	8e32c16fd3	try to fix timezone failure	2023-03-27 13:45:23 -04:00
Noah Masur	76c80dd31d	fix: samba don't use force group	2023-03-26 20:52:28 +00:00
Noah Masur	57de089baf	add mpv delete file script	2023-03-25 10:51:20 -04:00
Noah Masur	f9c09deb2a	compile all grammars for nvim-treesitter	2023-03-24 16:20:47 -04:00
Noah Masur	b06b6490f4	start working on readme table fill out readme table more readme links and move installation clean up add more flake comments hosts and modules readmes fix: macos readme link switch links to relative file	2023-03-22 21:38:39 -04:00
Noah Masur	514244476d	adjust rofi themes	2023-03-22 21:33:06 -04:00
Noah Masur	47590abc3a	lazy evaluated let for rofi	2023-03-22 21:17:15 -04:00
Noah Masur	f69d233c39	switch audio with rofi and add extraLib	2023-03-22 21:15:41 -04:00
Noah Masur	9b97c9ac84	update lockfile, fix darwin	2023-03-22 16:20:38 -04:00
Noah Masur	bda59eeb4a	enable num lock on login	2023-03-21 18:37:22 -04:00
Noah Masur	e7468ecc46	fix: swan globals not included	2023-03-20 03:36:15 +00:00
Noah Masur	1b798f5af0	grant permissions to service directories	2023-03-20 03:35:54 +00:00
Noah Masur	4406116203	adjust fan curve	2023-03-19 23:35:06 -04:00
Noah Masur	c53f1470ee	allow rofi-systemd to use kitty terminal	2023-03-19 12:49:41 -04:00
Noah Masur	da89732001	switch to nsxiv and set media for aerc	2023-03-19 10:45:52 -04:00
Noah Masur	2176a53c4a	setup amd gpu fancontrol curve	2023-03-18 09:29:20 -04:00
Noah Masur	28576c1b8f	update lockfile	2023-03-16 14:52:20 -04:00
Noah Masur	64590c539b	reorder utilities alphabetically also add bc	2023-03-12 20:09:56 -04:00
Noah Masur	78b364afd7	launch aerc with super+E	2023-03-12 20:09:41 -04:00
Noah Masur	f219ce45c8	enable actual bash support	2023-03-12 19:00:59 -04:00
Noah Masur	5002c881f7	fix: mail not syncing read and deleted	2023-03-12 17:08:21 -04:00
Noah Masur	5859377802	fix: arr options when not used	2023-03-12 17:08:21 -04:00
Noah Masur	e6dbed2e17	enable caddy logfile	2023-03-12 13:24:25 +00:00
Noah Masur	86076f0844	add arr services	2023-03-12 13:24:16 +00:00
Noah Masur	2aea76c0e3	switch mpv to managed settings	2023-03-11 14:14:45 -05:00
Noah Masur	42a5ad40de	add heroic game launcher	2023-03-11 14:14:25 -05:00