feat(flake): use nix-systems and make sure all inputs use the same one

refactor(flake): rename flake.in.nix to outputs.nix
refactor: rename checks and move files out of flake dir
2024-08-06 13:27:06 -04:00 · 2024-08-05 20:51:11 -04:00 · 2024-08-05 16:40:32 -04:00 · 2024-08-05 16:23:53 -04:00 · 2024-08-05 11:45:07 -04:00 · 2024-08-04 20:36:20 -04:00
522 changed files with 21103 additions and 18095 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,9 +1,22 @@
+# Python
 *.egg-info
-*.temp
+
+# NPM
 *node_modules/
-*types
 *build/
-result*
-*config.js
-*icons
+
+# Direnv
 *.direnv/
+
+# Generated by nix
+result*
+.nixd.json
+
+## AGS
+nixosModules/ags/config/ts/lockscreen/vars.ts
+**/config.js
+*icons
+**/types
+
+# Other
+*.temp
--- a/README.md
+++ b/README.md
@ -6,7 +6,7 @@ You might find it weird that most of my config is written in TypeScript.
 That's because all my desktops run
 [AGS](https://github.com/Aylur/ags)
 for UI. Click on
-[this](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/modules/ags)
+[this](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/nixosModules/ags)
 to see my configuration.

 I'm also a victim of Stockholm syndrome at this point and make my scripts
@ -17,10 +17,8 @@ in TypeScript because it's the scripting language I am most comfortable with.
 ### General

 This repo is the complete configuration of machines I own,
-running NixOS or Nix. I tend to mix Home-Manager and NixOS
-a lot to make my custom modules by using my global vars system
-explained
-[here](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/devices)
+running NixOS or Nix. Its structure is based on a flake's
+[outputs](https://wiki.nixos.org/wiki/Flakes#Output_schema).

 ### Flake Location

@ -44,12 +42,21 @@ sudo ln -sf /home/matt/.nix /etc/nixos
 | ---------------------------------- | ----------- |
 | `nixosConfigurations`              | [devices](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/devices)' + ISO's configurations |
 | `nixOnDroidConfigurations.default` | [Nix-On-Droid](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/devices/android)'s configuration |
-| `formatter`                        | I have yet to know if this has any uses but I format with [alejandra](https://github.com/kamadorueda/alejandra) |
+| `packages`                         | Some custom [packages](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/packages) not available in nixpkgs or modified from it |
+| `legacyPackages`                   | Some custom [package scopes](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/legacyPackages) not available in nixpkgs or modified from it |
+| `apps`                             | Scripts ran from the flake defined [here](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/apps) |
+| `homeManagerModules`               | [Modules](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/homeManagerModules) made for home-manager |
+| `homeManagerModules`               | [Modules](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/nixosModules) made for NixOS systems |
+| `formatter`                        | I format nix code with [alejandra](https://github.com/kamadorueda/alejandra) |
 | `devShells.default`                | A dev shell to build an ISO from the live-image nixosConfiguration |
+| `devShells.ags`                    | A dev shell to have a NodeJS env when I enter my AGS's config directory |

 ### Flake Inputs

-I prefer using a more descriptive format for my inputs like so:
+To allow use of the full nix language for my inputs, I use [genflake](https://github.com/jorsn/flakegen).
+Therefore, the flake I edit is located at `./outputs.nix`.
+
+I also prefer using a more descriptive format for my inputs like so:

 ```nix
 nixpkgs = {
@ -67,29 +74,23 @@ nixpkgs = {

 to make it more clear what is what in the flake URI

-I also have a long list of inputs with `flake = false;` because
-it makes it easier to update non-flake custom packages or overlays
-to have the latest git. I make sure to end the names of these inputs
-with `src` to make it clear what they are.
-
 ### Secrets

 All my secrets are in a private git repo that makes use of
 [sops-nix](https://github.com/Mic92/sops-nix).
-I only use secrets stored in `JSON` and generate `.sops.yaml`
-from `.sops.nix`:
+I generate `.sops.yaml` from `.sops.nix`:

 ```nix
 let
  wim = "somekey";
-  oksys = "somekey2";
+  binto = "somekey2";
 in {
  creation_rules = [
    {
      path_regex = "secrets/[^/]+\\.(yaml|json|env|ini)$";
      key_groups = [
        {
-          age = [wim oksys];
+          age = [wim binto];
        }
      ];
    }
--- a/apps/default.nix
+++ b/apps/default.nix
@ -0,0 +1,14 @@
+{
+  inputs,
+  pkgs,
+  ...
+}: let
+  inherit (pkgs.lib) getExe;
+
+  mkApp = file: {
+    program = getExe (pkgs.callPackage file ({} // inputs));
+    type = "app";
+  };
+in {
+  updateFlake = mkApp ./update;
+}
--- a/apps/update/.envrc
+++ b/apps/update/.envrc
@ -0,0 +1 @@
+use flake $FLAKE#node
--- a/apps/update/default.nix
+++ b/apps/update/default.nix
@ -0,0 +1,37 @@
+{
+  lib,
+  system,
+  buildNpmPackage,
+  callPackage,
+  makeWrapper,
+  mozilla-addons-to-nix,
+  nodejs_latest,
+  ...
+}: let
+  inherit (lib) concatMapStringsSep getBin;
+  inherit (builtins) readFile fromJSON;
+
+  packageJSON = fromJSON (readFile ./package.json);
+  pname = packageJSON.name;
+in
+  buildNpmPackage rec {
+    name = pname;
+    inherit (packageJSON) version;
+
+    src = ./.;
+    npmDepsHash = "sha256-qpnQSJNl68LrsU8foJYxdBXpoFj7VKQahC9DFmleWTs=";
+
+    runtimeInputs = [
+      (callPackage ../../nixosModules/docker/updateImage.nix {})
+      mozilla-addons-to-nix.packages.${system}.default
+    ];
+    nativeBuildInputs = [makeWrapper];
+
+    postInstall = ''
+      wrapProgram $out/bin/${pname} \
+        --prefix PATH : ${concatMapStringsSep ":" (p: getBin p) runtimeInputs}
+    '';
+
+    nodejs = nodejs_latest;
+    meta.mainProgram = pname;
+  }
--- a/apps/update/eslint.config.js
+++ b/apps/update/eslint.config.js
@ -0,0 +1,464 @@
+// TODO: switch to typescript https://github.com/eslint/eslint/pull/18134
+
+import eslint from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import stylistic from '@stylistic/eslint-plugin';
+// import stylisticRules from '@stylistic/eslint-plugin/rule-options';
+import jsdoc from 'eslint-plugin-jsdoc';
+
+
+export default tseslint.config(
+    {
+        languageOptions: {
+            parserOptions: {
+                project: true,
+                tsconfigDirName: import.meta.dirname,
+            },
+        },
+
+        plugins: {
+            jsdoc,
+            // @ts-expect-error this works
+            '@stylistic': stylistic, // as typeof stylisticRules,
+        },
+
+        extends: [
+            eslint.configs.recommended,
+            jsdoc.configs['flat/recommended-typescript'],
+            ...tseslint.configs.recommended,
+        ],
+
+        rules: {
+            // JSDoc settings
+            'jsdoc/tag-lines': ['warn', 'any', { startLines: 1 }],
+            'jsdoc/check-line-alignment': ['warn', 'always', {
+                tags: ['param', 'arg', 'argument', 'property', 'prop'],
+            }],
+
+            // Newer settings
+            '@typescript-eslint/no-extraneous-class': ['off'],
+            '@typescript-eslint/no-implied-eval': ['off'],
+
+            // Pre-flat config
+            '@typescript-eslint/no-unused-vars': [
+                'error',
+                {
+                    args: 'all',
+                    argsIgnorePattern: '^_',
+                    caughtErrors: 'all',
+                    caughtErrorsIgnorePattern: '^_',
+                    destructuredArrayIgnorePattern: '^_',
+                    varsIgnorePattern: '^_',
+                    ignoreRestSiblings: true,
+                },
+            ],
+
+            'array-callback-return': [
+                'error',
+                {
+                    allowImplicit: true,
+                    checkForEach: true,
+                },
+            ],
+            'no-constructor-return': [
+                'error',
+            ],
+            'no-unreachable-loop': [
+                'error',
+                {
+                    ignore: [
+                        'ForInStatement',
+                        'ForOfStatement',
+                    ],
+                },
+            ],
+            'no-use-before-define': [
+                'error',
+                {
+                    functions: false,
+                },
+            ],
+            'block-scoped-var': [
+                'error',
+            ],
+            'class-methods-use-this': [
+                'error',
+            ],
+            'curly': [
+                'warn',
+            ],
+            'default-case-last': [
+                'warn',
+            ],
+            'default-param-last': [
+                'error',
+            ],
+            'eqeqeq': [
+                'error',
+                'smart',
+            ],
+            'func-names': [
+                'warn',
+                'never',
+            ],
+            'func-style': [
+                'warn',
+                'expression',
+            ],
+            'logical-assignment-operators': [
+                'warn',
+                'always',
+            ],
+            'no-array-constructor': [
+                'error',
+            ],
+            'no-empty-function': [
+                'warn',
+            ],
+            'no-empty-static-block': [
+                'warn',
+            ],
+            'no-extend-native': [
+                'error',
+            ],
+            'no-extra-bind': [
+                'warn',
+            ],
+            'no-implicit-coercion': [
+                'warn',
+            ],
+            'no-iterator': [
+                'error',
+            ],
+            'no-labels': [
+                'error',
+            ],
+            'no-lone-blocks': [
+                'error',
+            ],
+            'no-lonely-if': [
+                'error',
+            ],
+            'no-loop-func': [
+                'error',
+            ],
+            'no-magic-numbers': [
+                'error',
+                {
+                    ignore: [
+                        -1,
+                        0.1,
+                        0,
+                        1,
+                        2,
+                        3,
+                        4,
+                        5,
+                        10,
+                        12,
+                        33,
+                        66,
+                        100,
+                        255,
+                        360,
+                        450,
+                        500,
+                        1000,
+                    ],
+                    ignoreDefaultValues: true,
+                    ignoreClassFieldInitialValues: true,
+                },
+            ],
+            'no-multi-assign': [
+                'error',
+            ],
+            'no-new-wrappers': [
+                'error',
+            ],
+            'no-object-constructor': [
+                'error',
+            ],
+            'no-proto': [
+                'error',
+            ],
+            'no-return-assign': [
+                'error',
+            ],
+            'no-sequences': [
+                'error',
+            ],
+            'no-shadow': [
+                'error',
+                {
+                    builtinGlobals: true,
+                    allow: [
+                        'Window',
+                    ],
+                },
+            ],
+            'no-undef-init': [
+                'warn',
+            ],
+            'no-undefined': [
+                'error',
+            ],
+            'no-useless-constructor': [
+                'warn',
+            ],
+            'no-useless-escape': [
+                'off',
+            ],
+            'no-useless-return': [
+                'error',
+            ],
+            'no-var': [
+                'error',
+            ],
+            'no-void': [
+                'off',
+            ],
+            'no-with': [
+                'error',
+            ],
+            'object-shorthand': [
+                'error',
+                'always',
+            ],
+            'one-var': [
+                'error',
+                'never',
+            ],
+            'operator-assignment': [
+                'warn',
+                'always',
+            ],
+            'prefer-arrow-callback': [
+                'error',
+            ],
+            'prefer-const': [
+                'error',
+            ],
+            'prefer-object-has-own': [
+                'error',
+            ],
+            'prefer-regex-literals': [
+                'error',
+            ],
+            'prefer-template': [
+                'warn',
+            ],
+            'no-prototype-builtins': 'off',
+            '@typescript-eslint/no-var-requires': [
+                'off',
+            ],
+            '@stylistic/array-bracket-newline': [
+                'warn',
+                'consistent',
+            ],
+            '@stylistic/array-bracket-spacing': [
+                'warn',
+                'never',
+            ],
+            '@stylistic/arrow-parens': [
+                'warn',
+                'always',
+            ],
+            '@stylistic/brace-style': [
+                'warn',
+                'stroustrup',
+            ],
+            '@stylistic/comma-dangle': [
+                'warn',
+                'always-multiline',
+            ],
+            '@stylistic/comma-spacing': [
+                'warn',
+                {
+                    before: false,
+                    after: true,
+                },
+            ],
+            '@stylistic/comma-style': [
+                'error',
+                'last',
+            ],
+            '@stylistic/dot-location': [
+                'error',
+                'property',
+            ],
+            '@stylistic/function-call-argument-newline': [
+                'warn',
+                'consistent',
+            ],
+            '@stylistic/function-paren-newline': [
+                'warn',
+                'consistent',
+            ],
+            '@stylistic/indent': [
+                'warn',
+                4,
+                {
+                    SwitchCase: 1,
+                    ignoreComments: true,
+                    ignoredNodes: ['TemplateLiteral > *'],
+                },
+            ],
+            '@stylistic/key-spacing': [
+                'warn',
+                {
+                    beforeColon: false,
+                    afterColon: true,
+                },
+            ],
+            '@stylistic/keyword-spacing': [
+                'warn',
+                {
+                    before: true,
+                },
+            ],
+            '@stylistic/linebreak-style': [
+                'error',
+                'unix',
+            ],
+            '@stylistic/lines-between-class-members': [
+                'warn',
+                'always',
+                {
+                    exceptAfterSingleLine: true,
+                },
+            ],
+            '@stylistic/max-len': [
+                'warn',
+                {
+                    code: 105,
+                    ignoreComments: true,
+                    ignoreTrailingComments: true,
+                    ignoreUrls: true,
+                },
+            ],
+            '@stylistic/multiline-ternary': [
+                'warn',
+                'always-multiline',
+            ],
+            '@stylistic/new-parens': [
+                'error',
+            ],
+            '@stylistic/no-mixed-operators': [
+                'warn',
+            ],
+            '@stylistic/no-mixed-spaces-and-tabs': [
+                'error',
+            ],
+            '@stylistic/no-multi-spaces': [
+                'error',
+            ],
+            '@stylistic/no-tabs': [
+                'error',
+            ],
+            '@stylistic/no-trailing-spaces': [
+                'error',
+            ],
+            '@stylistic/no-whitespace-before-property': [
+                'warn',
+            ],
+            '@stylistic/nonblock-statement-body-position': [
+                'error',
+                'below',
+            ],
+            '@stylistic/object-curly-newline': [
+                'warn',
+                {
+                    consistent: true,
+                },
+            ],
+            '@stylistic/object-curly-spacing': [
+                'warn',
+                'always',
+            ],
+            '@stylistic/operator-linebreak': [
+                'warn',
+                'after',
+            ],
+            '@stylistic/padded-blocks': [
+                'error',
+                'never',
+            ],
+            '@stylistic/padding-line-between-statements': [
+                'warn',
+                {
+                    blankLine: 'always',
+                    prev: '*',
+                    next: 'return',
+                },
+                {
+                    blankLine: 'always',
+                    prev: [
+                        'const',
+                        'let',
+                        'var',
+                    ],
+                    next: '*',
+                },
+                {
+                    blankLine: 'any',
+                    prev: [
+                        'const',
+                        'let',
+                        'var',
+                    ],
+                    next: [
+                        'const',
+                        'let',
+                        'var',
+                    ],
+                },
+                {
+                    blankLine: 'always',
+                    prev: [
+                        'case',
+                        'default',
+                    ],
+                    next: '*',
+                },
+            ],
+            '@stylistic/quote-props': [
+                'error',
+                'consistent-as-needed',
+            ],
+            '@stylistic/quotes': [
+                'error',
+                'single',
+                {
+                    avoidEscape: true,
+                },
+            ],
+            '@stylistic/semi': [
+                'error',
+                'always',
+            ],
+            '@stylistic/semi-spacing': [
+                'warn',
+            ],
+            '@stylistic/space-before-blocks': [
+                'warn',
+            ],
+            '@stylistic/space-before-function-paren': [
+                'warn',
+                'never',
+            ],
+            '@stylistic/space-infix-ops': [
+                'warn',
+            ],
+            '@stylistic/spaced-comment': [
+                'warn',
+                'always',
+            ],
+            '@stylistic/switch-colon-spacing': [
+                'warn',
+            ],
+            '@stylistic/wrap-regex': [
+                'warn',
+            ],
+        },
+    },
+);
--- a/apps/update/package-lock.json
+++ b/apps/update/package-lock.json
--- a/apps/update/package.json
+++ b/apps/update/package.json
@ -0,0 +1,23 @@
+{
+    "name": "update-flake",
+    "version": "0.0.0",
+    "bin": "out/bin/app.cjs",
+    "type": "module",
+    "scripts": {
+        "build": "node_ver=$(node -v); esbuild src/app.ts --bundle --platform=node --target=\"node${node_ver:1:2}\" --outfile=out/bin/app.cjs"
+    },
+    "devDependencies": {
+        "@eslint/js": "9.7.0",
+        "@stylistic/eslint-plugin": "2.3.0",
+        "@types/eslint__js": "8.42.3",
+        "@types/node": "20.14.11",
+        "esbuild": "0.23.0",
+        "eslint": "9.7.0",
+        "eslint-plugin-jsdoc": "48.7.0",
+        "typescript": "5.5.3",
+        "typescript-eslint": "7.16.1"
+    },
+    "overrides": {
+        "eslint": "$eslint"
+    }
+}
--- a/apps/update/src/app.ts
+++ b/apps/update/src/app.ts
@ -0,0 +1,70 @@
+import { spawnSync } from 'node:child_process';
+
+import { parseArgs } from './lib.ts';
+import { updateFirefoxAddons } from '././firefox.ts';
+import { updateDocker, updateFlakeInputs, updateVuetorrent } from './misc.ts';
+
+
+/* Constants */
+const FLAKE = process.env.FLAKE;
+
+if (!FLAKE) {
+    console.error('Env var FLAKE not found');
+    process.exit(1);
+}
+
+const args = parseArgs();
+
+if (args['d'] || args['docker']) {
+    console.log(updateDocker());
+}
+
+if (args['i'] || args['inputs']) {
+    console.log(updateFlakeInputs());
+}
+
+if (args['f'] || args['firefox']) {
+    console.log(updateFirefoxAddons());
+}
+
+if (args['v'] || args['vuetorrent']) {
+    console.log(updateVuetorrent());
+}
+
+if (args['a'] || args['all']) {
+    // Update this first because of nix run cmd
+    const firefoxOutput = updateFirefoxAddons();
+
+    console.log(firefoxOutput);
+
+
+    const flakeOutput = updateFlakeInputs();
+
+    console.log(flakeOutput);
+
+
+    const dockerOutput = updateDocker();
+
+    console.log(dockerOutput);
+
+
+    const vuetorrentOutput = updateVuetorrent();
+
+    console.log(vuetorrentOutput);
+
+
+    spawnSync('nix-fast-build', ['-f', `${FLAKE}#checks`], {
+        shell: true,
+        stdio: [process.stdin, process.stdout, process.stderr],
+    });
+
+    console.log([
+        'chore: update flake.lock',
+        `Flake Inputs:\n${flakeOutput}`,
+        `Docker Images:\n${dockerOutput}`,
+        `Firefox Addons:\n${firefoxOutput}`,
+        `Misc Sources:\n${vuetorrentOutput}`,
+    ].join('\n\n'));
+}
+
+spawnSync('alejandra', ['-q', FLAKE], { shell: true });
--- a/apps/update/src/firefox.ts
+++ b/apps/update/src/firefox.ts
@ -0,0 +1,76 @@
+import { spawnSync } from 'node:child_process';
+import { readFileSync } from 'node:fs';
+
+import { parseFetchurl } from './lib.ts';
+
+/* Constants */
+const FLAKE = process.env.FLAKE;
+
+
+const updateFFZ = () => {
+    const FILE = `${FLAKE}/legacyPackages/firefox-addons/default.nix`;
+    const URL = 'https://cdn.frankerfacez.com/script/frankerfacez-4.0-an+fx.xpi';
+
+    const HASH = parseFetchurl(URL);
+
+    spawnSync('sed', ['-i', `'s,url = .*,url = \"${URL}\";,'`, FILE], { shell: true });
+    spawnSync('sed', ['-i', `'s,sha256 = .*,sha256 = \"${HASH}\";,'`, FILE], { shell: true });
+};
+
+export const updateFirefoxAddons = () => {
+    console.log('Updating FFZ addon');
+    updateFFZ();
+
+    console.log('Updating firefox addons using mozilla-addons-to-nix');
+
+    const DIR = `${FLAKE}/legacyPackages/firefox-addons`;
+    const GENERATED_FILE = `${DIR}/generated-firefox-addons.nix`;
+    const SLUGS = `${DIR}/addons.json`;
+
+    const nameMap = Object.fromEntries([...JSON.parse(readFileSync(SLUGS, 'utf-8'))]
+        .map((addon) => [addon.slug, addon.pname || addon.slug]));
+
+    const nixExpr = `'
+        x: let
+          inherit (builtins) attrValues filter hasAttr isAttrs map;
+        in
+          map (d: d.name) (filter (y:
+            isAttrs y &&
+            hasAttr "type" y &&
+            y.type == "derivation") (attrValues x))
+    '`;
+
+    const OLD_VERS = Object.fromEntries([...JSON.parse(spawnSync('nix', [
+        'eval',
+        '.#legacyPackages.x86_64-linux.firefoxAddons',
+        '--apply',
+        nixExpr,
+        '--json',
+    ], { shell: true }).stdout.toString())]
+        .map((p) => {
+            const pname = p.replace(/-[0-9].*$/, '');
+
+            return [pname, p.replace(`${pname}-`, '')];
+        })
+        .filter((pinfo) => pinfo[0] !== 'frankerfacez'));
+
+    const NEW_VERS = Object.fromEntries(spawnSync(
+        'nix',
+        ['run', 'sourcehut:~rycee/mozilla-addons-to-nix',
+            SLUGS, GENERATED_FILE],
+        { shell: true },
+    ).stdout
+        .toString()
+        .split('\n')
+        .map((p) => {
+            const pinfo = p.replace('Fetched ', '').split(' ');
+
+            return [nameMap[pinfo[0]], pinfo[2]];
+        }));
+
+    return Object.keys(OLD_VERS)
+        .sort()
+        .filter((pname) => OLD_VERS[pname] !== NEW_VERS[pname])
+        .map((pname) => `${pname}: ${OLD_VERS[pname]} -> ${NEW_VERS[pname]}`)
+        .join('\n');
+};
--- a/apps/update/src/lib.ts
+++ b/apps/update/src/lib.ts
@ -0,0 +1,30 @@
+import { spawnSync } from 'node:child_process';
+
+
+export const parseArgs = () => {
+    const args = {} as Record<string, unknown>;
+    let lastFlag: string | null = null;
+
+    for (let i = 2; i < process.argv.length; ++i) {
+        const arg = process.argv[i];
+
+        if (arg.toString().startsWith('-')) {
+            lastFlag = arg.toString().replace(/^-{1,2}/, '');
+            args[lastFlag] = true;
+        }
+        else if (lastFlag) {
+            args[lastFlag] = arg;
+            lastFlag = null;
+        }
+        else {
+            console.error(`Could not parse args: ${arg.toString()}`);
+        }
+    }
+
+    return args;
+};
+
+export const parseFetchurl = (url: string) => JSON.parse(spawnSync(
+    'nix', ['store', 'prefetch-file', '--refresh', '--json',
+        '--hash-type', 'sha256', url, '--name', '"escaped"'], { shell: true },
+).stdout.toString()).hash;
--- a/apps/update/src/misc.ts
+++ b/apps/update/src/misc.ts
@ -0,0 +1,75 @@
+import { readdirSync, writeFileSync } from 'node:fs';
+import { spawnSync } from 'node:child_process';
+
+import { parseFetchurl } from './lib.ts';
+
+
+/* Constants */
+const FLAKE = process.env.FLAKE;
+
+export const updateFlakeInputs = () => {
+    const output = spawnSync(
+        `git restore flake.lock &> /dev/null; nix flake update --flake ${FLAKE}` +
+            ' |& grep -v "warning: updating lock file"',
+        [],
+        { shell: true },
+    ).stdout
+        .toString()
+        // Add an extra blank line between inputs
+        .split('\n•')
+        .join('\n\n•')
+        // Shorten git revs to help readability
+        .split('\n')
+        .map((l) => l
+            .replace(/.{33}\?narHash=sha256[^']*/, '')
+            .replace(/&rev=(.{7})[^'&]*/, (_, backref) => `&rev=${backref}`))
+        .join('\n');
+
+    return output;
+};
+
+export const updateDocker = () => {
+    let updates = '';
+
+    const FILE = `${FLAKE}/devices/nos/modules/docker`;
+
+    readdirSync(FILE, { withFileTypes: true, recursive: true }).forEach((path) => {
+        if (path.name === 'compose.nix') {
+            console.log(`Updating ${path.parentPath.split('/').at(-1)} images`);
+            updates += spawnSync('updateImages', [path.parentPath], { shell: true })
+                .stdout.toString();
+        }
+    });
+
+    return updates;
+};
+
+const genVueText = (version: string, hash: string, url: string) =>
+    `# This file was autogenerated. DO NOT EDIT!
+{
+  version = "${version}";
+  url = "${url}";
+  hash = "${hash}";
+}
+`;
+
+export const updateVuetorrent = () => {
+    const FILE = `${FLAKE}/devices/nos/modules/qbittorrent/vuetorrent.nix`;
+
+    const OLD_VERSION = JSON.parse(spawnSync('nix',
+        ['eval', '-f', FILE, '--json'],
+        { shell: true }).stdout.toString()).version;
+
+    const VERSION = JSON.parse(spawnSync('curl',
+        ['-s', 'https://api.github.com/repos/VueTorrent/VueTorrent/releases/latest'],
+        { shell: true }).stdout.toString()).tag_name.replace('v', '');
+
+    const URL = `https://github.com/VueTorrent/VueTorrent/releases/download/v${VERSION}/vuetorrent.zip`;
+    const HASH = parseFetchurl(URL);
+
+    const fileText = genVueText(VERSION, HASH, URL);
+
+    writeFileSync(FILE, fileText);
+
+    return OLD_VERSION !== VERSION ? `Vuetorrent: ${OLD_VERSION} -> ${VERSION}` : '';
+};
--- a/apps/update/tsconfig.json
+++ b/apps/update/tsconfig.json
@ -0,0 +1,31 @@
+{
+  "compilerOptions": {
+    // Env
+    "target": "ESNext",
+    "lib": ["ESNext"],
+    // Module
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "allowImportingTsExtensions": true,
+    "baseUrl": ".",
+    // Emit
+    "noEmit": true,
+    "newLine": "LF",
+    // Interop
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "isolatedModules": true,
+    // Type Checking
+    "strict": true,
+    "noImplicitAny": false,
+    "allowJs": true,
+    "checkJs": true
+  },
+  "includes": [
+    "*.ts",
+    "**/*.ts",
+    "*.js",
+    "**/*.js"
+  ]
+}
--- a/checks/default.nix
+++ b/checks/default.nix
@ -0,0 +1,7 @@
+{
+  pkgs,
+  self,
+}: let
+  nixosMachines = import ./machines.nix {inherit pkgs self;};
+in
+  nixosMachines
--- a/checks/machines.nix
+++ b/checks/machines.nix
@ -0,0 +1,10 @@
+# CI: https://github.com/Mic92/dotfiles/blob/c2f538934d67417941f83d8bb65b8263c43d32ca/flake.nix#L168
+{
+  pkgs,
+  self,
+}: let
+  inherit (pkgs.lib) filterAttrs mapAttrs' nameValuePair;
+in
+  mapAttrs'
+  (name: config: nameValuePair "nixos-${name}" config.config.system.build.toplevel)
+  ((filterAttrs (_: config: config.pkgs.system == pkgs.system)) self.nixosConfigurations)
--- a/common/default.nix
+++ b/common/default.nix
@ -4,41 +4,33 @@
  lib,
  nh,
  nix-melt,
-  nur,
  nurl,
  pkgs,
+  self,
  ...
-} @ inputs: {
+}: {
  imports = [
    ./vars

    ./modules
-    ./pkgs
+    ./packages.nix
+    self.nixosModules.borgbackup

-    nur.nixosModules.nur
-    nh.nixosModules.default
    home-manager.nixosModules.home-manager
-
-    ../modules/arion
-    ../modules/borgbackup
-    ../modules/nvidia.nix
  ];

-  nixpkgs = {
-    config.allowUnfree = true;
-    overlays = import ./overlays inputs;
+  boot.tmp.useTmpfs = true;
+
+  systemd.services.nix-daemon = {
+    environment.TMPDIR = "/home/nix-cache";
+    preStart = ''
+      mkdir -p ${config.systemd.services.nix-daemon.environment.TMPDIR}
+    '';
  };
-  boot.tmp.cleanOnBoot = true;

  nix = {
-    # Allow deleting store files with '.' in the name
-    package = pkgs.nix.overrideAttrs (o: {
-      patches =
-        (o.patches or [])
-        ++ [
-          ./overlays/nix/patch
-        ];
-    });
+    package = pkgs.nixVersions.nix_2_23;
+
    # Edit nix.conf
    settings = {
      # Store
@ -51,14 +43,17 @@
      http-connections = 0; # unlimited for local cache
      warn-dirty = false;
      show-trace = true;
+      allow-import-from-derivation = true;

      # remote building
      trusted-users = ["matt" "nixremote"];
    };
  };

-  nh = {
+  programs.nh = {
    enable = true;
+    package = nh.packages.${pkgs.system}.default;
+
    # weekly cleanup
    clean = {
      enable = true;
@ -75,7 +70,38 @@
    };
  };

+  boot.supportedFilesystems = ["ext4" "xfs" "btrfs" "vfat" "ntfs"];
+  system.fsPackages = with pkgs; [
+    btrfs-progs
+    nfs-utils
+    ntfs3g
+    xfsprogs
+  ];
+
+  environment.variables.NPM_CONFIG_GLOBALCONFIG = "/etc/npmrc";
+  environment.etc.npmrc.text = ''
+    fund = false
+    update-notifier = false
+  '';
+
+  environment.systemPackages =
+    (with pkgs; [
+      # Peripherals
+      hdparm
+      pciutils
+      usbutils
+    ])
+    ++ [
+      nix-melt.packages.${pkgs.system}.default
+
+      (nurl.packages.${pkgs.system}.default.override {
+        nix = config.nix.package;
+      })
+    ];
+
  home-manager = let
+    inherit (lib) mapAttrs' nameValuePair;
+
    inherit (config.vars) mainUser;
    mainUserConf = config.home-manager.users.${mainUser};

@ -90,21 +116,22 @@
          };
        }

-        nur.hmModules.nur
+        {
+          programs.bash.sessionVariables = {
+            FLAKE = config.environment.variables.FLAKE;
+          };
+        }

        ./home
        ./home/trash-d
-        ./pkgs
      ];

-      home.packages =
-        [
-          nix-melt.packages.${pkgs.system}.default
-          nurl.packages.${pkgs.system}.default
-        ]
-        ++ (with config.nur.repos.rycee; [
-          mozilla-addons-to-nix
-        ]);
+      # Cache devShells
+      home.file = mapAttrs' (n: v:
+        nameValuePair ".cache/devShells/${n}" {
+          source = v;
+        })
+      self.devShells.${pkgs.system};
    };
  in {
    users = {
--- a/common/home/bash/default.nix
+++ b/common/home/bash/default.nix
@ -123,9 +123,7 @@ in {
      #profileExtra = ''
      #'';
      bashrcExtra =
-        /*
-        bash
-        */
+        # bash
        ''
          # Check if shell is interactive
          [[ $- == *i* ]] || return 0
--- a/common/home/bash/programs.nix
+++ b/common/home/bash/programs.nix
@ -1,6 +1,7 @@
 {
  pkgs,
  config,
+  self,
  ...
 }: {
  programs = {
@ -41,15 +42,10 @@

    bat = {
      enable = true;
-      config = {
-        theme = "dracula-bat";
-      };
-      themes = {
-        dracula-bat = {
-          src = pkgs.dracula-theme;
-          file = "bat";
-        };
-      };
+
+      config.theme = "dracula-bat";
+      themes.dracula-bat.src = self.legacyPackages.${pkgs.system}.dracula.bat;
+
      extraPackages = with pkgs.bat-extras; [
        batman
      ];
--- a/common/home/default.nix
+++ b/common/home/default.nix
@ -6,6 +6,5 @@
    ./neovim
    ./nix-index
    ./tmux
-    ./packages.nix
  ];
 }
--- a/common/home/direnv/default.nix
+++ b/common/home/direnv/default.nix
@ -2,9 +2,10 @@
  programs.direnv = {
    enable = true;
    enableBashIntegration = true;
+
    nix-direnv = {
      enable = true;
-      package = pkgs.nix-direnv-flakes;
+      package = pkgs.nix-direnv;
    };
  };
 }
--- a/common/home/git/default.nix
+++ b/common/home/git/default.nix
@ -1,41 +1,27 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  self,
+  ...
+}: let
+  mkRemoteConf = remote: email: name: {
+    condition = "hasconfig:remote.*.url:${remote}:*/**";
+    contents.user = {inherit email name;};
+  };
+  mkDefaultRemote = remote: mkRemoteConf remote "matt@nelim.org" "matt1432";
+in {
  programs = {
    git = {
      enable = true;
      lfs.enable = true;

      includes = [
-        {path = "${pkgs.dracula-theme}/git-colors";}
+        {path = toString self.legacyPackages.${pkgs.system}.dracula.git;}

-        {
-          condition = "hasconfig:remote.*.url:git@github.com:*/**";
-          contents = {
-            user = {
-              email = "matt@nelim.org";
-              name = "matt1432";
-            };
-          };
-        }
+        (mkDefaultRemote "https://github.com")
+        (mkDefaultRemote "git@github.com")
+        (mkDefaultRemote "git@git.nelim.org")

-        {
-          condition = "hasconfig:remote.*.url:git@git.nelim.org:*/**";
-          contents = {
-            user = {
-              email = "matt@nelim.org";
-              name = "matt1432";
-            };
-          };
-        }
-
-        {
-          condition = "hasconfig:remote.*.url:git@gitlab.info.uqam.ca:*/**";
-          contents = {
-            user = {
-              email = "gj591944@ens.uqam.ca";
-              name = "Mathis Hurtubise";
-            };
-          };
-        }
+        (mkRemoteConf "git@gitlab.info.uqam.ca" "gj591944@ens.uqam.ca" "Mathis Hurtubise")
      ];

      delta = {
--- a/common/home/neovim/.editorconfig
+++ b/common/home/neovim/.editorconfig
@ -0,0 +1,107 @@
+# see https://github.com/CppCXY/EmmyLuaCodeStyle
+[*.lua]
+# [basic]
+indent_style = space
+indent_size = 4
+quote_style = single
+
+max_line_length = 120
+end_of_line = lf
+
+table_separator_style = comma
+trailing_table_separator = smart
+
+call_arg_parentheses = keep
+
+# [space]
+space_around_table_field_list = true
+space_before_attribute = true
+space_before_function_open_parenthesis = false
+space_before_function_call_open_parenthesis = false
+space_before_closure_open_parenthesis = false
+space_before_function_call_single_arg = false
+space_before_open_square_bracket = false
+space_inside_function_call_parentheses = false
+space_inside_function_param_list_parentheses = false
+space_inside_square_brackets = false
+
+# like t[#t+1] = 1
+space_around_table_append_operator = false
+ignore_spaces_inside_function_call = false
+
+# detail number or 'keep'
+space_before_inline_comment = 1
+
+# convert '---' to '--- ' or '--' to '-- '
+space_after_comment_dash = false
+
+# [operator space]
+space_around_math_operator = true
+space_around_math_operator.exponent = false
+space_around_concat_operator = true
+space_around_logical_operator = true
+space_around_assign_operator = true
+
+space_after_comma = true
+space_after_comma_in_for_statement = true
+
+# [align]
+align_call_args = false
+align_function_params = true
+align_continuous_assign_statement = true
+align_continuous_rect_table_field = true
+align_continuous_line_space = 2
+align_if_branch = false
+
+# option none / always / contain_curly/
+align_array_table = true
+
+align_continuous_similar_call_args = false
+
+align_continuous_inline_comment = true
+# option none / always / only_call_stmt
+align_chain_expr = none
+
+# [indent]
+never_indent_before_if_condition = false
+never_indent_comment_on_if_branch = false
+keep_indents_on_empty_lines = false
+allow_non_indented_comments = false
+
+# [line space]
+
+# The following configuration supports four expressions
+# keep
+# fixed(n)
+# min(n)
+# max(n)
+# for eg. min(2)
+
+line_space_after_if_statement = keep
+
+line_space_after_do_statement = keep
+
+line_space_after_while_statement = keep
+
+line_space_after_repeat_statement = keep
+
+line_space_after_for_statement = keep
+
+line_space_after_local_or_assign_statement = keep
+
+line_space_after_function_statement = fixed(2)
+
+line_space_after_expression_statement = keep
+
+line_space_after_comment = keep
+
+line_space_around_block = fixed(1)
+
+# [line break]
+break_all_list_when_line_exceed = false
+auto_collapse_lines = false
+break_before_braces = false
+
+# [preference]
+ignore_space_after_colon = false
+end_statement_with_semicolon = always
--- a/common/home/neovim/base.lua
+++ b/common/home/neovim/base.lua
@ -1,2 +0,0 @@
-- Add `:Format` command to format current buffer
-vim.api.nvim_create_user_command("Format", "call CocAction('format')", {})
--- a/common/home/neovim/base.vim
+++ b/common/home/neovim/base.vim
@ -1,34 +0,0 @@
-" by default, the indent is 2 spaces.
-set smartindent
-set expandtab
-set shiftwidth=2
-set softtabstop=2
-set tabstop=2
-
-" for html/rb files, 2 spaces
-autocmd Filetype html setlocal ts=2 sw=2 expandtab
-autocmd Filetype ruby setlocal ts=2 sw=2 expandtab
-
-" for js/coffee/jade files, 4 spaces
-autocmd Filetype javascript setlocal ts=4 sw=4 sts=0 expandtab
-autocmd Filetype typescript setlocal ts=4 sw=4 sts=0 expandtab
-autocmd Filetype java setlocal ts=4 sw=4 sts=0 expandtab
-autocmd Filetype sh setlocal ts=4 sw=4 sts=0 expandtab
-autocmd Filetype hyprlang setlocal ts=4 sw=4 sts=0 expandtab
-
-" support scss @
-autocmd FileType scss setl iskeyword+=@-@
-
-set number
-set relativenumber
-
-" TODO: make this work for nix-on-droid
-set undofile
-set undodir=/home/matt/.cache/nvim/
-
-" remove highlight on words
-nnoremap <silent> <esc> :noh<cr><esc>
-
-" Always show the signcolumn, otherwise it would shift the text each time
-" diagnostics appear/become resolved
-set signcolumn=yes
--- a/common/home/neovim/default.nix
+++ b/common/home/neovim/default.nix
@ -1,340 +1,103 @@
 {
  config,
  pkgs,
-  lib,
-  nvim-theme-src,
-  coc-stylelintplus,
-  vimplugin-riscv-src,
  ...
 }: let
-  inherit (config.vars) neovimIde;
-  inherit (lib) fileContents hasAttr optionalAttrs optionals;
-
-  javaSdk = pkgs.temurin-bin-17;
-  coc-stylelintplus-flake = coc-stylelintplus.packages.${pkgs.system}.default;
+  inherit (pkgs) vimPlugins;
 in {
-  home = optionalAttrs neovimIde {
-    packages = with pkgs; [
-      gradle
-      maven
-      alejandra
-    ];
-  };
-
-  xdg.dataFile = optionalAttrs neovimIde {
-    ".gradle/gradle.properties".text = ''
-      org.gradle.java.home = ${javaSdk}
-    '';
-  };
+  imports = [
+    ./git.nix
+    ./langs
+    ./theme.nix
+    ./treesitter.nix
+  ];

  programs = {
-    java = optionalAttrs neovimIde {
-      enable = true;
-      package = javaSdk;
-    };
-
-    # I love doing typos
-    bash.shellAliases = {
-      nivm = "nvim";
-      nivim = "nvim";
-    };
-
    neovim = {
      enable = true;
-      withNodeJs = true;
-      withPython3 = true;
-      withRuby = false;

-      defaultEditor = true;
-      viAlias = true;
-      vimAlias = true;
+      extraLuaConfig =
+        # lua
+        ''
+          -- by default, the indent is 2 spaces.
+          vim.opt.smartindent = true;
+          vim.opt.expandtab = true;
+          vim.opt.shiftwidth = 2;
+          vim.opt.softtabstop = 2;
+          vim.opt.tabstop = 2;

-      extraPackages = with pkgs; ([
-          bat
-          gcc
-        ]
-        ++ optionals neovimIde [
-          nodejs_latest
-          nodePackages.npm
-          nodePackages.neovim
-          gradle
-          nil
-        ]);
+          vim.opt.number = true;
+          vim.opt.relativenumber = true;

-      extraPython3Packages = ps:
-        optionals neovimIde [
-          ps.pylint
-        ];
+          vim.opt.undofile = true;
+          vim.opt.undodir = '${config.xdg.cacheHome}/nvim/';

-      coc = optionalAttrs neovimIde {
-        enable = true;
-        settings = {
-          # General
-          colors.enable = true;
-          coc.preferences.formatOnType = true;
-          diagnostic.checkCurrentLine = true;
-          inlayHint.enable = false;
+          -- Always show the signcolumn, otherwise it would shift
+          -- the text each time diagnostics appear/become resolved
+          vim.opt.signcolumn = 'yes';

-          # ESLint
-          eslint = {
-            format.enable = true;
-            autoFixOnSave = true;
-          };
+          -- remove highlight on words
+          vim.keymap.set('n', '<esc>', ':noh<cr><esc>', {
+            noremap = true,
+            silent = true,
+          });

-          # Stylelint
-          stylelintplus = {
-            enable = true;
-            cssInJs = true;
-            autoFixOnSave = true;
-            autoFixOnFormat = true;
-          };
-          css.validate = false;
-          less.validate = false;
-          scss.validate = false;
-          wxss.validate = false;
+          -- Get rid of deprecated messages
+          vim.tbl_add_reverse_lookup = function(tbl)
+              for k, v in pairs(tbl) do
+                  tbl[v] = k;
+              end
+          end;
+          vim.tbl_islist = function(tbl)
+              return vim.islist(tbl);
+          end;
+          vim.diagnostic.is_disabled = function()
+              return not vim.diagnostic.is_enabled();
+          end;
+          vim.lsp.buf_get_clients = function()
+              return vim.lsp.get_clients();
+          end;
+          vim.lsp.get_active_clients = function()
+              return vim.lsp.get_clients();
+          end;
+        '';

-          # Lua
-          Lua = {
-            misc.parameters = [
-              "--metapath"
-              "~/.cache/sumneko_lua/meta"
-              "--logpath"
-              "~/.cache/sumneko_lua/log"
-            ];
-            workspace.library = [
-              "$\{3rd\}/luv/library"
-            ];
-          };
-          sumneko-lua = {
-            serverDir = "${pkgs.lua-language-server}/share/lua-language-server";
-            enableNvimLuaDev = true;
-          };
+      plugins = [
+        vimPlugins.fzfWrapper
+        vimPlugins.fzf-vim

-          languageserver = {
-            # Nix
-            nix = {
-              command = "nil";
-              filetypes = ["nix"];
-              rootPatterns = ["flake.nix"];
-              settings = {
-                nil = {
-                  formatting.command = ["alejandra"];
+        {
+          plugin = vimPlugins.todo-comments-nvim;
+          type = "lua";
+          config =
+            # lua
+            ''
+              require('todo-comments').setup();
+            '';
+        }
+        {
+          plugin = vimPlugins.mini-nvim;
+          type = "lua";
+          config =
+            # lua
+            ''
+              -- TODO: see how this works
+              local ts_input = require('mini.surround').gen_spec.input.treesitter;

-                  nix = {
-                    maxMemoryMB = 2560;
-                    flake.autoArchive = hasAttr "sops" config;
-                  };
-                };
-              };
-            };
-          };
-
-          # Java
-          java = {
-            maven.downloadSources = true;
-            eclipse.downloadSources = true;
-
-            format.settings.url = "eclipse-formatter.xml";
-
-            jdt.ls = {
-              java.home = "${javaSdk}";
-              statusIcons = {
-                "busy" = "Busy";
-                "ready" = "OK";
-                "warning" = "Warning";
-                "error" = "Error";
-              };
-            };
-          };
-
-          # Bash
-          bashIde.shellcheckPath = "${pkgs.shellcheck}/bin/shellcheck";
-
-          markdownlint.config = {
-            no-trailing-spaces = true;
-            no-multiple-blanks = false;
-            no-duplicate-heading = false;
-          };
-        };
-      };
-
-      extraConfig = fileContents ./base.vim;
-      extraLuaConfig = fileContents ./base.lua;
-
-      plugins = with pkgs.vimPlugins;
-        ([
-            fzfWrapper
-            fzf-vim
-            fugitive
-
-            {
-              plugin = dracula-nvim.overrideAttrs {
-                src = nvim-theme-src;
-              };
-              type = "viml";
-              config = fileContents ./plugins/dracula.vim;
-            }
-            {
-              plugin = todo-comments-nvim;
-              type = "lua";
-              config =
-                /*
-                lua
-                */
-                ''require('todo-comments').setup()'';
-            }
-            {
-              plugin = gitsigns-nvim;
-              type = "lua";
-              config = fileContents ./plugins/gitsigns.lua;
-            }
-            {
-              plugin = indent-blankline-nvim;
-              type = "lua";
-              config = fileContents ./plugins/indent.lua;
-            }
-            {
-              plugin = mini-nvim;
-              type = "lua";
-              config = fileContents ./plugins/mini.lua;
-            }
-          ]
-          ++ optionals neovimIde [
-            markdown-preview-nvim
-
-            # Coc configured
-            coc-css
-            coc-eslint
-            coc-java
-            coc-sh
-            coc-stylelintplus-flake
-            {
-              plugin = coc-snippets;
-              type = "viml";
-              config = fileContents ./plugins/snippets.vim;
-            }
-
-            ## Lua
-            coc-sumneko-lua
-            neodev-nvim
-
-            ## Fzf
-            coc-fzf
-
-            coc-highlight
-            coc-json
-            coc-pyright
-            coc-vimlsp
-            coc-yaml
-            coc-toml
-            coc-markdownlint
-            coc-tsserver
-
-            {
-              plugin = nvim-autopairs;
-              type = "lua";
-              config = fileContents ./plugins/autopairs.lua;
-            }
-            {
-              plugin = lualine-nvim;
-              type = "lua";
-              config = fileContents ./plugins/lualine.lua;
-            }
-            {
-              plugin = neo-tree-nvim;
-              type = "viml";
-              config = ''
-                ${fileContents ./plugins/neotree.vim}
-
-                lua << EOF
-                  ${fileContents ./plugins/neotree.lua}
-                EOF
-              '';
-            }
-            (pkgs.vimUtils.buildVimPlugin {
-              name = "riscv-asm";
-              src = vimplugin-riscv-src;
-            })
-          ])
-        # Treesitter
-        ++ (with pkgs.vimPlugins; [
-          nvim-treesitter-context
-          nvim-treesitter-textobjects
-          {
-            type = "viml";
-            config = fileContents ./plugins/treesitter.vim;
-            plugin = nvim-treesitter.withPlugins (p: [
-              p.awk
-              p.bash
-              p.c
-              p.c_sharp
-              p.cairo
-              p.cmake
-              p.comment
-              p.cpp
-              p.css
-              p.csv
-              p.cuda
-              p.diff
-              p.dockerfile
-              p.dot
-              p.git_config
-              p.git_rebase
-              p.gitattributes
-              p.gitcommit
-              p.gitignore
-              p.go
-              p.gomod
-              p.gosum
-              p.groovy
-              p.haskell
-              p.haskell_persistent
-              p.hyprlang
-              p.html
-              p.ini
-              p.java
-              p.javascript
-              p.jq
-              p.jsdoc
-              p.json
-              p.json5
-              p.jsonc
-              p.jsonnet
-              p.kotlin
-              p.latex
-              p.lua
-              p.luadoc
-              p.make
-              p.markdown
-              p.meson
-              p.ninja
-              p.nix
-              p.passwd
-              p.perl
-              p.php
-              p.phpdoc
-              p.properties
-              p.python
-              p.rasi
-              p.regex
-              p.requirements
-              p.ruby
-              p.rust
-              p.scss
-              p.sql
-              p.ssh_config
-              p.toml
-              p.todotxt
-              p.typescript
-              p.udev
-              p.vim
-              p.vimdoc
-              p.vue
-              p.xml
-              p.yaml
-            ]);
-          }
-        ]);
+              require('mini.surround').setup({
+                  custom_surroundings = {
+                      -- Use tree-sitter to search for function call
+                      f = {
+                          input = ts_input({
+                            outer = '@call.outer',
+                            inner = '@call.inner',
+                          });
+                      },
+                  },
+              });
+            '';
+        }
+      ];
    };
  };
 }
--- a/common/home/neovim/git.nix
+++ b/common/home/neovim/git.nix
@ -0,0 +1,33 @@
+{pkgs, ...}: let
+  inherit (pkgs) vimPlugins;
+in {
+  programs = {
+    neovim = {
+      plugins = [
+        vimPlugins.fugitive
+
+        {
+          plugin = vimPlugins.gitsigns-nvim;
+          type = "lua";
+          config =
+            # lua
+            ''
+              local gitsigns = require("gitsigns");
+
+              local function visual_stage()
+                  local first_line = vim.fn.line('v');
+                  local last_line = vim.fn.getpos('.')[2];
+                  gitsigns.stage_hunk({ first_line, last_line });
+              end
+
+              vim.keymap.set("v", "gs", function()
+                  visual_stage()
+              end);
+
+              gitsigns.setup();
+            '';
+        }
+      ];
+    };
+  };
+}
--- a/common/home/neovim/langs/bash.nix
+++ b/common/home/neovim/langs/bash.nix
@ -0,0 +1,47 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (config.vars) neovimIde;
+in {
+  programs = {
+    # I love doing typos
+    bash.shellAliases = {
+      nivm = "nvim";
+      nivim = "nvim";
+    };
+
+    neovim = {
+      defaultEditor = true;
+      viAlias = true;
+      vimAlias = true;
+
+      extraPackages = lib.mkIf neovimIde [
+        pkgs.nodePackages.bash-language-server
+        pkgs.shellcheck
+      ];
+
+      extraLuaConfig =
+        lib.mkIf neovimIde
+        # lua
+        ''
+          vim.api.nvim_create_autocmd('FileType', {
+              pattern = 'sh',
+              command = 'setlocal ts=4 sw=4 sts=0 expandtab',
+          });
+
+          require('lspconfig').bashls.setup({
+              capabilities = require('cmp_nvim_lsp').default_capabilities(),
+
+              settings = {
+                  bashIde = {
+                      shellcheckPath = '${lib.getExe pkgs.shellcheck}',
+                  },
+              },
+          });
+        '';
+    };
+  };
+}
--- a/common/home/neovim/langs/clang.nix
+++ b/common/home/neovim/langs/clang.nix
@ -0,0 +1,49 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (config.vars) neovimIde;
+  inherit (pkgs) vimPlugins;
+in
+  lib.mkIf neovimIde {
+    programs = {
+      neovim = {
+        extraPackages = with pkgs; [
+          gcc
+          clang-tools
+          cmake-language-server
+        ];
+
+        extraLuaConfig =
+          # lua
+          ''
+            vim.api.nvim_create_autocmd('FileType', {
+                pattern = { 'cpp' , 'c'},
+                command = 'setlocal ts=4 sw=4 sts=0 expandtab',
+            });
+
+            local lsp = require('lspconfig');
+
+            lsp.cmake.setup({
+                capabilities = require('cmp_nvim_lsp').default_capabilities(),
+            });
+
+            lsp.clangd.setup({
+                capabilities = require('cmp_nvim_lsp').default_capabilities(),
+
+                handlers = require('lsp-status').extensions.clangd.setup(),
+                on_attach = function(_, bufnr)
+                    require("clangd_extensions.inlay_hints").setup_autocmd()
+                    require("clangd_extensions.inlay_hints").set_inlay_hints()
+                end,
+            });
+          '';
+
+        plugins = [
+          vimPlugins.clangd_extensions-nvim
+        ];
+      };
+    };
+  }
--- a/common/home/neovim/langs/default.nix
+++ b/common/home/neovim/langs/default.nix
@ -0,0 +1,103 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (config.vars) neovimIde;
+  inherit (pkgs) vimPlugins;
+  inherit (lib) fileContents;
+in {
+  imports = [
+    ./bash.nix
+    ./clang.nix
+    ./hyprlang.nix
+    ./java.nix
+    ./json.nix
+    ./lua.nix
+    ./markdown.nix
+    ./nix.nix
+    ./python.nix
+    ./rust.nix
+    ./web.nix
+  ];
+
+  programs = lib.mkIf neovimIde {
+    neovim = {
+      extraLuaConfig =
+        lib.mkBefore
+        # lua
+        ''
+          -- Start completion / snippet stuff
+          vim.g.coq_settings = {
+              auto_start = 'shut-up',
+              keymap = {
+                  recommended = false,
+              },
+              -- https://github.com/NixOS/nixpkgs/issues/168928#issuecomment-1109581739
+              xdg = true,
+          };
+
+          -- Add formatting cmd
+          vim.api.nvim_create_user_command(
+              'Format',
+              function()
+                  vim.lsp.buf.format({ async = true });
+              end,
+              {}
+          );
+
+          -- LSP-Status setup
+          local lsp_status = require('lsp-status');
+          lsp_status.register_progress();
+
+          -- Remove LSP highlighting to use Treesitter
+          vim.api.nvim_create_autocmd('LspAttach', {
+              callback = function(args)
+                  local client = vim.lsp.get_client_by_id(args.data.client_id);
+                  client.server_capabilities.semanticTokensProvider = nil;
+                  lsp_status.on_attach(client);
+              end,
+          });
+
+          -- Disable virtual_text since it's redundant due to lsp_lines.
+          vim.diagnostic.config({
+              virtual_text = false,
+          });
+
+          require('lsp_lines').setup();
+        '';
+
+      plugins =
+        (with vimPlugins; [
+          nvim-lspconfig
+          lsp-status-nvim
+          lsp_lines-nvim
+
+          cmp-buffer
+          cmp-nvim-lsp
+          cmp-path
+          cmp-spell
+          cmp-treesitter
+          cmp-vsnip
+          vim-vsnip
+          friendly-snippets
+        ])
+        ++ [
+          {
+            plugin = vimPlugins.nvim-cmp;
+            type = "lua";
+            config = fileContents ../plugins/cmp.lua;
+          }
+
+          {
+            plugin = vimPlugins.nvim-autopairs;
+            type = "lua";
+            config =
+              # lua
+              "require('nvim-autopairs').setup({})";
+          }
+        ];
+    };
+  };
+}
--- a/common/home/neovim/langs/hyprlang.nix
+++ b/common/home/neovim/langs/hyprlang.nix
@ -0,0 +1,25 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (config.vars) neovimIde;
+in
+  lib.mkIf neovimIde {
+    programs = {
+      neovim = {
+        extraLuaConfig =
+          # lua
+          ''
+            vim.filetype.add({
+                pattern = { ['.*/hypr/.*%.conf'] = 'hyprlang' },
+            });
+
+            vim.api.nvim_create_autocmd('FileType', {
+               pattern = 'hyprlang',
+               command = 'setlocal ts=4 sw=4 sts=0 expandtab',
+            });
+          '';
+      };
+    };
+  }
--- a/common/home/neovim/langs/java.nix
+++ b/common/home/neovim/langs/java.nix
@ -0,0 +1,83 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (pkgs) vimPlugins;
+  inherit (config.vars) neovimIde;
+
+  javaSdk = pkgs.temurin-bin-17;
+  javaPkgs = with pkgs; [gradle maven];
+in
+  lib.mkIf neovimIde {
+    home.packages = javaPkgs;
+
+    xdg.dataFile.".gradle/gradle.properties".text = ''
+      org.gradle.java.home = ${javaSdk}
+    '';
+
+    programs = {
+      java = {
+        enable = true;
+        package = javaSdk;
+      };
+
+      neovim = {
+        extraPackages = javaPkgs;
+
+        extraLuaConfig =
+          # lua
+          ''
+            vim.api.nvim_create_autocmd('FileType', {
+               pattern = 'java',
+               command = 'setlocal ts=4 sw=4 sts=0 expandtab',
+            });
+          '';
+
+        plugins = [
+          {
+            # TOOD: setup debugger https://github.com/mfussenegger/nvim-jdtls#debugger-via-nvim-dap
+            plugin = vimPlugins.nvim-jdtls;
+            type = "lua";
+            config =
+              # lua
+              ''
+                --
+                local startJdtls = function()
+                    local config = {
+                        capabilities = require('cmp_nvim_lsp').default_capabilities(),
+
+                        cmd = { '${lib.getExe pkgs.jdt-language-server}' },
+                        root_dir = vim.fs.dirname(vim.fs.find(
+                            { 'gradlew', '.git', 'mvnw', 'pom.xml' },
+                            { upward = true }
+                        )[1]),
+
+                        settings = {
+                            java = {
+                                configuration = {
+                                    runtimes = {
+                                        {
+                                            name = 'JavaSE-17',
+                                            path = '${javaSdk}',
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                    };
+
+                    require('jdtls').start_or_attach(config);
+                end
+
+                vim.api.nvim_create_autocmd('FileType', {
+                    pattern = 'java',
+                    callback = startJdtls,
+                });
+              '';
+          }
+        ];
+      };
+    };
+  }
--- a/common/home/neovim/langs/json.nix
+++ b/common/home/neovim/langs/json.nix
@ -0,0 +1,51 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (config.vars) neovimIde;
+in
+  lib.mkIf neovimIde {
+    programs = {
+      neovim = {
+        extraPackages = [
+          pkgs.vscode-langservers-extracted
+          pkgs.yaml-language-server
+        ];
+
+        extraLuaConfig =
+          # lua
+          ''
+            vim.api.nvim_create_autocmd('FileType', {
+                pattern = 'yaml',
+                command = 'setlocal ts=4 sw=4 sts=0 expandtab',
+            });
+            vim.api.nvim_create_autocmd('FileType', {
+                pattern = 'json',
+                command = 'setlocal ts=4 sw=4 sts=0 expandtab',
+            });
+
+            local lsp = require('lspconfig');
+
+            lsp.jsonls.setup({
+                capabilities = require('cmp_nvim_lsp').default_capabilities(),
+            });
+
+            lsp.yamlls.setup({
+                capabilities = require('cmp_nvim_lsp').default_capabilities(),
+
+                settings = {
+                    yaml = {
+                        schemas = {
+                            [
+                                "https://json.schemastore.org/github-workflow.json"
+                            ] = "/.github/workflows/*",
+                        },
+                    },
+                },
+            });
+          '';
+      };
+    };
+  }
--- a/common/home/neovim/langs/lua.nix
+++ b/common/home/neovim/langs/lua.nix
@ -0,0 +1,49 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (config.vars) neovimIde;
+  inherit (pkgs) vimPlugins;
+
+  flakeEnv = config.programs.bash.sessionVariables.FLAKE;
+in
+  lib.mkIf neovimIde {
+    programs = {
+      neovim = {
+        extraPackages = [
+          pkgs.lua-language-server
+        ];
+
+        plugins = [
+          {
+            plugin = vimPlugins.neodev-nvim;
+            type = "lua";
+            config =
+              # lua
+              ''
+                vim.api.nvim_create_autocmd('FileType', {
+                    pattern = 'lua',
+                    command = 'setlocal ts=4 sw=4 sts=0 expandtab',
+                });
+
+                -- IMPORTANT: make sure to setup neodev BEFORE lspconfig
+                require("neodev").setup({
+                    override = function(root_dir, library)
+                        if root_dir:find('${flakeEnv}', 1, true) == 1 then
+                            library.enabled = true
+                            library.plugins = true
+                        end
+                    end,
+                });
+
+                require('lspconfig').lua_ls.setup({
+                    capabilities = require('cmp_nvim_lsp').default_capabilities(),
+                });
+              '';
+          }
+        ];
+      };
+    };
+  }
--- a/common/home/neovim/langs/markdown.nix
+++ b/common/home/neovim/langs/markdown.nix
@ -0,0 +1,127 @@
+{
+  config,
+  lib,
+  pkgs,
+  self,
+  vimplugin-easytables-src,
+  ...
+}: let
+  inherit (config.vars) neovimIde;
+  inherit (pkgs) vimPlugins;
+
+  inherit (import "${self}/lib.nix" {inherit pkgs;}) buildPlugin;
+in
+  lib.mkIf neovimIde {
+    programs = {
+      neovim = {
+        extraPackages = [
+          pkgs.pandoc
+
+          # LaTeX packages
+          pkgs.texlab
+          pkgs.texliveFull
+          pkgs.rubber
+        ];
+
+        extraLuaConfig =
+          # lua
+          ''
+            local lsp = require('lspconfig');
+
+            lsp.texlab.setup({
+                capabilities = require('cmp_nvim_lsp').default_capabilities(),
+
+                settings = {
+                    texlab = {
+                        formatterLineLength = 100,
+                        latexFormatter = 'latexindent',
+                        latexindent = {
+                            modifyLineBreaks = false,
+                            ["local"] = '.indentconfig.yaml';
+                        },
+                    },
+                },
+            });
+          '';
+
+        plugins = [
+          {
+            plugin = buildPlugin "easytables-nvim" vimplugin-easytables-src;
+            type = "lua";
+            config =
+              # lua
+              ''
+                require('easytables').setup();
+              '';
+          }
+
+          {
+            plugin = vimPlugins.knap;
+            type = "lua";
+            config =
+              # lua
+              ''
+                --
+                vim.api.nvim_create_autocmd('FileType', {
+                    pattern = 'tex',
+                    command = 'setlocal ts=4 sw=4 sts=0 expandtab',
+                });
+
+                vim.g.knap_settings = {
+                    -- HTML
+                    htmloutputext = 'html',
+                    htmltohtml = 'none',
+                    htmltohtmlviewerlaunch = "",
+                    htmltohtmlviewerrefresh = 'none',
+
+                    -- Markdown
+                    mdoutputext = 'html',
+                    markdownoutputext = 'html',
+
+                    -- Markdown to PDF
+                    mdtopdf = 'pandoc %docroot% -o /tmp/%outputfile%',
+                    markdowntopdf = 'pandoc %docroot% -o /tmp/%outputfile%',
+                    mdtopdfviewerlaunch = 'sioyek /tmp/%outputfile%',
+                    markdowntopdfviewerlaunch = 'sioyek /tmp/%outputfile%',
+                    mdtopdfviewerrefresh = 'none',
+                    markdowntopdfviewerrefresh = "none",
+
+                    -- Markdown to HTML
+                    mdtohtml = 'pandoc --standalone %docroot% -o /tmp/%outputfile%',
+                    markdowntohtml = 'pandoc --standalone %docroot% -o /tmp/%outputfile%',
+                    mdtohtmlviewerlaunch = 'firefox -new-window /tmp/%outputfile%',
+                    markdowntohtmlviewerlaunch = 'firefox -new-window /tmp/%outputfile%',
+                    mdtohtmlviewerrefresh = 'none',
+                    markdowntohtmlviewerrefresh = 'none',
+
+                    -- LaTeX
+                    -- TODO: stop from polluting workspace
+                };
+
+                -- F4 processes the document once, and refreshes the view
+                vim.keymap.set({ 'n', 'v', 'i' }, '<F4>', function()
+                    require('knap').process_once();
+                end);
+
+                -- F5 closes the viewer application, and
+                -- allows settings to be reset
+                vim.keymap.set({ 'n', 'v', 'i' }, '<F5>', function()
+                    require('knap').close_viewer();
+                end);
+
+                -- F6 toggles the auto-processing on and off
+                vim.keymap.set({ 'n', 'v', 'i' }, '<F6>', function()
+                    require('knap').toggle_autopreviewing();
+                end);
+
+                -- F7 invokes a SyncTeX forward search, or similar,
+                -- where appropriate
+                vim.keymap.set({ 'n', 'v', 'i' }, '<F7>', function()
+                    require('knap').forward_jump();
+                end);
+              '';
+          }
+        ];
+      };
+    };
+  }
--- a/common/home/neovim/langs/nix.nix
+++ b/common/home/neovim/langs/nix.nix
@ -0,0 +1,75 @@
+{
+  config,
+  pkgs,
+  lib,
+  nixd,
+  self,
+  ...
+}: let
+  inherit (config.vars) hostName mainUser neovimIde;
+  inherit (lib) getExe hasPrefix removePrefix;
+
+  defaultFormatter = self.formatter.${pkgs.system};
+
+  nixdPkg = nixd.packages.${pkgs.system}.default;
+
+  flakeEnv = config.programs.bash.sessionVariables.FLAKE;
+  flakeDir = "${removePrefix "/home/${mainUser}/" flakeEnv}";
+in
+  lib.mkIf neovimIde {
+    assertions = [
+      {
+        assertion =
+          neovimIde
+          && hasPrefix "/home/${mainUser}/" flakeEnv
+          || !neovimIde;
+        message = ''
+          Your $FLAKE environment variable needs to point to a directory in
+          the main users' home to use the neovim module.
+        '';
+      }
+    ];
+
+    home.packages = [
+      defaultFormatter
+      nixdPkg
+    ];
+
+    # nixd by default kinda spams LspLog
+    home.sessionVariables.NIXD_FLAGS = "-log=error";
+
+    xdg.dataFile."${flakeDir}/.nixd.json".text = builtins.toJSON {
+      nixpkgs = {
+        expr = "import (builtins.getFlake \"${flakeDir}\").inputs.nixpkgs {}";
+      };
+      options.nixos = {
+        expr = "(builtins.getFlake \"${flakeDir}\").nixosConfigurations.${hostName}.options";
+      };
+    };
+
+    programs = {
+      neovim = {
+        extraPackages = [
+          nixdPkg
+        ];
+
+        extraLuaConfig =
+          # lua
+          ''
+            require('lspconfig').nixd.setup({
+                capabilities = require('cmp_nvim_lsp').default_capabilities(),
+
+                filetypes = { 'nix', 'in.nix' },
+                settings = {
+                    nixd = {
+                        formatting = {
+                            -- TODO: Try to find <flake>.formatter
+                            command = { '${getExe defaultFormatter}' },
+                        },
+                    },
+                },
+            });
+          '';
+      };
+    };
+  }
--- a/common/home/neovim/langs/python.nix
+++ b/common/home/neovim/langs/python.nix
@ -0,0 +1,27 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (config.vars) neovimIde;
+in
+  lib.mkIf neovimIde {
+    programs = {
+      neovim = {
+        withPython3 = true;
+
+        extraPackages = [
+          pkgs.basedpyright
+        ];
+
+        extraLuaConfig =
+          # lua
+          ''
+            require('lspconfig').basedpyright.setup({
+                capabilities = require('cmp_nvim_lsp').default_capabilities(),
+            });
+          '';
+      };
+    };
+  }
--- a/common/home/neovim/langs/rust.nix
+++ b/common/home/neovim/langs/rust.nix
@ -0,0 +1,33 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (config.vars) neovimIde;
+in
+  lib.mkIf neovimIde {
+    programs = {
+      neovim = {
+        extraPackages = with pkgs; [
+          cargo
+          rustc
+          rust-analyzer
+          rustfmt
+        ];
+
+        extraLuaConfig =
+          # lua
+          ''
+            vim.api.nvim_create_autocmd('FileType', {
+               pattern = { 'rust' },
+               command = 'setlocal ts=4 sw=4 sts=0 expandtab',
+            });
+
+            require('lspconfig').rust_analyzer.setup({
+                capabilities = require('cmp_nvim_lsp').default_capabilities(),
+            });
+          '';
+      };
+    };
+  }
--- a/common/home/neovim/langs/web.nix
+++ b/common/home/neovim/langs/web.nix
@ -0,0 +1,151 @@
+{
+  config,
+  lib,
+  pkgs,
+  self,
+  vimplugin-ts-error-translator-src,
+  ...
+}: let
+  inherit (config.vars) neovimIde;
+  inherit (pkgs) vimPlugins;
+
+  inherit (import "${self}/lib.nix" {inherit pkgs;}) buildPlugin;
+in
+  lib.mkIf neovimIde {
+    programs = {
+      neovim = {
+        withNodeJs = true;
+
+        extraPackages = [
+          pkgs.nodejs_latest
+          pkgs.nodePackages.npm
+          pkgs.nodePackages.neovim
+
+          pkgs.vscode-langservers-extracted
+        ];
+
+        extraLuaConfig =
+          # lua
+          ''
+            vim.api.nvim_create_autocmd('FileType', {
+                pattern = { 'javascript', 'typescript', 'css', 'scss' },
+                command = 'setlocal ts=4 sw=4 sts=0 expandtab',
+            });
+
+            vim.api.nvim_create_autocmd('FileType', {
+                pattern = 'html',
+                command = 'setlocal ts=2 sw=2 expandtab',
+            });
+
+            vim.api.nvim_create_autocmd('FileType', {
+                pattern = 'scss',
+                command = 'setlocal iskeyword+=@-@',
+            });
+
+            local lsp = require('lspconfig');
+            local tsserver = require('typescript-tools');
+
+            tsserver.setup({
+                capabilities = require('cmp_nvim_lsp').default_capabilities(),
+
+                handlers = {
+                    -- format error code with better error message
+                    ['textDocument/publishDiagnostics'] = function(err, result, ctx, config)
+                        require('ts-error-translator').translate_diagnostics(err, result, ctx, config)
+                        vim.lsp.diagnostic.on_publish_diagnostics(err, result, ctx, config)
+                    end,
+                },
+            });
+
+            lsp.eslint.setup({
+                capabilities = require('cmp_nvim_lsp').default_capabilities(),
+
+                -- auto-save
+                on_attach = function(client, bufnr)
+                    vim.api.nvim_create_autocmd('BufWritePre', {
+                        buffer = bufnr,
+                        command = 'EslintFixAll',
+                    });
+                end,
+
+                settings = {
+                    validate = 'on',
+                    packageManager = 'npm',
+                    useESLintClass = true,
+                    useFlatConfig = true,
+                    experimental = {
+                        useFlatConfig = true,
+                    },
+                    codeAction = {
+                        disableRuleComment = {
+                            enable = true,
+                            location = 'separateLine'
+                        },
+                        showDocumentation = {
+                            enable = true,
+                        },
+                    },
+                    codeActionOnSave = {
+                        mode = 'all',
+                        rules = {},
+                    },
+                    format = true,
+                    quiet = false,
+                    onIgnoredFiles = 'off',
+                    rulesCustomizations = {},
+                    run = 'onType',
+                    problems = {
+                        shortenToSingleLine = false,
+                    },
+                    nodePath = "",
+                    workingDirectory = {
+                        mode = 'location',
+                    },
+                },
+            });
+
+            lsp.cssls.setup({
+                capabilities = require('cmp_nvim_lsp').default_capabilities(),
+
+                settings = {
+                    css = {
+                        validate = false,
+                    },
+                    less = {
+                        validate = false,
+                    },
+                    scss = {
+                        validate = false,
+                    },
+                },
+            });
+          '';
+
+        plugins = [
+          vimPlugins.typescript-tools-nvim
+          (buildPlugin "ts-error-translator" vimplugin-ts-error-translator-src)
+
+          {
+            plugin = vimPlugins.package-info-nvim;
+            type = "lua";
+            config =
+              # lua
+              ''
+                local packageInfo = require('package-info');
+                packageInfo.setup({
+                    hide_up_to_date = true,
+                    package_manager = 'npm',
+                });
+
+                vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, {
+                    pattern = { 'package.json' },
+                    callback = function()
+                        packageInfo.show({ force = true });
+                    end,
+                });
+              '';
+          }
+        ];
+      };
+    };
+  }
--- a/common/home/neovim/plugins/autopairs.lua
+++ b/common/home/neovim/plugins/autopairs.lua
@ -1,16 +0,0 @@
-- Auto indent when pressing Enter between brackets
-local remap = vim.api.nvim_set_keymap
-local npairs = require('nvim-autopairs')
-npairs.setup({map_cr=false})
-
-_G.MUtils= {}
-
-MUtils.completion_confirm=function()
-  if vim.fn["coc#pum#visible"]() ~= 0  then
-    return vim.fn["coc#pum#confirm"]()
-  else
-    return npairs.autopairs_cr()
-  end
-end
-
-remap('i' , '<CR>','v:lua.MUtils.completion_confirm()', {expr = true , noremap = true})
--- a/common/home/neovim/plugins/cmp.lua
+++ b/common/home/neovim/plugins/cmp.lua
@ -0,0 +1,60 @@
+local has_words_before = function()
+    local line, col = unpack(vim.api.nvim_win_get_cursor(0));
+    return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match('%s') == nil;
+end;
+
+local cmp = require('cmp');
+
+-- If you want insert `(` after select function or method item
+local cmp_autopairs = require('nvim-autopairs.completion.cmp')
+
+cmp.event:on(
+  'confirm_done',
+  cmp_autopairs.on_confirm_done()
+)
+
+cmp.setup({
+    sources = {
+        { name = 'nvim_lsp' },
+        { name = 'cmp_tabnine' },
+        { name = 'treesitter' },
+        { name = 'buffer' },
+        { name = 'path' },
+        { name = 'vsnip' },
+    },
+
+    snippet = {
+        expand = function(args)
+            vim.fn['vsnip#anonymous'](args.body);
+        end,
+    },
+
+    mapping = {
+        -- Confirm selection
+        ['<CR>'] = cmp.mapping.confirm({ select = true }),
+
+        -- Next selection
+        ['<Down>'] = cmp.mapping(function(fallback)
+            if cmp.visible() then
+                cmp.select_next_item();
+            elseif has_words_before() then
+                cmp.complete();
+            else
+                fallback();
+            end;
+        end, {
+            'i',
+            's',
+        }),
+
+        -- Previous selection
+        ['<Up>'] = cmp.mapping(function()
+            if cmp.visible() then
+                cmp.select_prev_item();
+            end;
+        end, {
+            'i',
+            's',
+        }),
+    },
+});
--- a/common/home/neovim/plugins/dracula.vim
+++ b/common/home/neovim/plugins/dracula.vim
@ -1,10 +0,0 @@
-" set dot icon in place of trailing whitespaces
-set list listchars=tab:\ \ ,nbsp:␣,trail:•,extends:⟩,precedes:⟨
-
-
-lua << EOF
-- Add visual indicator for trailing whitespaces
-vim.opt.fillchars = {eob = " "}
-
-vim.cmd[[colorscheme dracula]]
-EOF
--- a/common/home/neovim/plugins/gitsigns.lua
+++ b/common/home/neovim/plugins/gitsigns.lua
@ -1,13 +0,0 @@
-local gitsigns = require("gitsigns")
-
-local function visual_stage()
-    local first_line = vim.fn.line('v')
-    local last_line = vim.fn.getpos('.')[2]
-    gitsigns.stage_hunk({ first_line, last_line })
-end
-
-vim.keymap.set("v", "gs", function()
-    visual_stage()
-end)
-
-gitsigns.setup();
--- a/common/home/neovim/plugins/heirline.lua
+++ b/common/home/neovim/plugins/heirline.lua
@ -0,0 +1,443 @@
+-- Modified from https://github.com/lauranaujokat/nvim/blob/4102c789d05667f636107e3dae4ac589053ee88d/lua/setups/heirline.lua#L4
+
+local conditions = require('heirline.conditions');
+local utils = require('heirline.utils');
+
+---@class Palette
+---@field [string] any
+local dracula = require('dracula').colors();
+
+local colors = {
+    bright_bg = dracula.selection,
+    dark_bg = dracula.menu,
+    bright_fg = dracula.fg,
+    red = dracula.red,
+    dark_red = utils.get_highlight('DiffDelete').bg,
+    green = dracula.green,
+    blue = dracula.blue,
+    gray = utils.get_highlight('NonText').fg,
+    orange = utils.get_highlight('Constant').fg,
+    purple = utils.get_highlight('Statement').fg,
+    cyan = dracula.cyan,
+    diag_warn = utils.get_highlight('DiagnosticWarn').fg,
+    diag_error = utils.get_highlight('DiagnosticError').fg,
+    diag_hint = utils.get_highlight('DiagnosticHint').fg,
+    diag_info = utils.get_highlight('DiagnosticInfo').fg,
+    git_del = utils.get_highlight('GitSignsDelete').fg,
+    git_add = utils.get_highlight('GitSignsAdd').fg,
+    git_change = utils.get_highlight('GitSignsChange').fg,
+};
+
+require('heirline').load_colors(colors);
+
+local ViMode = {
+    -- get vim current mode, this information will be required by the provider
+    -- and the highlight functions, so we compute it only once per component
+    -- evaluation and store it as a component attribute
+    init = function(self)
+        self.mode = vim.fn.mode(1);
+
+        -- execute this only once, this is required if you want the ViMode
+        -- component to be updated on operator pending mode
+        if not self.once then
+            vim.api.nvim_create_autocmd('ModeChanged', {
+                pattern = '*:*o',
+                command = 'redrawstatus',
+            });
+            self.once = true;
+        end;
+    end,
+
+    static = {
+        mode_names = {
+            n = 'N',
+            no = 'N?',
+            nov = 'N?',
+            noV = 'N?',
+            ['no\22'] = 'N?',
+            niI = 'Ni',
+            niR = 'Nr',
+            niV = 'Nv',
+            nt = 'Nt',
+            v = 'V',
+            vs = 'Vs',
+            V = 'V_',
+            Vs = 'Vs',
+            ['\22'] = '^V',
+            ['\22s'] = '^V',
+            s = 'S',
+            S = 'S_',
+            ['\19'] = '^S',
+            i = 'I',
+            ic = 'Ic',
+            ix = 'Ix',
+            R = 'R',
+            Rc = 'Rc',
+            Rx = 'Rx',
+            Rv = 'Rv',
+            Rvc = 'Rv',
+            Rvx = 'Rv',
+            c = 'C',
+            cv = 'Ex',
+            r = '...',
+            rm = 'M',
+            ['r?'] = '?',
+            ['!'] = '!',
+            t = 'T',
+        },
+
+        mode_colors = {
+            n = 'red',
+            i = 'green',
+            v = 'cyan',
+            V = 'cyan',
+            ['\22'] = 'cyan',
+            c = 'orange',
+            s = 'purple',
+            S = 'purple',
+            ['\19'] = 'purple',
+            R = 'orange',
+            r = 'orange',
+            ['!'] = 'red',
+            t = 'red',
+        },
+    },
+
+    -- To be extra meticulous, we can also add some vim statusline syntax to
+    -- control the padding and make sure our string is always at least 2
+    -- characters long. Plus a nice Icon.
+    provider = function(self)
+        return ' ' .. self.mode_names[self.mode] .. '%)';
+    end,
+
+    -- Same goes for the highlight. Now the foreground will change according to the current mode.
+    hl = function(self)
+        local mode = self.mode:sub(1, 1); -- get only the first mode character
+        return { fg = self.mode_colors[mode], bold = true };
+    end,
+
+    -- Re-evaluate the component only on ModeChanged event
+    update = {
+        'ModeChanged',
+    },
+};
+
+local FileNameBlock = {
+    init = function(self)
+        self.filename = vim.api.nvim_buf_get_name(0);
+    end,
+};
+
+-- FileNameBlock children
+local FileIcon = {
+    init = function(self)
+        local filename = self.filename;
+        local extension = vim.fn.fnamemodify(filename, ':e');
+        self.icon, self.icon_color =
+            require('nvim-web-devicons').get_icon_color(filename, extension, { default = true });
+    end,
+
+    provider = function(self)
+        return self.icon and (self.icon .. ' ');
+    end,
+
+    hl = function(self)
+        return { fg = self.icon_color };
+    end,
+};
+
+local FileName = {
+    provider = function(self)
+        -- first, trim the pattern relative to the current directory. For other
+        -- options, see :h filename-modifers
+        local filename = vim.fn.fnamemodify(self.filename, ':.');
+        if filename == '' then
+            return '[No Name]';
+        end;
+        -- now, if the filename would occupy more than 1/4th of the available
+        -- space, we trim the file path to its initials
+        -- See Flexible Components section below for dynamic truncation
+        if not conditions.width_percent_below(#filename, 0.25) then
+            filename = vim.fn.pathshorten(filename);
+        end;
+        return filename;
+    end,
+
+    hl = { fg = utils.get_highlight('Directory').fg },
+};
+
+local FileFlags = {
+    {
+        condition = function()
+            return vim.bo.modified;
+        end,
+        provider = '[+]',
+        hl = { fg = 'green' },
+    },
+    {
+        condition = function()
+            return not vim.bo.modifiable or vim.bo.readonly;
+        end,
+        provider = '',
+        hl = { fg = 'orange' },
+    },
+};
+
+local FileNameModifer = {
+    hl = function()
+        if vim.bo.modified then
+            -- use `force` because we need to override the child's hl foreground
+            return { fg = 'cyan', bold = true, force = true };
+        end;
+    end,
+};
+
+-- let's add the children to our FileNameBlock component
+FileNameBlock = utils.insert(
+    FileNameBlock,
+    FileIcon,
+    utils.insert(FileNameModifer, FileName), -- a new table where FileName is a child of FileNameModifier
+    unpack(FileFlags),                       -- A small optimisation, since their parent does nothing
+    { provider = '%<' }                      -- this means that the statusline is cut here when there's not enough space
+);
+
+local Ruler = {
+    provider = ' line: %l col: %c',
+    hl = { fg = 'green', bold = false },
+};
+
+local ScrollRuler = {
+    -- %l = current line number
+    -- %L = number of lines in the buffer
+    -- %c = column number
+    -- %P = percentage through file of displayed window
+    provider = '%P',
+};
+
+local ScrollBar = {
+    static = {
+        sbar = { '▁', '▂', '▃', '▄', '▅', '▆', '▇', '█' },
+        -- sbar = { '🭶', '🭷', '🭸', '🭹', '🭺', '🭻' }
+    },
+
+    provider = function(self)
+        local curr_line = vim.api.nvim_win_get_cursor(0)[1];
+        local lines = vim.api.nvim_buf_line_count(0);
+        local i = math.floor((curr_line - 1) / lines * #self.sbar) + 1;
+        return string.rep(self.sbar[i], 2);
+    end,
+
+    hl = { fg = 'cyan', bg = 'bright_bg' },
+};
+
+local LSPActive = {
+    condition = conditions.lsp_attached,
+    update = { 'LspAttach', 'LspDetach' },
+
+    provider = function()
+        local names = {};
+        for _, server in pairs(vim.lsp.get_clients()) do
+            table.insert(names, server.name);
+        end;
+        return ' [' .. table.concat(names, ' ') .. '] ';
+    end,
+
+    hl = { fg = 'green', bold = false },
+};
+
+local spinner_frames = { '⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏' };
+
+-- From https://github.com/mhartington/dotfiles/blob/5961460e3a492f7815259a692fca5ca2a1df924a/config/nvim/lua/mh/statusline/lsp_status.lua#L4
+local function get_lsp_progress()
+    local messages = require('lsp-status/messaging').messages;
+    local buf_messages = messages();
+    local msgs = {};
+
+    for _, msg in ipairs(buf_messages) do
+        local contents;
+
+        if msg.progress then
+            contents = msg.title;
+
+            if msg.spinner then
+                contents = spinner_frames[(msg.spinner % #spinner_frames) + 1] .. ' ' .. contents;
+            end;
+        elseif msg.status then
+            contents = msg.content;
+
+            if msg.uri then
+                local space = math.min(60, math.floor(0.6 * vim.fn.winwidth(0)));
+                local filename = vim.uri_to_fname(msg.uri);
+
+                filename = vim.fn.fnamemodify(filename, ':~:.');
+
+                if #filename > space then
+                    filename = vim.fn.pathshorten(filename);
+                end;
+
+                contents = '(' .. filename .. ') ' .. contents;
+            end;
+        else
+            contents = msg.content;
+        end;
+
+        table.insert(msgs, contents);
+    end;
+
+    return table.concat(msgs, ' ');
+end;
+
+local LSPMessages = {
+    provider = function()
+        local progress = get_lsp_progress();
+
+        if progress == '' then
+            return '';
+        else
+            return '  ' .. progress;
+        end;
+    end,
+    hl = { fg = 'purple' },
+};
+
+local Diagnostics = {
+    condition = conditions.has_diagnostics,
+
+    static = {
+        error_icon = '  ',
+        warn_icon = '  ',
+        info_icon = '  ',
+        hint_icon = '  ',
+    },
+
+    init = function(self)
+        self.errors = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.ERROR });
+        self.warnings = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.WARN });
+        self.hints = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.HINT });
+        self.info = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.INFO });
+    end,
+
+    update = { 'DiagnosticChanged', 'BufEnter' },
+
+    {
+        provider = function(self)
+            -- 0 is just another output, we can decide to print it or not!
+            return self.errors > 0 and (self.error_icon .. self.errors);
+        end,
+        hl = { fg = 'diag_error' },
+    },
+    {
+        provider = function(self)
+            return self.warnings > 0 and (self.warn_icon .. self.warnings);
+        end,
+        hl = { fg = 'diag_warn' },
+    },
+    {
+        provider = function(self)
+            return self.info > 0 and (self.info_icon .. self.info);
+        end,
+        hl = { fg = 'diag_info' },
+    },
+    {
+        provider = function(self)
+            return self.hints > 0 and (self.hint_icon .. self.hints);
+        end,
+        hl = { fg = 'diag_hint' },
+    },
+};
+
+local Git = {
+    condition = conditions.is_git_repo,
+
+    init = function(self)
+        self.status_dict = vim.b.gitsigns_status_dict;
+        self.has_changes = self.status_dict.added ~= 0 or
+            self.status_dict.removed ~= 0 or
+            self.status_dict.changed ~= 0;
+    end,
+
+    hl = { fg = 'orange' },
+
+    { -- git branch name
+        provider = function(self)
+            return ' ' .. self.status_dict.head;
+        end,
+        hl = { bold = true },
+    },
+    -- You could handle delimiters, icons and counts similar to Diagnostics
+    {
+        condition = function(self)
+            return self.has_changes;
+        end,
+        provider = '(',
+    },
+    {
+        provider = function(self)
+            local count = self.status_dict.added or 0;
+            return count > 0 and ('+' .. count);
+        end,
+        hl = { fg = 'git_add' },
+    },
+    {
+        provider = function(self)
+            local count = self.status_dict.removed or 0;
+            return count > 0 and ('-' .. count);
+        end,
+        hl = { fg = 'git_del' },
+    },
+    {
+        provider = function(self)
+            local count = self.status_dict.changed or 0;
+            return count > 0 and ('~' .. count);
+        end,
+        hl = { fg = 'git_change' },
+    },
+    {
+        condition = function(self)
+            return self.has_changes;
+        end,
+        provider = ')',
+    },
+};
+
+local Align = { provider = '%=' };
+local Space = { provider = ' ' };
+
+Left = utils.surround({ '', '' }, 'bright_bg', { ViMode, Diagnostics, LSPMessages });
+Middle = utils.surround({ '', '' }, 'bright_bg', { LSPActive, FileNameBlock, Ruler });
+Right = utils.surround({ '', '' }, 'bright_bg', { Git, Space, ScrollRuler, Space, ScrollBar });
+
+local DefaultStatusline = {
+    hl = { bg = 'dark_bg' },
+    condition = function()
+        return true;
+    end,
+    Left,
+    Align,
+    Middle,
+    Align,
+    Right,
+};
+
+local StatusLines = {
+    hl = function()
+        if conditions.is_active() then
+            return 'StatusLine';
+        else
+            return 'StatusLineNC';
+        end;
+    end,
+
+    -- the first statusline with no condition, or which condition returns true is used.
+    -- think of it as a switch case with breaks to stop fallthrough.
+    fallthrough = false,
+
+    DefaultStatusline,
+};
+
+-- Make it global
+vim.opt.laststatus = 3;
+
+require('heirline').setup({
+    statusline = StatusLines,
+});
--- a/common/home/neovim/plugins/indent.lua
+++ b/common/home/neovim/plugins/indent.lua
@ -1,26 +0,0 @@
-local highlight = {
-  "RainbowRed",
-  "RainbowYellow",
-  "RainbowBlue",
-  "RainbowOrange",
-  "RainbowGreen",
-  "RainbowViolet",
-  "RainbowCyan",
-}
-local hooks = require('ibl.hooks')
-hooks.register(hooks.type.HIGHLIGHT_SETUP, function()
-  vim.api.nvim_set_hl(0, "RainbowRed",    { fg = "#E06C75" })
-  vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#E5C07B" })
-  vim.api.nvim_set_hl(0, "RainbowBlue",   { fg = "#61AFEF" })
-  vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#D19A66" })
-  vim.api.nvim_set_hl(0, "RainbowGreen",  { fg = "#98C379" })
-  vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C678DD" })
-  vim.api.nvim_set_hl(0, "RainbowCyan",   { fg = "#56B6C2" })
-end)
-
-require('ibl').setup({
-  indent = {
-    highlight = highlight,
-    char = "▏",
-  },
-})
--- a/common/home/neovim/plugins/lualine.lua
+++ b/common/home/neovim/plugins/lualine.lua
@ -1,9 +0,0 @@
-require('lualine').setup({
-  options = {
-    theme = 'dracula',
-    globalstatus = true,
-  },
-  sections = {
-    lualine_x = {'g:coc_status', 'bo:filetype'},
-  }
-})
--- a/common/home/neovim/plugins/mini.lua
+++ b/common/home/neovim/plugins/mini.lua
@ -1,23 +0,0 @@
-local map = require('mini.map')
-map.setup({
-  integrations = {
-    map.gen_integration.builtin_search(),
-    map.gen_integration.gitsigns(),
-    map.gen_integration.diagnostic(),
-  },
-  window = {
-    focusable = false,
-    width = 7,
-    winblend = 75,
-  },
-})
-
-local ts_input = require('mini.surround').gen_spec.input.treesitter
-require('mini.surround').setup({
-  custom_surroundings = {
-    -- Use tree-sitter to search for function call
-    f = {
-      input = ts_input({ outer = '@call.outer', inner = '@call.inner' })
-    },
-  }
-})
--- a/common/home/neovim/plugins/neotree.lua
+++ b/common/home/neovim/plugins/neotree.lua
@ -1,38 +1,63 @@
 -- Override netrw
-vim.g.loaded_netrw = 0
-vim.g.loaded_netrwPlugin = 0
+vim.g.loaded_netrw = 0;
+vim.g.loaded_netrwPlugin = 0;

 require('neo-tree').setup({
-  close_if_last_window = true,
-  enable_refresh_on_write = true,
+    close_if_last_window = true,
+    enable_refresh_on_write = true,

-  window = {
-    width = 22,
-  },
-
-  filesystem = {
-    use_libuv_file_watcher = true,
-    group_empty_dirs = true,
-
-    filtered_items = {
-      visible = false,
-      hide_dotfiles = false,
-      hide_gitignored = true,
-      hide_by_name = {},
-      hide_by_pattern = {},
-      always_show = {},
-      never_show = {},
-      never_show_by_pattern = {},
+    window = {
+        width = 22,
    },
-  },

-  source_selector = {
-    winbar = true,
-    statusline = false
-  },
+    filesystem = {
+        use_libuv_file_watcher = true,
+        group_empty_dirs = true,

-  follow_current_file = {
-    enabled = true,
-    leave_dirs_open = true,
-  }
-})
+        filtered_items = {
+            visible = false,
+            hide_dotfiles = false,
+            hide_gitignored = false,
+            hide_by_name = {},
+            hide_by_pattern = {},
+            always_show = {},
+            never_show = {},
+            never_show_by_pattern = {},
+        },
+    },
+
+    source_selector = {
+        winbar = true,
+        statusline = false,
+    },
+
+    follow_current_file = {
+        enabled = true,
+        leave_dirs_open = true,
+    },
+});
+
+local function is_neotree_open()
+    local manager = require('neo-tree.sources.manager');
+    local renderer = require('neo-tree.ui.renderer');
+    local state = manager.get_state('filesystem');
+    return renderer.window_exists(state);
+end;
+
+-- Auto open Neo-Tree on big enough window
+vim.api.nvim_create_autocmd({ 'VimEnter', 'VimResized' }, {
+    pattern = '*',
+    callback = function()
+        if vim.api.nvim_eval([[&columns]]) > 100 then
+            if is_neotree_open() == false then
+                vim.cmd[[Neotree show]];
+                vim.cmd[[Neotree close]];
+                vim.cmd[[Neotree show]];
+            end;
+        else
+            if is_neotree_open() then
+                vim.cmd[[Neotree close]];
+            end;
+        end;
+    end,
+});
--- a/common/home/neovim/plugins/neotree.vim
+++ b/common/home/neovim/plugins/neotree.vim
@ -1,11 +0,0 @@
-" Auto open Neo-Tree on big enough window
-function! OpenTree() abort
-  if &columns > 100
-    Neotree show
-    Neotree close
-    Neotree show
-  endif
-  lua MiniMap.open()
-endfunction
-
-autocmd VimEnter * call OpenTree()
--- a/common/home/neovim/plugins/snippets.vim
+++ b/common/home/neovim/plugins/snippets.vim
@ -1,13 +0,0 @@
-" use vscode keybinds for snippets completion
-inoremap <silent><expr> <TAB>
-      \ coc#pum#visible() ? coc#_select_confirm() :
-      \ coc#expandableOrJumpable() ? "\<C-r>=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\<CR>" :
-      \ CheckBackspace() ? "\<TAB>" :
-      \ coc#refresh()
-
-function! CheckBackspace() abort
-  let col = col('.') - 1
-  return !col || getline('.')[col - 1]  =~# '\s'
-endfunction
-
-let g:coc_snippet_next = '<tab>'
--- a/common/home/neovim/plugins/treesitter.vim
+++ b/common/home/neovim/plugins/treesitter.vim
@ -1,21 +0,0 @@
-lua << EOF
-
-require('nvim-treesitter.configs').setup({
-  highlight = { enable = true },
-  indent = { enable = true },
-})
-
-require('treesitter-context').setup({
-  enable = true,
-  max_lines = 3,
-  min_window_height = 20,
-})
-
-vim.filetype.add({
-  pattern = { [".*/hypr/.*%.conf"] = "hyprlang" },
-})
-
-EOF
-
-" Add line under context
-hi TreesitterContextBottom gui=underline guisp=Grey
--- a/common/home/neovim/theme.nix
+++ b/common/home/neovim/theme.nix
@ -0,0 +1,167 @@
+{
+  config,
+  pkgs,
+  lib,
+  nvim-theme-src,
+  ...
+}: let
+  inherit (config.vars) neovimIde;
+  inherit (lib) fileContents optionals;
+  inherit (pkgs) vimPlugins;
+in {
+  programs = {
+    neovim = {
+      extraPackages = with pkgs; [
+        bat
+      ];
+
+      plugins =
+        [
+          {
+            plugin = vimPlugins.dracula-nvim.overrideAttrs {
+              src = nvim-theme-src;
+            };
+            type = "lua";
+            config =
+              # lua
+              ''
+                -- set dot icon in place of trailing whitespaces
+                vim.opt.listchars = {
+                    tab = '→ ',
+                    trail = '•',
+                    extends = '⟩',
+                    precedes = '⟨',
+                    nbsp = '␣',
+                };
+                vim.opt.list = true;
+
+                -- Add visual indicator for trailing whitespaces
+                vim.opt.fillchars = { eob = " " };
+                vim.fn.matchadd('errorMsg', [[\s\+$]]);
+
+                vim.cmd.colorscheme('dracula');
+              '';
+          }
+          {
+            plugin = vimPlugins.indent-blankline-nvim;
+            type = "lua";
+            config =
+              # lua
+              ''
+                --
+                local highlight = {
+                    "RainbowRed",
+                    "RainbowYellow",
+                    "RainbowBlue",
+                    "RainbowOrange",
+                    "RainbowGreen",
+                    "RainbowViolet",
+                    "RainbowCyan",
+                };
+
+                local hooks = require('ibl.hooks');
+                hooks.register(hooks.type.HIGHLIGHT_SETUP, function()
+                    vim.api.nvim_set_hl(0, "RainbowRed",    { fg = "#E06C75" });
+                    vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#E5C07B" });
+                    vim.api.nvim_set_hl(0, "RainbowBlue",   { fg = "#61AFEF" });
+                    vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#D19A66" });
+                    vim.api.nvim_set_hl(0, "RainbowGreen",  { fg = "#98C379" });
+                    vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C678DD" });
+                    vim.api.nvim_set_hl(0, "RainbowCyan",   { fg = "#56B6C2" });
+                end);
+
+                require('ibl').setup({
+                    indent = {
+                        highlight = highlight,
+                        char = "▏",
+                    },
+                });
+              '';
+          }
+
+          # Deps of heirline config
+          vimPlugins.nvim-web-devicons
+          {
+            plugin = vimPlugins.heirline-nvim;
+            type = "lua";
+            config = fileContents ./plugins/heirline.lua;
+          }
+        ]
+        ++ optionals neovimIde [
+          {
+            plugin = vimPlugins.neo-tree-nvim;
+            type = "lua";
+            config = fileContents ./plugins/neotree.lua;
+          }
+          {
+            plugin = vimPlugins.codewindow-nvim;
+            type = "lua";
+            config =
+              # lua
+              ''
+                --
+                local codewindow = require('codewindow');
+
+                codewindow.setup({
+                    auto_enable = false,
+                    minimap_width = 8,
+                    relative = 'editor',
+                    window_border = 'none',
+                    exclude_filetypes = { 'help' },
+                });
+
+                vim.api.nvim_create_autocmd({ 'VimEnter', 'VimResized' }, {
+                    pattern = '*',
+                    callback = function()
+                        if vim.api.nvim_win_get_width(0) < 88 then
+                            codewindow.close_minimap();
+                        else
+                            codewindow.open_minimap();
+                        end
+                    end,
+                });
+              '';
+          }
+          {
+            plugin = vimPlugins.transparent-nvim;
+            type = "lua";
+            config =
+              # lua
+              ''
+                require('transparent').setup({
+                    groups = {
+                        'Normal',
+                        'NormalNC',
+                        'Comment',
+                        'Constant',
+                        'Special',
+                        'Identifier',
+                        'Statement',
+                        'PreProc',
+                        'Type',
+                        'Underlined',
+                        'Todo',
+                        'String',
+                        'Function',
+                        'Conditional',
+                        'Repeat',
+                        'Operator',
+                        'Structure',
+                        'LineNr',
+                        'NonText',
+                        'SignColumn',
+                        'CursorLine',
+                        'CursorLineNr',
+                        'StatusLine',
+                        'StatusLineNC',
+                        'EndOfBuffer',
+                    },
+                    extra_groups = {},
+                    exclude_groups = {},
+                });
+              '';
+          }
+        ];
+    };
+  };
+}
--- a/common/home/neovim/treesitter.nix
+++ b/common/home/neovim/treesitter.nix
@ -0,0 +1,40 @@
+{pkgs, ...}: let
+  inherit (pkgs) vimPlugins;
+in {
+  programs = {
+    neovim = {
+      plugins = [
+        {
+          plugin = vimPlugins.nvim-treesitter-context;
+          type = "lua";
+          config =
+            # lua
+            ''
+              require('treesitter-context').setup({
+                  enable = true,
+                  max_lines = 3,
+                  min_window_height = 20,
+              });
+
+              vim.cmd.hi('TreesitterContextBottom', 'gui=underline guisp=Grey');
+            '';
+        }
+
+        vimPlugins.nvim-treesitter-textobjects
+
+        {
+          plugin = vimPlugins.nvim-treesitter.withAllGrammars;
+          type = "lua";
+          config =
+            # lua
+            ''
+              require('nvim-treesitter.configs').setup({
+                  highlight = { enable = true },
+                  indent = { enable = true },
+              });
+            '';
+        }
+      ];
+    };
+  };
+}
--- a/common/home/packages.nix
+++ b/common/home/packages.nix
@ -1,30 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  home.packages =
-    (with config.customPkgs; [
-      pokemon-colorscripts
-      repl
-    ])
-    ++ (with pkgs.nodePackages; [
-      undollar
-    ])
-    ++ (with pkgs; [
-      dracula-theme
-      neofetch
-      progress
-      wget
-      tree
-      openssh
-      mosh
-      rsync
-      killall
-      imagemagick
-      usbutils
-      zip
-      unzip
-      dig.dnsutils
-    ]);
-}
--- a/common/home/tmux/default.nix
+++ b/common/home/tmux/default.nix
@ -14,9 +14,7 @@
      plugins = with pkgs.tmuxPlugins; [dracula];

      extraConfig =
-        /*
-        bash
-        */
+        # bash
        ''
          bind-key -n Home send Escape "OH"
          bind-key -n End send Escape "OF"
--- a/common/home/trash-d/default.nix
+++ b/common/home/trash-d/default.nix
@ -1,7 +1,9 @@
-{pkgs, ...} @ inputs: let
-  trash = pkgs.callPackage ./trash-d.nix inputs;
-in {
-  home.packages = [trash];
+{
+  pkgs,
+  self,
+  ...
+}: {
+  home.packages = [self.packages.${pkgs.system}.trash-d];

  programs.bash.shellAliases.rm = "trash";
 }
--- a/common/home/trash-d/trash-d.nix
+++ b/common/home/trash-d/trash-d.nix
@ -1,31 +0,0 @@
-{
-  trash-d-src,
-  stdenv,
-  dmd,
-  dub,
-  ronn,
-  ...
-}:
-stdenv.mkDerivation {
-  name = "trash";
-  version = trash-d-src.shortRev;
-
-  src = trash-d-src;
-
-  buildInputs = [dub dmd ronn];
-
-  buildPhase = ''
-    # https://github.com/svanderburg/node2nix/issues/217#issuecomment-751311272
-    export HOME=$(mktemp -d)
-
-    dub build
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin $out/man/man1
-
-    cp -a ./build/trash $out/bin/
-
-    ronn --roff --pipe MANUAL.md > $out/man/man1/trash.1
-  '';
-}
--- a/common/modules/cachix.nix
+++ b/common/modules/cachix.nix
@ -1,12 +1,15 @@
 {
  config,
+  lib,
  pkgs,
  ...
-}: {
-  environment.systemPackages = with pkgs; [
-    (writeShellApplication {
+}: let
+  inherit (lib) optionals;
+in {
+  environment.systemPackages = [
+    (pkgs.writeShellApplication {
      name = "rebuild-no-cache";
-      runtimeInputs = [config.nh.package];
+      runtimeInputs = [config.programs.nh.package];
      text = ''
        nh os switch -- --option binary-caches "https://cache.nixos.org" "$@"
      '';
@ -15,22 +18,29 @@

  nix = {
    settings = {
-      substituters = [
-        "https://hyprland.cachix.org"
-        "https://nix-gaming.cachix.org"
-        # Nixpkgs-Wayland
-        "https://cache.nixos.org"
-        "https://nixpkgs-wayland.cachix.org"
-        "https://nix-community.cachix.org"
-        # Nix-community
-        "https://nix-community.cachix.org"
-        # Nh
-        "https://viperml.cachix.org"
-        # Caddy
-        "https://caddycf.cachix.org"
-        # Personal config cache
-        "https://cache.nelim.org"
-      ];
+      substituters =
+        [
+          "https://hyprland.cachix.org"
+          "https://nix-gaming.cachix.org"
+          # Nixpkgs-Wayland
+          "https://cache.nixos.org"
+          "https://nixpkgs-wayland.cachix.org"
+          "https://nix-community.cachix.org"
+          # Nix-community
+          "https://nix-community.cachix.org"
+          # Nh
+          "https://viperml.cachix.org"
+          # Caddy
+          "https://caddycf.cachix.org"
+        ]
+        ++ optionals (!config.services.nix-serve.enable && config.services.tailscale.enable) [
+          # Personal config cache
+          "https://cache.nelim.org"
+        ]
+        ++ optionals (!config.services.nix-serve.enable && !config.services.tailscale.enable) [
+          "http://10.0.0.249:5000"
+        ];
+
      trusted-public-keys = [
        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
        "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
--- a/common/modules/locale.nix
+++ b/common/modules/locale.nix
@ -4,7 +4,7 @@
      enable = true;
      defaultFonts = {
        emoji = ["Noto Color Emoji"];
-        monospace = ["Noto Nerd Font"];
+        monospace = ["JetBrainsMono Nerd Font"];
        sansSerif = ["Noto Nerd Font"];
        serif = ["Noto Nerd Font"];
      };
--- a/common/nix-on-droid.nix
+++ b/common/nix-on-droid.nix
@ -1,14 +1,12 @@
 {
  config,
  lib,
-  nur,
  ...
 }: {
  imports = [
    ./vars
-    ./pkgs
    ./modules/global.nix
-    nur.nixosModules.nur
+    ./packages.nix
  ];

  nix = {
@ -23,16 +21,10 @@
    substituters = [
      # Nix-community
      "https://nix-community.cachix.org"
-
-      # FIXME: cache doesn't work
-      # Personal config cache
-      # "https://cache.nelim.org"
    ];
    trustedPublicKeys = [
      # Nix-community
      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      # Personal config cache
-      # "cache.nelim.org:JmFqkUdH11EA9EZOFAGVHuRYp7EbsdJDHvTQzG2pPyY="
    ];
  };

@ -48,10 +40,7 @@
        };
      }

-      nur.hmModules.nur
-
      ./home
-      ./pkgs

      {
        programs.bash.sessionVariables = {
--- a/common/overlays/default.nix
+++ b/common/overlays/default.nix
@ -1,5 +0,0 @@
-{nixpkgs-wayland, ...} @ inputs: [
-  (import ./dracula-theme inputs)
-
-  nixpkgs-wayland.overlay
-]
--- a/common/overlays/dracula-theme/default.nix
+++ b/common/overlays/dracula-theme/default.nix
@ -1,46 +0,0 @@
-{
-  bat-theme-src,
-  gtk-theme-src,
-  xresources-theme-src,
-  ...
-} @ inputs: (final: prev: {
-  dracula-theme = prev.dracula-theme.overrideAttrs (oldAttrs: let
-    git-colors = prev.callPackage ./git.nix inputs;
-    plymouth = prev.callPackage ./plymouth.nix inputs;
-    wallpaper = prev.fetchurl (import ./wallpaper.nix);
-  in {
-    version = gtk-theme-src.shortRev;
-    src = gtk-theme-src;
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $out/share/plymouth/themes $out/wallpapers
-      cp -a ${wallpaper} $out/wallpapers/waves.png
-
-      cp -a ${bat-theme-src}/Dracula.tmTheme $out/bat
-      cp -a ${git-colors}/git-colors $out/git-colors
-      cp -a ${plymouth}/share/plymouth/themes/dracula $out/share/plymouth/themes/
-      cp -a ${xresources-theme-src}/Xresources $out/xres
-
-      # -------------------------------------------
-      mkdir -p $out/share/themes/Dracula
-      cp -a {assets,cinnamon,gnome-shell,gtk-2.0,gtk-3.0,gtk-3.20,gtk-4.0,index.theme,metacity-1,unity,xfwm4} $out/share/themes/Dracula
-
-      cp -a kde/{color-schemes,plasma} $out/share/
-      cp -a kde/kvantum $out/share/Kvantum
-
-      mkdir -p $out/share/aurorae/themes
-      cp -a kde/aurorae/* $out/share/aurorae/themes/
-
-      mkdir -p $out/share/sddm/themes
-      cp -a kde/sddm/* $out/share/sddm/themes/
-
-      mkdir -p $out/share/icons/Dracula-cursors
-      mv kde/cursors/Dracula-cursors/index.theme $out/share/icons/Dracula-cursors/cursor.theme
-      mv kde/cursors/Dracula-cursors/cursors $out/share/icons/Dracula-cursors/cursors
-
-      runHook postInstall
-    '';
-  });
-})
--- a/common/overlays/dracula-theme/git.nix
+++ b/common/overlays/dracula-theme/git.nix
@ -1,23 +0,0 @@
-{
-  stdenv,
-  git-theme-src,
-  ...
-}:
-stdenv.mkDerivation {
-  name = "dracula-git";
-  version = git-theme-src.shortRev;
-
-  src = git-theme-src;
-
-  installPhase = ''
-    # Git colors
-    cp -a ./config/gitconfig ./git-colors
-    chmod 777 ./git-colors
-
-    line=$(grep -n 'Dracula Dark Theme' ./git-colors | cut -d: -f1)
-    sed -i "1,$((line-1))d" ./git-colors
-
-    mkdir $out
-    cp -a ./git-colors $out
-  '';
-}
--- a/common/overlays/dracula-theme/wallpaper.nix
+++ b/common/overlays/dracula-theme/wallpaper.nix
@ -1,4 +0,0 @@
-{
-  url = "https://raw.githubusercontent.com/aynp/dracula-wallpapers/main/Art/4k/Waves%201.png";
-  hash = "sha256-f9FwSOSvqTeDj4bOjYUQ6TM+/carCD9o5dhg/MnP/lk=";
-}
--- a/common/overlays/nix/patch
+++ b/common/overlays/nix/patch
@ -1,12 +0,0 @@
-diff --git a/src/libstore/path.cc b/src/libstore/path.cc
-index e642abcd5..0e584ef33 100644
--- a/src/libstore/path.cc
-+++ b/src/libstore/path.cc
-@@ -12,7 +12,7 @@ static void checkName(std::string_view path, std::string_view name)
-         if (!((c >= '0' && c <= '9')
-                 || (c >= 'a' && c <= 'z')
-                 || (c >= 'A' && c <= 'Z')
-                || c == '+' || c == '-' || c == '.' || c == '_' || c == '?' || c == '='))
-+                || c == '+' || c == '-' || c == '.' || c == '_' || c == '?' || c == '=' || c == '!'))
-             throw BadStorePath("store path '%s' contains illegal character '%s'", path, c);
- }
--- a/common/packages.nix
+++ b/common/packages.nix
@ -0,0 +1,79 @@
+{
+  pkgs,
+  self,
+  ...
+}: {
+  environment.systemPackages =
+    (with self.packages.${pkgs.system}; [
+      pokemon-colorscripts
+      repl
+    ])
+    ++ (with pkgs.nodePackages; [
+      undollar
+    ])
+    ++ (with pkgs; [
+      alejandra
+
+      # Archiving
+      zip
+      unzip
+      p7zip
+      rar
+      bzip2
+      gzip
+      gnutar
+      xz
+
+      # File management
+      findutils
+      diffutils
+      utillinux
+      which
+      imagemagick
+
+      # Networking
+      dig.dnsutils
+      openssh
+      rsync
+      wget
+      gnupg
+
+      # Misc CLI stuff
+      killall
+      nix-output-monitor
+      progress
+      tree
+      gnugrep
+      gnused
+
+      # Expected Stuff
+      hostname
+      man
+      perl
+      tzdata
+    ])
+    ++ [
+      # This could help as well: nix derivation show -r /run/current-system
+      (pkgs.writeShellApplication {
+        name = "listDerivs";
+        text = ''
+          nix-store --query --requisites /run/current-system | cut -d- -f2- | sort -u
+        '';
+      })
+
+      (pkgs.writeShellApplication {
+        name = "from";
+
+        runtimeInputs = with pkgs; [
+          coreutils
+          which
+        ];
+
+        text = ''
+          for var do
+              realpath "$(which "$var")"
+          done
+        '';
+      })
+    ];
+}
--- a/common/pkgs/curseforge-server-downloader/default.nix
+++ b/common/pkgs/curseforge-server-downloader/default.nix
@ -1,13 +0,0 @@
-{
-  buildGoModule,
-  curseforge-server-downloader-src,
-  ...
-}:
-buildGoModule {
-  pname = "curseforge-server-downloader";
-  version = "unstable";
-
-  src = curseforge-server-downloader-src;
-  doCheck = false;
-  vendorHash = null;
-}
--- a/common/pkgs/default.nix
+++ b/common/pkgs/default.nix
@ -1,26 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-} @ inputs: let
-  inherit (lib) concatMapAttrs filterAttrs mkOption pathExists types;
-
-  mkPackage = name: v: {
-    ${name} = pkgs.callPackage ./${name} inputs;
-  };
-
-  rmNotPackage = name: value:
-    value
-    == "directory"
-    && pathExists ./${name}/default.nix;
-
-  packages = filterAttrs rmNotPackage (builtins.readDir ./.);
-
-  pkgSet = concatMapAttrs mkPackage packages;
-in {
-  options.customPkgs = mkOption {
-    type = types.attrs;
-  };
-
-  config.customPkgs = pkgSet;
-}
--- a/common/pkgs/pam-fprint-grosshack/default.nix
+++ b/common/pkgs/pam-fprint-grosshack/default.nix
@ -1,41 +0,0 @@
-{
-  stdenv,
-  meson,
-  ninja,
-  pkg-config,
-  glib,
-  libfprint,
-  polkit,
-  dbus,
-  systemd,
-  pam,
-  libpam-wrapper,
-  pam-fprint-grosshack-src,
-  ...
-}:
-stdenv.mkDerivation {
-  name = "pam-fprint-grosshack";
-  version = pam-fprint-grosshack-src.shortRev;
-
-  src = pam-fprint-grosshack-src;
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    glib
-    libfprint
-    polkit
-    dbus
-    systemd
-    pam
-    libpam-wrapper
-  ];
-
-  mesonFlags = [
-    "-Dpam_modules_dir=${placeholder "out"}/lib/security"
-    "-Dsysconfdir=${placeholder "out"}/etc"
-    "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/system-services"
-    "-Dsystemd_system_unit_dir=${placeholder "out"}/lib/systemd/system"
-  ];
-}
--- a/common/pkgs/rars-flatlaf/default.nix
+++ b/common/pkgs/rars-flatlaf/default.nix
@ -1,110 +0,0 @@
-{
-  config,
-  writeShellApplication,
-  stdenvNoCC,
-  jre,
-  fetchFromGitHub,
-  fetchurl,
-  makeWrapper,
-  makeDesktopItem,
-  rsync,
-  ...
-}:
-stdenvNoCC.mkDerivation rec {
-  name = "rars-flatlaf";
-
-  src = fetchFromGitHub {
-    owner = "privat";
-    repo = "rars";
-    rev = "fd34014efd65b3cb5a52f1729c3b8240cae0c332";
-    hash = "sha256-D8X/cr+fnq/OOFYfMG9aPss95J8Z2yiROuF9kmHkK40=";
-    fetchSubmodules = true;
-  };
-
-  desktopItem = let
-    hyprland = config.home-manager.users.${config.vars.mainUser}.wayland.windowManager.hyprland.finalPackage;
-    execScript = writeShellApplication {
-      name = "execScript";
-      runtimeInputs = [hyprland];
-      text = "(sleep 1; hyprctl dispatch togglefloating) & ${name}";
-    };
-  in
-    makeDesktopItem {
-      name = "RARS";
-      desktopName = "RARS";
-      exec = "${execScript}/bin/execScript";
-      icon = name;
-    };
-
-  nativeBuildInputs = [makeWrapper rsync jre];
-
-  installPhase = let
-    flatlaf = fetchurl {
-      url = "https://repo1.maven.org/maven2/com/formdev/flatlaf/3.2/flatlaf-3.2.jar";
-      hash = "sha256-HAG+G9undDXWtySokKl7lkIUCFI7lEBduu+UgSVaxAA=";
-    };
-    icon = fetchurl {
-      url = "https://riscv.or.jp/wp-content/uploads/2019/06/cropped-RISC-V-logo-figonly-mod-2.png";
-      hash = "sha256-e1/iVmadVzyO77ikBr1cdXsJdDj8TiXh3Oyjek9GwqM=";
-    };
-  in
-    /*
-    bash
-    */
-    ''
-      # ./build-jar.sh
-      mkdir -p build
-      find src -name "*.java" | xargs javac --release 8 -d build
-      if [[ "$OSTYPE" == "darwin"* ]]; then
-          find src -type f -not -name "*.java" -exec rsync -R {} build \;
-      else
-          find src -type f -not -name "*.java" -exec cp --parents {} build \;
-      fi
-      cp -rf build/src/* build
-      rm -r build/src
-      cp README.md License.txt build
-      cd build
-      jar cfm ../rars.jar ./META-INF/MANIFEST.MF *
-      chmod +x ../rars.jar
-
-      cd ..
-
-      # ./build-jar-flatlaf.sh
-      mkdir -p build-flatlaf/
-      cd build-flatlaf/
-
-      cp ${flatlaf} ../flatlaf.jar
-
-      jar x < ../rars.jar
-      jar x < "../flatlaf.jar"
-
-      cat > META-INF/MANIFEST.MF <<EOF
-      Manifest-Version: 1.0
-      Implementation-Version: 3.1.1
-      Multi-Release: true
-      Main-Class: rars.Launch
-      EOF
-
-      jar cfm ../rars-flatlaf.jar META-INF/MANIFEST.MF *
-      chmod +x ../rars-flatlaf.jar
-
-      cd ..
-
-      # InstallPhase
-      runHook preInstall
-
-      cat > ./rars.desktop <<EOF
-      EOF
-
-      mkdir -p "$out/share/pixmaps"
-      cp "${icon}" "$out/share/pixmaps/${name}.png"
-      install -D $desktopItem/share/applications/* $out/share/applications/rars.desktop
-
-      export JAR=$out/share/java/${name}/${name}.jar
-      install -D ./${name}.jar $JAR
-      makeWrapper ${jre}/bin/java $out/bin/${name} \
-        --add-flags "-jar $JAR"
-
-      runHook postInstall
-    '';
-}
--- a/common/vars/default.nix
+++ b/common/vars/default.nix
@ -3,7 +3,7 @@
  lib,
  ...
 }: let
-  inherit (lib) mkOption types;
+  inherit (lib) mkDefault mkOption types;
  flakeDir = config.environment.variables.FLAKE;
  cfg = config.vars;
 in {
@ -23,7 +23,7 @@ in {
    };

    promptMainColor = mkOption {
-      type = types.enum ["red" "green" "blue" "purple" "orange" "yellow" "cyan" "pink"];
+      type = types.enum (import ./prompt-schemes.nix {});
      default = "purple";
    };

@ -32,19 +32,20 @@ in {
        Colors used in starship prompt
      '';

-      default = import ./prompt-schemes.nix cfg.promptMainColor;
+      default = import ./prompt-schemes.nix {color = cfg.promptMainColor;};

      readOnly = true;
-      type = with types;
-        submodule {
-          options = {
-            textColor = mkOption {type = str;};
-            firstColor = mkOption {type = str;};
-            secondColor = mkOption {type = str;};
-            thirdColor = mkOption {type = str;};
-            fourthColor = mkOption {type = str;};
-          };
+      type = types.submodule {
+        options = let
+          inherit (types) str;
+        in {
+          textColor = mkOption {type = str;};
+          firstColor = mkOption {type = str;};
+          secondColor = mkOption {type = str;};
+          thirdColor = mkOption {type = str;};
+          fourthColor = mkOption {type = str;};
        };
+      };
    };

    configDir = mkOption {
@ -55,28 +56,6 @@ in {
      '';
    };

-    mainMonitor = mkOption {
-      type = types.str;
-      description = ''
-        The name of the main monitor used for Hyprland
-        and Regreet which also uses Hyprland
-      '';
-      # This is to allow a bash script to know whether this value exists
-      default = "null";
-    };
-
-    greetdDupe = mkOption {
-      type = types.bool;
-      description = ''
-        If we should duplicate regreet on all monitors
-      '';
-      default = true;
-    };
-
-    fontSize = mkOption {
-      type = types.nullOr types.float;
-    };
-
    neovimIde = mkOption {
      type = types.bool;
      default = true;
@ -84,6 +63,6 @@ in {
  };

  config = {
-    environment.variables.FLAKE = lib.mkDefault "/home/${cfg.mainUser}/.nix";
+    environment.variables.FLAKE = mkDefault "/home/${cfg.mainUser}/.nix";
  };
 }
--- a/common/vars/prompt-schemes.nix
+++ b/common/vars/prompt-schemes.nix
@ -1,4 +1,6 @@
-color: let
+{color ? null}: let
+  inherit (builtins) attrNames removeAttrs;
+
  schemes = {
    "purple" = {
      textColor = "#090c0c";
@ -74,4 +76,6 @@ color: let
    };
  };
 in
-  schemes.${color}
+  if ! isNull color
+  then schemes.${color}
+  else attrNames (removeAttrs schemes ["color"])
--- a/devices/README.md
+++ b/devices/README.md
@ -4,15 +4,15 @@ This directory encompasses every device's main configuration file.

 ## List of my Devices

-| Name       | Description                                                                                             |
-| ---------- | ------------------------------------------------------------------------------------------------------- |
-| `android`  | My [Nix-On-Droid](https://github.com/nix-community/nix-on-droid) configuration for my OnePlus 9 Pro |
-| `binto`    | My desktop PC with a multi-monitor setup and an NVIDIA (cringe) 3070 |
-| `cluster`  | Two Lenovo mini PCs that make use of [NixOS-pcsd](https://github.com/matt1432/nixos-pcsd) to form a cluster |
-| `nos`      | My custom built NAS |
-| `oksys`    | A very old Acer laptop that went from sailing the seas for years to becoming my web server and VPN host. It is now retired indefinitely. |
-| `servivi`  | A gaming PC in a previous life, it is now used to experiment and do heavier stuff |
-| `wim`      | My 2-1 Lenovo Laptop that I use for uni |
+| Name        | Description                                                                                             |
+| ----------- | ------------------------------------------------------------------------------------------------------- |
+| `android`   | My [Nix-On-Droid](https://github.com/nix-community/nix-on-droid) configuration for my OnePlus 9 Pro |
+| `bbsteamie` | My wife's SteamDeck that has a pink case |
+| `binto`     | My desktop PC with a multi-monitor setup and an NVIDIA (cringe) 3070 |
+| `cluster`   | Two Lenovo mini PCs that make use of [NixOS-pcsd](https://github.com/matt1432/nixos-pcsd) to form a cluster |
+| `nos`       | My custom built NAS |
+| `servivi`   | A gaming PC in a previous life, it is now used as a build farm and hosts game servers |
+| `wim`       | My 2-1 Lenovo Laptop that I use for uni |

 ## Global Vars

--- a/devices/android/default.nix
+++ b/devices/android/default.nix
@ -1,25 +1,49 @@
 {
-  home-manager,
-  nixpkgs,
+  config,
+  lib,
+  pkgs,
  ...
-} @ inputs: rec {
-  extraSpecialArgs = inputs;
-  home-manager-path = home-manager.outPath;
-  pkgs = import nixpkgs {
-    system = "aarch64-linux";
-    overlays = import ../../common/overlays inputs;
+}: {
+  vars = {
+    mainUser = "nix-on-droid";
+    hostName = "localhost";
+    neovimIde = false;
  };

-  modules = [
-    {
-      options = with pkgs.lib; {
-        environment.variables.FLAKE = mkOption {
-          type = with types; nullOr str;
-        };
-      };
-    }
-    {home-manager.extraSpecialArgs = inputs;}
-    ../../common/nix-on-droid.nix
-    ./nix-on-droid.nix
+  environment.variables.FLAKE = "/data/data/com.termux.nix/files/home/.nix";
+
+  terminal.font = "${(pkgs.nerdfonts.override {
+    fonts = [
+      "JetBrainsMono"
+    ];
+  })}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFontMono-Regular.ttf";
+
+  environment.packages = [
+    (pkgs.writeShellApplication {
+      name = "switch";
+      runtimeInputs = with pkgs; [
+        nix-output-monitor
+      ];
+      text = ''
+        exec nix-on-droid ${lib.concatStringsSep " " [
+          "switch"
+          "--flake ${config.environment.variables.FLAKE}"
+          "--builders ssh-ng://matt@100.64.0.7"
+          ''"$@"''
+          "|&"
+          "nom"
+        ]}
+      '';
+    })
  ];
+
+  environment.etcBackupExtension = ".bak";
+  environment.motd = null;
+  home-manager.backupFileExtension = "hm-bak";
+
+  # Set your time zone.
+  time.timeZone = "America/Montreal";
+
+  # No touchy
+  system.stateVersion = "23.05";
 }
--- a/devices/android/nix-on-droid.nix
+++ b/devices/android/nix-on-droid.nix
@ -1,47 +0,0 @@
-{pkgs, ...}: {
-  vars = {
-    mainUser = "nix-on-droid";
-    hostName = "localhost";
-    neovimIde = false;
-  };
-
-  environment.variables.FLAKE = "/data/data/com.termux.nix/files/home/.nix";
-
-  terminal.font = "${(pkgs.nerdfonts.override {
-    fonts = [
-      "JetBrainsMono"
-    ];
-  })}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFontMono-Regular.ttf";
-
-  environment.packages = with pkgs; [
-    diffutils
-    findutils
-    utillinux
-    tzdata
-    hostname
-    man
-    gnugrep
-    ripgrep
-    gnupg
-    gnused
-    gnutar
-    bzip2
-    gzip
-    xz
-    zip
-    unzip
-    openssh
-    perl
-    alejandra
-  ];
-
-  environment.etcBackupExtension = ".bak";
-  environment.motd = null;
-  home-manager.backupFileExtension = "hm-bak";
-
-  # Set your time zone.
-  time.timeZone = "America/Montreal";
-
-  # No touchy
-  system.stateVersion = "23.05";
-}
--- a/devices/bbsteamie/default.nix
+++ b/devices/bbsteamie/default.nix
@ -0,0 +1,63 @@
+{
+  config,
+  self,
+  ...
+}: let
+  inherit (config.vars) mainUser hostName;
+in {
+  # ------------------------------------------------
+  # Imports
+  # ------------------------------------------------
+  imports = [
+    ./hardware-configuration.nix
+
+    ./modules/desktop
+
+    self.nixosModules.kmscon
+    self.nixosModules.plymouth
+    self.nixosModules.server
+  ];
+
+  # State Version: DO NOT CHANGE
+  system.stateVersion = "24.11";
+  home-manager.users.${mainUser}.home.stateVersion = "24.11";
+
+  # ------------------------------------------------
+  # User Settings
+  # ------------------------------------------------
+  vars = {
+    mainUser = "mariah";
+    hostName = "bbsteamie";
+    promptMainColor = "pink";
+  };
+
+  users.users.${mainUser} = {
+    isNormalUser = true;
+    extraGroups = [
+      "wheel"
+      "adm"
+    ];
+  };
+
+  networking = {
+    inherit hostName;
+    networkmanager.enable = true;
+  };
+
+  time.timeZone = "America/Montreal";
+
+  # ------------------------------------------------
+  # `Self` Modules configuration
+  # ------------------------------------------------
+  roles.server = {
+    user = mainUser;
+    sshd.enable = true;
+  };
+
+  boot.plymouth = {
+    enable = true;
+    theme = "bgrt";
+  };
+
+  services.kmscon.enable = true;
+}
--- a/devices/bbsteamie/hardware-configuration.nix
+++ b/devices/bbsteamie/hardware-configuration.nix
@ -0,0 +1,61 @@
+{
+  config,
+  jovian,
+  lib,
+  modulesPath,
+  ...
+}: {
+  nixpkgs.hostPlatform = "x86_64-linux";
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+    jovian.nixosModules.default
+  ];
+
+  jovian = {
+    steamos.useSteamOSConfig = true;
+
+    devices.steamdeck = {
+      enable = true;
+      enableGyroDsuService = true;
+    };
+    hardware.has.amd.gpu = true;
+  };
+
+  boot = {
+    kernelModules = ["kvm-amd"];
+    initrd.availableKernelModules = ["nvme" "xhci_pci" "usbhid" "sdhci_pci"];
+
+    loader = {
+      efi.canTouchEfiVariables = true;
+
+      systemd-boot = {
+        enable = true;
+        configurationLimit = 30;
+      };
+    };
+  };
+
+  virtualisation.waydroid.enable = true;
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-label/NIXROOT";
+      fsType = "ext4";
+    };
+
+    "/boot" = {
+      device = "/dev/disk/by-label/NIXBOOT";
+      fsType = "vfat";
+      options = ["fmask=0022" "dmask=0022"];
+    };
+  };
+
+  swapDevices = [
+    {
+      device = "/.swapfile";
+      size = 16 * 1024; # 16GB
+    }
+  ];
+
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
--- a/devices/bbsteamie/modules/desktop/default.nix
+++ b/devices/bbsteamie/modules/desktop/default.nix
@ -0,0 +1,30 @@
+{pkgs, ...}: let
+  defaultSession = "plasma";
+in {
+  imports = [
+    (import ./session-switching.nix defaultSession)
+    (import ./steam.nix defaultSession)
+  ];
+
+  services.desktopManager.plasma6.enable = true;
+
+  programs = {
+    kdeconnect.enable = true;
+    xwayland.enable = true;
+  };
+
+  # Flatpak support for Discover
+  services.flatpak.enable = true;
+  services.packagekit.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    # Misc Apps
+    firefox
+    kdePackages.discover
+    kdePackages.krfb
+
+    # Libs
+    wl-clipboard
+    xclip
+  ];
+}
--- a/devices/bbsteamie/modules/desktop/install_palia_map.md
+++ b/devices/bbsteamie/modules/desktop/install_palia_map.md
@ -0,0 +1,81 @@
+# How to install Palia Map and Overwolf on Linux
+
+Dependencies:
+- latest GE-Proton: https://github.com/GloriousEggroll/proton-ge-custom
+- protontricks: https://github.com/Matoking/protontricks
+- protonhax: https://github.com/jcnils/protonhax
+
+
+## First Step: Install and run Palia at least once
+
+
+## Second Step: Setup Palia WINEPREFIX with latest GE-Proton
+
+1. Delete prefix at /home/"$USER"/.steam/steam/steamapps/compatdata/2707930/pfx
+
+```bash
+rm -r /home/"$USER"/.steam/steam/steamapps/compatdata/2707930/pfx
+```
+
+2. Launch Palia with GE-Proton by going to game properties -> Compatibility -> Force the use ... -> Select GE-Proton...
+
+3. Install dotnet48 and other Windows deps to allow for Overwolf installation
+
+```bash
+# Force proton version of protontricks
+export PROTON_VERSION="GE-Proton9-10"
+protontricks 2707930 dotnet48
+
+# If VC is needed
+protontricks 2707930 vcrun2010
+protontricks 2707930 vcrun2012
+protontricks 2707930 vcrun2013
+```
+
+
+## Third Step: Install Overwolf
+
+1. Get this older version that worked for me here: https://overwolf.en.uptodown.com/windows/download/4714215
+
+2. Install it with protontricks. Follow the GUI installer as if you were on Windows
+
+```bash
+export PROTON_VERSION="GE-Proton9-10"
+protontricks-launch --appid 2707930 Downloads/overwolf-0-195-0-18.exe
+```
+
+
+## Fourth Step: Install Palia Map
+
+1. Get the installer from here: https://www.overwolf.com/app/Leon_Machens-Palia_Map
+
+2. Install it with protontricks.
+
+```bash
+export PROTON_VERSION="GE-Proton9-10"
+protontricks-launch --appid 2707930 Downloads/Palia\ Map\ -\ Installer.exe
+```
+
+3. An error should popup saying `Installation failed` or something along those lines.
+Close it and wait. You should see the Overwolf overlay on the left side of your screen
+with the Palia Map icon saying `Installing` and then when it's done: `Palia Map`.
+
+If nothing happens, try rebooting your PC and retrying the above shell commands until it works.
+
+
+## Final Step: Setting it up in Steam
+
+1. Add this line to Palia launch options
+```bash
+protonhax init %command%
+```
+
+2. Add random non-steam game to your library and then edit its properties:
+
+Change the name to `Palia Map` or anything you like
+
+Change the target to this command:
+
+```bash
+protonhax run 2707930 "/home/$USER/.local/share/Steam/steamapps/compatdata/2707930/pfx/drive_c/users/steamuser/AppData/Roaming/Microsoft/Windows/Start Menu/Programs/Overwolf/Palia Map.lnk"
+```
--- a/devices/bbsteamie/modules/desktop/session-switching.nix
+++ b/devices/bbsteamie/modules/desktop/session-switching.nix
@ -0,0 +1,115 @@
+defaultSession: {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  config = let
+    inherit (lib) findFirst getExe mkForce;
+
+    inherit (config.vars) mainUser;
+
+    switch-session = pkgs.writeShellApplication {
+      name = "switch-session";
+
+      text = ''
+        mkdir -p /etc/sddm.conf.d
+
+        cat <<EOF | tee /etc/sddm.conf.d/autologin.conf
+        [Autologin]
+        User=${mainUser}
+        Session=$1
+        Relogin=true
+        EOF
+      '';
+    };
+
+    gaming-mode = pkgs.writeShellScriptBin "gaming-mode" ''
+      sudo ${pkgs.systemd}/bin/systemctl start to-gaming-mode.service
+    '';
+  in {
+    services.displayManager.sddm = {
+      enable = true;
+      autoLogin.relogin = true;
+
+      wayland = {
+        enable = true;
+        compositorCommand = "kwin";
+      };
+    };
+
+    # Sets the default session at launch
+    systemd.services."set-session" = {
+      wantedBy = ["multi-user.target"];
+      before = ["display-manager.service"];
+
+      path = [switch-session];
+
+      script = ''
+        switch-session "${defaultSession}"
+      '';
+    };
+
+    # Allows switching to gaming mode
+    systemd.services."to-gaming-mode" = {
+      wantedBy = mkForce [];
+
+      path = [switch-session];
+
+      script = ''
+        switch-session "gamescope-wayland"
+        systemctl restart display-manager
+        sleep 10
+        switch-session "${defaultSession}"
+      '';
+    };
+
+    # Make it so we don't need root to switch to gaming mode
+    security.sudo.extraRules = [
+      {
+        users = [mainUser];
+        groups = [100];
+        commands = [
+          {
+            command = "${pkgs.systemd}/bin/systemctl start to-gaming-mode.service";
+            options = ["SETENV" "NOPASSWD"];
+          }
+        ];
+      }
+    ];
+
+    home-manager.users.${mainUser} = {
+      # Add desktop entry to make it GUI friendly
+      xdg.desktopEntries."Gaming Mode" = {
+        name = "Gaming Mode";
+        exec = getExe gaming-mode;
+        icon = "steam";
+        terminal = false;
+        type = "Application";
+      };
+
+      home.file."Desktop/Gaming Mode.desktop".source =
+        (
+          findFirst
+          (x: x.meta.name == "Gaming Mode.desktop") {}
+          config.home-manager.users.mariah.home.packages
+        )
+        + "/share/applications/Gaming Mode.desktop";
+
+      # Fix remote control prompt showing up everytime
+      xdg.configFile = let
+        mkAutostart = name: flags: {
+          "autostart/${name}.desktop".text = "[Desktop Entry]\nType=Application\nExec=${name} ${flags}";
+        };
+      in (
+        # Needs xdg-desktop-portal-kde patch provided by `self.overlays.xdg-desktop-portal-kde`
+        {"plasmaremotedesktoprc".text = "[Sharing]\nUnattended=true";}
+        // (mkAutostart "krfb" "--nodialog %c")
+        // (mkAutostart "steam" "-silent %U")
+      );
+    };
+  };
+
+  # For accurate stack trace
+  _file = ./session-switching.nix;
+}
--- a/devices/bbsteamie/modules/desktop/steam.nix
+++ b/devices/bbsteamie/modules/desktop/steam.nix
@ -0,0 +1,80 @@
+defaultSession: {
+  config,
+  lib,
+  pkgs,
+  self,
+  ...
+}: {
+  config = let
+    inherit (config.vars) mainUser;
+
+    cfg = config.programs.steam;
+  in {
+    # Normal Steam Stuff
+    programs.steam = {
+      enable = true;
+      protontricks.enable = true;
+
+      remotePlay.openFirewall = true;
+      extraCompatPackages = [
+        self.packages.${pkgs.system}.proton-ge-latest
+      ];
+    };
+
+    # Jovian Steam settings
+    jovian.steam = {
+      # Steam > Settings > System > Enable Developer Mode
+      # Steam > Developer > CEF Remote Debugging
+      enable = true;
+      user = mainUser;
+
+      environment = {
+        STEAM_EXTRA_COMPAT_TOOLS_PATHS =
+          lib.makeSearchPathOutput
+          "steamcompattool"
+          ""
+          cfg.extraCompatPackages;
+      };
+
+      desktopSession = defaultSession;
+    };
+
+    # Decky settings
+    jovian.decky-loader = {
+      enable = true;
+      user = mainUser;
+      stateDir = "/home/${mainUser}/.local/share/decky"; # Keep scoped to user
+      # https://github.com/Jovian-Experiments/Jovian-NixOS/blob/1171169117f63f1de9ef2ea36efd8dcf377c6d5a/modules/decky-loader.nix#L80-L84
+
+      extraPackages = with pkgs; [
+        # Generic packages
+        curl
+        unzip
+        util-linux
+        gnugrep
+
+        readline.out
+        procps
+        pciutils
+        libpulseaudio
+      ];
+    };
+
+    # Takes way too long to shutdown
+    systemd.services."decky-loader".serviceConfig.TimeoutStopSec = "5";
+
+    # Misc Packages
+    environment.systemPackages = [
+      pkgs.steam-rom-manager
+      self.packages.${pkgs.system}.protonhax
+
+      # FIXME:Ryujinx ACNH crashes on OpenGL AND Vulkan
+      # https://github.com/Ryujinx/Ryujinx/issues/6993
+      # https://github.com/Ryujinx/Ryujinx/issues/6708
+      self.packages.${pkgs.system}.yuzu
+    ];
+  };
+
+  # For accurate stack trace
+  _file = ./steam.nix;
+}
--- a/devices/binto/default.nix
+++ b/devices/binto/default.nix
@ -1,29 +1,43 @@
-{config, ...}: let
+{
+  config,
+  self,
+  ...
+}: let
  inherit (config.vars) mainUser hostName;
 in {
+  # ------------------------------------------------
+  # Imports
+  # ------------------------------------------------
  imports = [
    ./hardware-configuration.nix

-    ../../modules/ags
-    ../../modules/audio.nix
-    ../../modules/hyprland
-    ../../modules/kmscon.nix
-    ../../modules/printer.nix
-    ../../modules/razer.nix
-    ../../modules/sshd.nix
-    ../../modules/tailscale.nix
-
    ./modules/gpu-replay.nix
    ./modules/nix-gaming.nix
+
+    self.nixosModules.adb
+    self.nixosModules.desktop
+    self.nixosModules.kmscon
+    self.nixosModules.server
  ];

+  home-manager.users.${mainUser} = {
+    imports = [
+      self.homeManagerModules.firefox
+    ];
+
+    # State Version: DO NOT CHANGE
+    home.stateVersion = "23.11";
+  };
+  # State Version: DO NOT CHANGE
+  system.stateVersion = "23.11";
+
+  # ------------------------------------------------
+  # User Settings
+  # ------------------------------------------------
  vars = {
    mainUser = "matt";
    hostName = "binto";
    promptMainColor = "purple";
-    mainMonitor = "desc:GIGA-BYTE TECHNOLOGY CO. LTD. G27QC 0x00000B1D";
-    greetdDupe = false;
-    fontSize = 12.5;
  };

  users.users.${mainUser} = {
@ -37,16 +51,6 @@ in {
      "libvirtd"
    ];
  };
-  home-manager.users.${mainUser} = {
-    imports = [
-      ../../home/firefox
-
-      ./home/packages.nix
-    ];
-
-    # No touchy
-    home.stateVersion = "23.11";
-  };

  networking = {
    inherit hostName;
@ -54,9 +58,31 @@ in {
    firewall.enable = false;
  };

-  # Set your time zone.
  time.timeZone = "America/Montreal";

-  # No touchy
-  system.stateVersion = "23.11";
+  # ------------------------------------------------
+  # `Self` Modules configuration
+  # ------------------------------------------------
+  roles.desktop = {
+    user = mainUser;
+
+    ags.enable = true;
+    mainMonitor = "desc:GIGA-BYTE TECHNOLOGY CO. LTD. G27QC 0x00000B1D";
+    displayManager.duplicateScreen = false;
+
+    fontSize = 12.5;
+  };
+
+  roles.server = {
+    user = mainUser;
+    tailscale.enable = true;
+    sshd.enable = true;
+  };
+
+  programs.adb = {
+    enable = true;
+    user = mainUser;
+  };
+
+  services.kmscon.enable = true;
 }
--- a/devices/binto/home/packages.nix
+++ b/devices/binto/home/packages.nix
@ -1,33 +0,0 @@
-{...}: {
-  xdg.desktopEntries."com.github.iwalton3.jellyfin-media-player" = {
-    name = "Jellyfin Media Player";
-    comment = "Desktop client for Jellyfin";
-    exec = "jellyfinmediaplayer --platform xcb";
-    icon = "com.github.iwalton3.jellyfin-media-player";
-    terminal = false;
-    type = "Application";
-    categories = ["AudioVideo" "Video" "Player" "TV"];
-    settings = {
-      Version = "1.0";
-      StartupWMClass = "jellyfin-media-player";
-    };
-    actions = {
-      "DesktopF" = {
-        name = "Desktop [Fullscreen]";
-        exec = "jellyfinmediaplayer --fullscreen --desktop --platform xcb";
-      };
-      "DesktopW" = {
-        name = "Desktop [Windowed]";
-        exec = "jellyfinmediaplayer --windowed --desktop --platform xcb";
-      };
-      "TVF" = {
-        name = "TV [Fullscreen]";
-        exec = "jellyfinmediaplayer --fullscreen --tv --platform xcb";
-      };
-      "TVW" = {
-        name = "TV [Windowed]";
-        exec = "jellyfinmediaplayer --windowed --tv --platform xcb";
-      };
-    };
-  };
-}
--- a/devices/binto/modules/gpu-replay.nix
+++ b/devices/binto/modules/gpu-replay.nix
@ -1,53 +1,18 @@
 {
-  pkgs,
  config,
  lib,
-  gpu-screen-recorder-src,
+  pkgs,
+  self,
  ...
 }: let
-  inherit (config.vars) mainUser mainMonitor;
  inherit (lib) concatStringsSep removePrefix;
+
+  inherit (config.vars) mainUser;
+
+  cfgDesktop = config.roles.desktop;
+
+  gsr = self.packages.${pkgs.system}.gpu-screen-recorder;
  hyprPkgs = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland.finalPackage;
-
-  gsr = pkgs.stdenv.mkDerivation {
-    name = "gpu-screen-recorder";
-    version = gpu-screen-recorder-src.shortRev;
-
-    src = gpu-screen-recorder-src;
-
-    nativeBuildInputs = with pkgs; [
-      pkg-config
-      makeWrapper
-    ];
-
-    buildInputs = with pkgs; [
-      libpulseaudio
-      ffmpeg
-      wayland
-      libdrm
-      libva
-      xorg.libXcomposite
-      xorg.libXrandr
-    ];
-
-    buildPhase = ''
-      ./build.sh
-    '';
-
-    installPhase = ''
-      strip gsr-kms-server
-      strip gpu-screen-recorder
-
-      install -Dm755 "gsr-kms-server" "$out/bin/gsr-kms-server"
-      install -Dm755 "gpu-screen-recorder" "$out/bin/gpu-screen-recorder"
-      #install -Dm644 "extra/gpu-screen-recorder.service" "$out/lib/systemd/user/gpu-screen-recorder.service"
-
-      wrapProgram $out/bin/gpu-screen-recorder --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
-        pkgs.addOpenGLRunpath.driverLink
-        pkgs.libglvnd
-      ]}"
-    '';
-  };
 in {
  security.wrappers = {
    gpu-screen-recorder = {
@ -66,22 +31,22 @@ in {
  };

  home-manager.users.${mainUser} = {
-    home.packages = with pkgs; [
+    home.packages = [
      gsr

-      (writeShellApplication {
+      (pkgs.writeShellApplication {
        name = "gpu-save-replay";
-        runtimeInputs = [procps];
+        runtimeInputs = [pkgs.procps];
        text = ''
          pkill --signal SIGUSR1 -f gpu-screen-recorder
        '';
      })

-      (writeShellApplication {
+      (pkgs.writeShellApplication {
        name = "gsr-start";
-        runtimeInputs = [pulseaudio hyprPkgs xorg.xrandr];
+        runtimeInputs = [pkgs.pulseaudio hyprPkgs pkgs.xorg.xrandr];
        text = ''
-          main="${removePrefix "desc:" mainMonitor}"
+          main="${removePrefix "desc:" cfgDesktop.mainMonitor}"
          WINDOW=$(hyprctl -j monitors | jq '.[] |= (.description |= gsub(","; ""))' | jq -r ".[] | select(.description | test(\"$main\")) | .name")

          # Fix fullscreen game resolution
--- a/devices/binto/modules/nix-gaming.nix
+++ b/devices/binto/modules/nix-gaming.nix
@ -1,28 +1,37 @@
 {
  nix-gaming,
  pkgs,
+  self,
  ...
 }: {
+  imports = [
+    nix-gaming.nixosModules.platformOptimizations
+  ];
+
  programs = {
    steam = {
-      # Disable HW accel to fix flickers
      enable = true;
      remotePlay.openFirewall = true;

-      extraCompatPackages = with pkgs; [
-        proton-ge-bin
+      extraCompatPackages = [
+        self.packages.${pkgs.system}.proton-ge-latest
      ];
+
+      platformOptimizations.enable = true;
    };
  };

-  environment.systemPackages = with pkgs; [
-    (lutris.override {
+  environment.systemPackages = [
+    (pkgs.lutris.override {
      extraLibraries = pkgs: [
        # List library dependencies here
      ];
      extraPkgs = pkgs: [
-        nix-gaming.packages.${pkgs.system}.wine-ge
+        # List extra packages available to lutris here
      ];
    })
+
+    pkgs.r2modman
+    pkgs.ryujinx
  ];
 }
--- a/devices/cluster/default.nix
+++ b/devices/cluster/default.nix
@ -1,18 +1,31 @@
-deviceName: {config, ...}: let
+deviceName: {
+  config,
+  self,
+  ...
+}: let
  inherit (config.vars) mainUser hostName;

  clusterIP = config.services.pcsd.virtualIps.caddy-vip.ip;
 in {
+  # ------------------------------------------------
+  # Imports
+  # ------------------------------------------------
  imports = [
    ./hardware-configuration.nix

-    ../../modules/kmscon.nix
-    ../../modules/sshd.nix
-    ../../modules/tailscale.nix
-
    ./modules/pcsd.nix
+
+    self.nixosModules.kmscon
+    self.nixosModules.server
  ];

+  # State Version: DO NOT CHANGE
+  system.stateVersion = "24.05";
+  home-manager.users.${mainUser}.home.stateVersion = "24.05";
+
+  # ------------------------------------------------
+  # User Settings
+  # ------------------------------------------------
  vars = {
    mainUser = "matt";
    hostName = deviceName;
@ -32,13 +45,6 @@ in {
    ];
  };

-  home-manager.users.${mainUser} = {
-    imports = [];
-
-    # No touchy
-    home.stateVersion = "24.05";
-  };
-
  networking = {
    inherit hostName;
    resolvconf.enable = true;
@ -53,9 +59,16 @@ in {
    firewall.enable = false;
  };

-  # Set your time zone.
  time.timeZone = "America/Montreal";

-  # No touchy
-  system.stateVersion = "24.05";
+  # ------------------------------------------------
+  # `Self` Modules configuration
+  # ------------------------------------------------
+  roles.server = {
+    user = mainUser;
+    tailscale.enable = true;
+    sshd.enable = true;
+  };
+
+  services.kmscon.enable = true;
 }
--- a/devices/cluster/modules/caddy.nix
+++ b/devices/cluster/modules/caddy.nix
@ -48,7 +48,19 @@ in {
          vault.reverseProxy = "${nosIP}:8781";
          hauk.reverseProxy = "${nosIP}:3003";
          headscale.reverseProxy = "${clusterIP}:8085";
-          jelly.reverseProxy = "${nosIP}:8097";
+          pr-tracker.reverseProxy = "${serviviIP}:3000";
+
+          jellyfin = {
+            subDomainName = "jelly";
+            reverseProxy = "${nosIP}:8096";
+
+            subDirectories = {
+              jfa-go = {
+                subDirName = "accounts";
+                reverseProxy = "${nosIP}:8056";
+              };
+            };
+          };

          pcsd = {
            extraConfig = ''
@ -125,10 +137,6 @@ in {

            subDirectories = {
              bazarr.reverseProxy = "${nosIP}:6767";
-              bazarr-french = {
-                subDirName = "bafrr";
-                reverseProxy = "${nosIP}:6766";
-              };

              prowlarr.reverseProxy = "${nosIP}:9696";
              radarr.reverseProxy = "${nosIP}:7878";
--- a/devices/cluster/modules/unbound.nix
+++ b/devices/cluster/modules/unbound.nix
@ -27,7 +27,7 @@ in {
          "nelim.org redirect"
        ];
        local-data = let
-          wanIP = "166.62.179.208";
+          wanIP = "166.62.180.199";
          caddyIp =
            if hostName == "thingone"
            then "100.64.0.8"
--- a/devices/nos/default.nix
+++ b/devices/nos/default.nix
@ -1,22 +1,35 @@
-{config, ...}: let
+{
+  config,
+  self,
+  ...
+}: let
  inherit (config.vars) mainUser hostName;
 in {
+  # ------------------------------------------------
+  # Imports
+  # ------------------------------------------------
  imports = [
    ./hardware-configuration.nix

-    ../../modules/kmscon.nix
-    ../../modules/sshd.nix
-    ../../modules/tailscale.nix
-
-    ./modules/arion
+    ./modules/docker
    ./modules/jellyfin
    ./modules/mergerfs.nix
    ./modules/qbittorrent
    ./modules/snapraid.nix
-    ./modules/subtitles/cleanup.nix
-    ./modules/subtitles/syncing.nix
+    ./modules/subtitles
+
+    self.nixosModules.docker
+    self.nixosModules.kmscon
+    self.nixosModules.server
  ];

+  # State Version: DO NOT CHANGE
+  system.stateVersion = "24.05";
+  home-manager.users.${mainUser}.home.stateVersion = "24.05";
+
+  # ------------------------------------------------
+  # User Settings
+  # ------------------------------------------------
  vars = {
    mainUser = "matt";
    hostName = "nos";
@ -32,22 +45,22 @@ in {
    ];
  };

-  home-manager.users.${mainUser} = {
-    imports = [];
-
-    # No touchy
-    home.stateVersion = "24.05";
-  };
-
  networking = {
    inherit hostName;
    resolvconf.enable = true;
    firewall.enable = false;
  };

-  # Set your time zone.
  time.timeZone = "America/Montreal";

-  # No touchy
-  system.stateVersion = "24.05";
+  # ------------------------------------------------
+  # `Self` Modules configuration
+  # ------------------------------------------------
+  roles.server = {
+    user = mainUser;
+    tailscale.enable = true;
+    sshd.enable = true;
+  };
+
+  services.kmscon.enable = true;
 }
--- a/devices/nos/hardware-configuration.nix
+++ b/devices/nos/hardware-configuration.nix
@ -1,10 +1,19 @@
 {
  config,
  modulesPath,
+  self,
  ...
 }: {
  nixpkgs.hostPlatform = "x86_64-linux";
-  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+    self.nixosModules.nvidia
+  ];
+
+  nvidia = {
+    enable = true;
+    enableCUDA = true;
+  };

  boot = {
    kernelModules = ["kvm-intel"];
@ -45,9 +54,4 @@
  zramSwap.enable = true;

  hardware.cpu.intel.updateMicrocode = config.hardware.enableRedistributableFirmware;
-
-  nvidia = {
-    enable = true;
-    enableCUDA = true;
-  };
 }
--- a/devices/nos/modules/arion/forgejo/compose.nix
+++ b/devices/nos/modules/arion/forgejo/compose.nix
@ -1,67 +0,0 @@
-{config, ...}: let
-  inherit (config.sops) secrets;
-  inherit (config.arion) rwDataDir;
-
-  rwPath = rwDataDir + "/forgejo";
-in {
-  arion.projects."forgejo" = {
-    "forgejo" = {
-      image = ./images/forgejo.nix;
-
-      ports = [
-        # Redirect WAN port 22 to this port
-        "2222:22"
-        "3000:3000"
-      ];
-
-      restart = "always";
-      depends_on = ["forgejo-db"];
-
-      env_file = [secrets.forgejo.path];
-      environment = {
-        APP_NAME = "Gitea";
-
-        # TODO: change ids
-        USER_UID = "1000";
-        USER_GID = "1000";
-
-        ROOT_URL = "https://git.nelim.org";
-        SSH_DOMAIN = "git.nelim.org";
-        SSH_PORT = 22;
-        HTTP_PORT = 3000;
-      };
-
-      volumes = [
-        "${rwPath}/data:/data"
-        "/etc/timezone:/etc/timezone:ro"
-        "/etc/localtime:/etc/localtime:ro"
-      ];
-    };
-
-    "forgejo-db" = {
-      image = ./images/postgres.nix;
-
-      restart = "always";
-
-      env_file = [secrets.forgejo-db.path];
-
-      volumes = ["${rwPath}/db:/var/lib/postgresql/data"];
-    };
-
-    "act_runner" = {
-      image = ./images/act_runner.nix;
-      privileged = true;
-
-      restart = "always";
-      depends_on = ["forgejo"];
-
-      env_file = [secrets.forgejo-runner.path];
-      environment = {
-        GITEA_INSTANCE_URL = "https://git.nelim.org";
-        GITEA_RUNNER_NAME = "DinD";
-      };
-
-      volumes = ["${rwPath}/act:/data"];
-    };
-  };
-}
--- a/devices/nos/modules/arion/forgejo/images/forgejo.nix
+++ b/devices/nos/modules/arion/forgejo/images/forgejo.nix
@ -1,8 +0,0 @@
-pkgs:
-pkgs.dockerTools.pullImage {
-  imageName = "codeberg.org/forgejo/forgejo";
-  imageDigest = "sha256:7aa26f80fb574cf7dc886e180d1e86462bf4110fd1d5343af33264c18ae3a1b3";
-  sha256 = "1ij5cwbs8mv67pimkp43ia0fxli2rr5agy08sq8yimxmz4ayd60l";
-  finalImageName = "codeberg.org/forgejo/forgejo";
-  finalImageTag = "1.21.10-0";
-}
--- a/devices/nos/modules/arion/forgejo/images/postgres.nix
+++ b/devices/nos/modules/arion/forgejo/images/postgres.nix
@ -1,8 +0,0 @@
-pkgs:
-pkgs.dockerTools.pullImage {
-  imageName = "postgres";
-  imageDigest = "sha256:6779d7a308f3c9c518a644ad9326be6149dc50352c91927725936a1115e09b0d";
-  sha256 = "1qckzi60db6q3dw61qqpfj4xsf7fa92aaf5x7ra2ac5sm1kbhl3x";
-  finalImageName = "postgres";
-  finalImageTag = "14";
-}
--- a/devices/nos/modules/arion/freshrss/compose.nix
+++ b/devices/nos/modules/arion/freshrss/compose.nix
@ -1,83 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
-  inherit (config.sops) secrets;
-  inherit (config.arion) rwDataDir;
-
-  rwPath = rwDataDir + "/freshrss";
-in {
-  arion.projects."freshrss" = {
-    "freshrss" = {
-      image = ./images/freshrss.nix;
-      restart = "always";
-
-      ports = ["2800:80"];
-      extra_hosts = [
-        "drss.nelim.org=10.0.0.130"
-        "bridge.nelim.org=10.0.0.130"
-      ];
-
-      volumes = let
-        rss-bridge = pkgs.stdenv.mkDerivation {
-          name = "rss-bridge-ext";
-          version = "unstable";
-          src = pkgs.fetchFromGitHub {
-            owner = "DevonHess";
-            repo = "FreshRSS-Extensions";
-            rev = "299c1febc279be77fa217ff5c2965a620903b974";
-            hash = "sha256-++kgbrGJohKeOeLjcy7YV3QdCf9GyZDtbntlFmmIC5k=";
-          };
-          installPhase = ''
-            mkdir $out
-            cp -ar ./xExtension-RssBridge $out/
-          '';
-        };
-      in [
-        "${rwPath}/data:/var/www/FreshRSS/data"
-        "${rss-bridge}/xExtension-RssBridge:/var/www/FreshRSS/extensions/xExtension-RssBridge:ro"
-      ];
-
-      env_file = [secrets.freshrss.path];
-
-      environment = {
-        TZ = "America/New_York";
-        CRON_MIN = "3,33";
-      };
-    };
-
-    "freshrss-db" = {
-      image = ./images/postgres.nix;
-      restart = "always";
-
-      volumes = [
-        "${rwPath}/db:/var/lib/postgresql/data"
-      ];
-
-      env_file = [secrets.freshrss.path];
-
-      environment = {
-        POSTGRES_DB = "\${DB_BASE:-freshrss}";
-        POSTGRES_USER = "\${DB_USER:-freshrss}";
-        POSTGRES_PASSWORD = "\${DB_PASSWORD:-freshrss}";
-      };
-    };
-
-    "docker-hub-rss" = {
-      image = ./images/docker-hub-rss.nix;
-      restart = "always";
-      ports = ["3007:3000"];
-    };
-
-    "rss-bridge" = {
-      image = ./images/rss-bridge.nix;
-      restart = "always";
-
-      volumes = [
-        "${rwPath}/bridge:/config"
-      ];
-      ports = ["3006:80"];
-    };
-  };
-}
--- a/devices/nos/modules/arion/freshrss/images/freshrss.nix
+++ b/devices/nos/modules/arion/freshrss/images/freshrss.nix
@ -1,8 +0,0 @@
-pkgs:
-pkgs.dockerTools.pullImage {
-  imageName = "freshrss/freshrss";
-  imageDigest = "sha256:c554223f485843553f7b7c9faff1f5c6c6113ce15b0288dd07210e97d8bbbbcc";
-  sha256 = "1vjsr0hfq5dfma2dll6jzkir14ii423nlvjjq6gq0mp9s19jidr7";
-  finalImageName = "freshrss/freshrss";
-  finalImageTag = "latest";
-}
--- a/devices/nos/modules/arion/freshrss/images/postgres.nix
+++ b/devices/nos/modules/arion/freshrss/images/postgres.nix
@ -1,8 +0,0 @@
-pkgs:
-pkgs.dockerTools.pullImage {
-  imageName = "postgres";
-  imageDigest = "sha256:6779d7a308f3c9c518a644ad9326be6149dc50352c91927725936a1115e09b0d";
-  sha256 = "1qckzi60db6q3dw61qqpfj4xsf7fa92aaf5x7ra2ac5sm1kbhl3x";
-  finalImageName = "postgres";
-  finalImageTag = "14";
-}
--- a/devices/nos/modules/arion/freshrss/images/rss-bridge.nix
+++ b/devices/nos/modules/arion/freshrss/images/rss-bridge.nix
@ -1,8 +0,0 @@
-pkgs:
-pkgs.dockerTools.pullImage {
-  imageName = "rssbridge/rss-bridge";
-  imageDigest = "sha256:b543b93acf3c5e5f011b940352032aabc98221716fed57b4c7f902908731beae";
-  sha256 = "1lk5x15dlgcyly0in9xhn7ibxp9hp2h65x9q3axhqiz28dkd176a";
-  finalImageName = "rssbridge/rss-bridge";
-  finalImageTag = "latest";
-}
--- a/devices/nos/modules/arion/gameyfin/compose.nix
+++ b/devices/nos/modules/arion/gameyfin/compose.nix
@ -1,19 +0,0 @@
-{config, ...}: let
-  inherit (config.sops) secrets;
-in {
-  arion.projects."gameyfin"."gameyfin" = {
-    image = ./images/gameyfin.nix;
-    restart = "always";
-    user = "1000:1000";
-
-    env_file = [secrets.gameyfin.path];
-    environment.GAMEYFIN_USER = "mathis";
-
-    volumes = [
-      "/data/games:/opt/gameyfin-library"
-    ];
-
-    expose = ["8080"];
-    ports = ["8074:8080"];
-  };
-}
--- a/devices/nos/modules/arion/gameyfin/images/gameyfin.nix
+++ b/devices/nos/modules/arion/gameyfin/images/gameyfin.nix
@ -1,8 +0,0 @@
-pkgs:
-pkgs.dockerTools.pullImage {
-  imageName = "grimsi/gameyfin";
-  imageDigest = "sha256:97842e65252e0854ccced478c10a007ee57e7a35c98c3cb26ecce9d0fd5be41c";
-  sha256 = "19gbbaqg4n188piyh3lb54rfwz5xpj6f6fkvpqsbls3v9a4ambjw";
-  finalImageName = "grimsi/gameyfin";
-  finalImageTag = "latest";
-}
--- a/devices/nos/modules/arion/hauk/compose.nix
+++ b/devices/nos/modules/arion/hauk/compose.nix
@ -1,9 +0,0 @@
-{...}: {
-  arion.projects."hauk"."hauk" = {
-    image = ./images/hauk.nix;
-    restart = "always";
-    ports = ["3003:80"];
-
-    volumes = ["${./config.php}:/etc/hauk/config.php:ro"];
-  };
-}
--- a/devices/nos/modules/arion/homepage/compose.nix
+++ b/devices/nos/modules/arion/homepage/compose.nix
@ -1,62 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
-  inherit (config.sops) secrets;
-  inherit (pkgs.writers) writeYAML;
-in {
-  arion.projects."homepage"."homepage" = {
-    image = ./images/homepage.nix;
-    restart = "always";
-
-    ports = [
-      "3020:3000"
-    ];
-
-    extra_hosts = ["lan.nelim.org=10.0.0.130"];
-
-    env_file = [secrets.homepage.path];
-
-    volumes = let
-      services = writeYAML "services.yaml" (import ./services.nix);
-
-      bookmarks = writeYAML "bookmarks.yaml" {};
-
-      settings = writeYAML "settings.yaml" {
-        # FIXME: title not working
-        title = "bruh";
-        theme = "dark";
-        color = "gray";
-        target = "_self";
-
-        layout.video = {
-          style = "columns";
-          row = 4;
-          # columns = 2;
-        };
-      };
-
-      widgets = writeYAML "widgets.yaml" [
-        {
-          resources = {
-            cpu = true;
-            memory = true;
-            disk = "/";
-          };
-        }
-        {
-          search = {
-            provider = "duckduckgo";
-            target = "_blank";
-          };
-        }
-      ];
-    in [
-      "${bookmarks}:/app/config/bookmarks.yaml:ro"
-      "${services}:/app/config/services.yaml:ro"
-      "${settings}:/app/config/settings.yaml:ro"
-      "${widgets}:/app/config/widgets.yaml:ro"
-    ];
-  };
-}
--- a/Show more
+++ b/Show more