feat: init wezterm config

2024-04-09 14:50:51 -04:00
825 changed files with 17633 additions and 31382 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,5 +0,0 @@
-flake.lock -diff
-flake.nix -diff
-**/non-declarative-conf -diff
-**/package-lock.json -diff
-**/HomeAssistantGenerated -diff
--- a/.gitignore
+++ b/.gitignore
@ -1,23 +1,9 @@
-# Python
 *.egg-info
-
-# NPM
-*node_modules
-*build/
-
-# Direnv
-*.direnv/
-
-# Generated by nix
-result*
-!results/
-.nixd.json
-
-## AGS
-**/vars.ts
-**/config.js
-*icons
-**/types
-
-# Other
 *.temp
+*node_modules/
+*types
+*build/
+result*
+*config.js
+*icons
+*.direnv/
--- a/README.md
+++ b/README.md
@ -1,17 +1,6 @@
 # My NixOS configs

-TODO: add directory structure info and enforce it
-
-    - [x] every root folder in the repo represents a flake output except inputs
-    - [x] every root folder only has an optional `default.nix` and subfolders for each
-          of its attrs
-    - [x] if there is non nix code, it will be in a `config` folder
-    - [x] every module should not do anything if imported
-    - [x] all nix files that represent a module should be `default.nix` (a nix file
-         which is imported directly can be called anything alongside `default.nix`)
-    - [ ] redo docs
-
-## AGS
+## Ags

 You might find it weird that most of my config is written in TypeScript.
 That's because all my desktops run
@ -28,8 +17,10 @@ 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. Its structure is based on a flake's
-[outputs](https://wiki.nixos.org/wiki/Flakes#Output_schema).
+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)

 ### Flake Location

@ -53,21 +44,12 @@ 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 |
-| `packages`                         | Some custom [packages](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/packages) not available in nixpkgs or modified from it |
-| `scopedPackages`                   | Some custom [package scopes](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/scopedPackages) 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/modules) made for NixOS systems |
-| `formatter`                        | I format nix code with [alejandra](https://github.com/kamadorueda/alejandra) |
+| `formatter`                        | I have yet to know if this has any uses but I format 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

-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:
+I prefer using a more descriptive format for my inputs like so:

 ```nix
 nixpkgs = {
@ -85,23 +67,29 @@ 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 generate `.sops.yaml` from `.sops.nix`:
+I only use secrets stored in `JSON` and generate `.sops.yaml`
+from `.sops.nix`:

 ```nix
 let
  wim = "somekey";
-  binto = "somekey2";
+  oksys = "somekey2";
 in {
  creation_rules = [
    {
      path_regex = "secrets/[^/]+\\.(yaml|json|env|ini)$";
      key_groups = [
        {
-          age = [wim binto];
+          age = [wim oksys];
        }
      ];
    }
--- a/_outputs.nix
+++ b/_outputs.nix
@ -1,156 +0,0 @@
-{
-  inputs = let
-    inherit (import ./inputs) mkDep mkInput extraInputs;
-
-    mainInputs = {
-      systems = mkInput {
-        owner = "nix-systems";
-        repo = "default-linux";
-      };
-
-      nixpkgs = mkInput {
-        owner = "NixOS";
-        repo = "nixpkgs";
-        ref = "nixos-unstable-small";
-      };
-
-      home-manager = mkDep {
-        owner = "nix-community";
-        repo = "home-manager";
-      };
-
-      nix-on-droid = mkDep {
-        owner = "nix-community";
-        repo = "nix-on-droid";
-
-        inputs.home-manager.follows = "home-manager";
-      };
-
-      sops-nix = mkDep {
-        owner = "Mic92";
-        repo = "sops-nix";
-      };
-
-      secrets = mkDep {
-        type = "git";
-        url = "ssh://git@git.nelim.org/matt1432/nixos-secrets";
-
-        inputs.sops-nix.follows = "sops-nix";
-      };
-    };
-  in
-    mainInputs // extraInputs;
-
-  outputs = inputs @ {
-    self,
-    systems,
-    nixpkgs,
-    secrets,
-    ...
-  }: let
-    inherit (self.lib) mkVersion mkNixOS mkNixOnDroid mkPkgs;
-
-    perSystem = attrs:
-      nixpkgs.lib.genAttrs (import systems) (system:
-        attrs (mkPkgs {inherit system nixpkgs;}));
-  in {
-    lib = import ./lib {inherit inputs perSystem;};
-
-    nixOnDroidConfigurations.default =
-      mkNixOnDroid [./configurations/android];
-
-    nixosConfigurations = {
-      # Desktops
-      wim = mkNixOS {
-        extraModules = [
-          ./configurations/wim
-          secrets.nixosModules.default
-        ];
-      };
-      binto = mkNixOS {
-        cudaSupport = true;
-        extraModules = [./configurations/binto];
-      };
-
-      bbsteamie = mkNixOS {
-        mainUser = "mariah";
-        extraModules = [./configurations/bbsteamie];
-      };
-
-      # NAS
-      nos = mkNixOS {
-        cudaSupport = true;
-        extraModules = [
-          ./configurations/nos
-          secrets.nixosModules.nos
-        ];
-      };
-
-      # Build / test server
-      servivi = mkNixOS {
-        extraModules = [
-          ./configurations/servivi
-          secrets.nixosModules.servivi
-        ];
-      };
-
-      # Home-assistant
-      homie = mkNixOS {
-        extraModules = [
-          ./configurations/homie
-          secrets.nixosModules.homie
-        ];
-      };
-
-      # Cluster
-      thingone = mkNixOS {
-        extraModules = [
-          (import ./configurations/cluster "thingone")
-          secrets.nixosModules.thingy
-        ];
-      };
-      thingtwo = mkNixOS {
-        extraModules = [
-          (import ./configurations/cluster "thingtwo")
-          secrets.nixosModules.thingy
-        ];
-      };
-
-      live-image = mkNixOS {
-        mainUser = "nixos";
-        extraModules = [./configurations/live-image];
-      };
-    };
-
-    # For nix-fast-build. I use a custom output to alleviate eval time of this flake. ie. when doing nix flake show
-    nixFastChecks = import ./nixFastChecks {inherit perSystem self;};
-
-    homeManagerModules = import ./homeManagerModules {inherit self;};
-
-    nixosModules = import ./modules {inherit self;};
-
-    overlays = import ./overlays {inherit self;};
-
-    apps =
-      perSystem (pkgs:
-        import ./apps {inherit pkgs self;});
-
-    appsPackages =
-      perSystem (pkgs:
-        import ./apps/packages.nix {inherit inputs pkgs;});
-
-    devShells =
-      perSystem (pkgs:
-        import ./devShells {inherit pkgs self;});
-
-    packages =
-      perSystem (pkgs:
-        import ./packages {inherit inputs mkVersion pkgs;});
-
-    scopedPackages =
-      perSystem (pkgs:
-        import ./scopedPackages {inherit inputs mkVersion pkgs;});
-
-    formatter = perSystem (pkgs: pkgs.alejandra);
-  };
-}
--- a/apps/README.md
+++ b/apps/README.md
@ -1,11 +0,0 @@
-# Apps
-
-This directory contains every derivations for apps exposed by this flake.
-
-## List of my apps found in `self.apps`
-
-| Name | Description |
-| ---- | ----------- |
-| `extract-subs` | Extract all `srt` subtitle files from a `mkv` video with the appropriate name. |
-| `gen-docs` | Generates the READMEs in this repository from nix attributes. |
-| `update-sources` | Updates all derivation sources in this repository and generates a commit message for the changes made. |
--- a/apps/buildApp.nix
+++ b/apps/buildApp.nix
@ -1,40 +0,0 @@
-{
-  lib,
-  src,
-  npmDepsHash,
-  runtimeInputs,
-  buildNpmPackage,
-  meta,
-  makeWrapper,
-  nodejs_latest,
-  jq,
-  ...
-}: let
-  inherit (lib) concatMapStringsSep;
-  inherit (builtins) fromJSON readFile;
-
-  packageJSON = fromJSON (readFile "${src}/package.json");
-  pname = packageJSON.name;
-  inherit (packageJSON) version;
-in
-  buildNpmPackage {
-    inherit pname version src runtimeInputs npmDepsHash;
-
-    prePatch = ''
-      mv ./tsconfig.json ./project.json
-      sed 's/^ *\/\/.*//' ${./config/tsconfig.json} > ./base.json
-      ${jq}/bin/jq -sr '.[0] * .[1] | del(.extends)' ./project.json ./base.json > ./tsconfig.json
-      rm base.json project.json
-    '';
-
-    nativeBuildInputs = [makeWrapper];
-
-    postInstall = ''
-      wrapProgram $out/bin/${pname} \
-          --prefix PATH : ${concatMapStringsSep ":" (p: p + "/bin") runtimeInputs}
-    '';
-
-    nodejs = nodejs_latest;
-
-    meta = {mainProgram = pname;} // meta;
-  }
--- a/apps/config/.envrc
+++ b/apps/config/.envrc
@ -1,2 +0,0 @@
-use flake $FLAKE#node
-npm ci
--- a/apps/config/eslint.config.ts
+++ b/apps/config/eslint.config.ts
@ -1,451 +0,0 @@
-import eslint from '@eslint/js';
-import jsdoc from 'eslint-plugin-jsdoc';
-import stylistic from '@stylistic/eslint-plugin';
-import tseslint from 'typescript-eslint';
-
-
-export default tseslint.config({
-    files: ['**/*.js', '**/*.ts'],
-    ignores: ['node_modules/**', 'types/**'],
-
-    extends: [
-        eslint.configs.recommended,
-        jsdoc.configs['flat/recommended-typescript'],
-        stylistic.configs['recommended-flat'],
-        ...tseslint.configs.recommended,
-        ...tseslint.configs.stylistic,
-    ],
-
-    rules: {
-        // JSDoc settings
-        'jsdoc/tag-lines': ['warn', 'any', { startLines: 1 }],
-        'jsdoc/check-line-alignment': ['warn', 'always', {
-            tags: ['param', 'arg', 'argument', 'property', 'prop'],
-        }],
-        'jsdoc/no-types': 'off',
-
-        // Newer settings
-        '@typescript-eslint/no-extraneous-class': ['off'],
-        '@typescript-eslint/no-implied-eval': ['off'],
-        'class-methods-use-this': 'off',
-        '@stylistic/no-multiple-empty-lines': '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',
-        ],
-        '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/config/index.ts
+++ b/apps/config/index.ts
@ -1,3 +0,0 @@
-import eslintConf from './eslint.config';
-
-export default eslintConf;
--- a/apps/config/package-lock.json
+++ b/apps/config/package-lock.json
--- a/apps/config/package.json
+++ b/apps/config/package.json
@ -1,16 +0,0 @@
-{
-    "name": "eslint-conf",
-    "version": "0.0.0",
-    "type": "module",
-    "exports": "./index.ts",
-    "devDependencies": {
-        "@eslint/js": "9.18.0",
-        "@stylistic/eslint-plugin": "2.13.0",
-        "eslint": "9.18.0",
-        "eslint-plugin-jsdoc": "50.6.2",
-        "jiti": "2.4.2",
-        "pkg-types": "1.3.1",
-        "typescript": "5.7.3",
-        "typescript-eslint": "8.20.0"
-    }
-}
--- a/apps/config/tsconfig.base.json
+++ b/apps/config/tsconfig.base.json
@ -1,25 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/tsconfig",
-  "compilerOptions": {
-    // Env
-    "target": "ESNext",
-    "lib": [
-      "ESNext"
-    ],
-    // Module
-    "module": "nodenext",
-    "moduleResolution": "bundler",
-    "baseUrl": ".",
-    // Emit
-    "noEmit": true,
-    "newLine": "LF",
-    // Interop
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "forceConsistentCasingInFileNames": true,
-    "isolatedModules": true,
-    // Type Checking
-    "strict": true,
-    "noImplicitAny": false
-  }
-}
--- a/apps/config/tsconfig.json
+++ b/apps/config/tsconfig.json
@ -1,10 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/tsconfig",
-  "extends": "./tsconfig.base.json",
-  "includes": [
-    "*.ts",
-    "**/*.ts",
-    "*.js",
-    "**/*.js"
-  ]
-}
--- a/apps/default.nix
+++ b/apps/default.nix
@ -1,13 +0,0 @@
-{
-  pkgs,
-  self,
-  ...
-}: let
-  inherit (pkgs.lib) getExe mapAttrs;
-
-  mkApp = pkg: {
-    program = getExe pkg;
-    type = "app";
-  };
-in
-  mapAttrs (n: v: mkApp v) self.appsPackages.${pkgs.system}
--- a/apps/extract-subs/.envrc
+++ b/apps/extract-subs/.envrc
@ -1,2 +0,0 @@
-use flake $FLAKE#subtitles-dev
-npm ci
--- a/apps/extract-subs/default.nix
+++ b/apps/extract-subs/default.nix
@ -1,17 +0,0 @@
-{
-  buildApp,
-  ffmpeg-full,
-  ...
-}:
-buildApp {
-  src = ./.;
-  npmDepsHash = "sha256-vShyulD7uKHE4Oxz8Xy8HdGJpMbF5kQYlHZlQtIcKIA=";
-
-  runtimeInputs = [
-    ffmpeg-full
-  ];
-
-  meta.description = ''
-    Extract all `srt` subtitle files from a `mkv` video with the appropriate name.
-  '';
-}
--- a/apps/extract-subs/eslint.config.ts
+++ b/apps/extract-subs/eslint.config.ts
@ -1,3 +0,0 @@
-import eslintConf from 'eslint-conf';
-
-export default eslintConf;
--- a/apps/extract-subs/package-lock.json
+++ b/apps/extract-subs/package-lock.json
--- a/apps/extract-subs/package.json
+++ b/apps/extract-subs/package.json
@ -1,21 +0,0 @@
-{
-    "name": "extract-subs",
-    "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"
-    },
-    "dependencies": {
-        "@types/fluent-ffmpeg": "2.1.27",
-        "fluent-ffmpeg": "2.1.3"
-    },
-    "devDependencies": {
-        "eslint-conf": "file:../config",
-        "@types/node": "22.10.7",
-        "esbuild": "0.24.2",
-        "eslint": "9.18.0",
-        "jiti": "2.4.2",
-        "typescript": "5.7.3"
-    }
-}
--- a/apps/extract-subs/src/app.ts
+++ b/apps/extract-subs/src/app.ts
@ -1,157 +0,0 @@
-import { spawnSync as spawn } from 'child_process';
-
-import ffprobe from './ffprobe';
-import { ISO6393To1 } from './lang-codes';
-
-/* Types */
-import { FfprobeStream } from 'fluent-ffmpeg';
-
-
-const SPAWN_OPTS = {
-    stdio: [process.stdin, process.stdout, process.stderr],
-};
-
-
-/**
- * These are the cli arguments
- *
- * @param videoPath the directory in which we want to sync the subtitles
- * @param languages a comma-separated list of languages (3 letters) to sync the subtitles
- */
-const video = process.argv[2];
-const languages = process.argv[3]?.split(',');
-
-
-// Global Vars
-const subIndexes: number[] = [];
-let videoPath: string;
-let baseName: string;
-
-
-/**
- * Gets the relative path to the subtitle file of a ffmpeg stream.
- *
- * @param sub the stream of the subtitles to extract
- * @returns the path of the subtitle file
- */
-const getSubPath = (sub: FfprobeStream): string => {
-    const language = ISO6393To1.get(sub.tags.language);
-
-    const forced = sub.disposition?.forced === 0 ?
-        '' :
-        '.forced';
-
-    const hearingImpaired = sub.disposition?.hearing_impaired === 0 ?
-        '' :
-        '.sdh';
-
-    return `${baseName}${forced}.${language}${hearingImpaired}.srt`;
-};
-
-/**
- * Removes all subtitles streams from the video file.
- */
-const removeContainerSubs = (): void => {
-    spawn('mv', [
-        videoPath,
-        `${videoPath}.bak`,
-    ], SPAWN_OPTS);
-
-    spawn('ffmpeg', [
-        '-i', `${videoPath}.bak`,
-        '-map', '0',
-        ...subIndexes.map((i) => ['-map', `-0:${i}`]).flat(),
-        '-c', 'copy', videoPath,
-    ], SPAWN_OPTS);
-
-    spawn('rm', [
-        `${videoPath}.bak`,
-    ], SPAWN_OPTS);
-};
-
-/**
- * Extracts a sub of a video file to a subtitle file.
- *
- * @param sub the stream of the subtitles to extract
- */
-const extractSub = (sub: FfprobeStream): void => {
-    const subFile = getSubPath(sub);
-
-    spawn('ffmpeg', [
-        '-i', videoPath,
-        '-map', `0:${sub.index}`, subFile,
-    ], SPAWN_OPTS);
-
-    subIndexes.push(sub.index);
-};
-
-/**
- * Sorts the list of streams to only keep subtitles
- * that can be extracted.
- *
- * @param lang    the language of the subtitles
- * @param streams the streams
- * @returns the streams that represent subtitles
- */
-const findSubs = (
-    lang: string,
-    streams: FfprobeStream[],
-): FfprobeStream[] => {
-    const subs = streams.filter((s) => s.tags?.language &&
-        s.tags.language === lang &&
-        s.codec_type === 'subtitle');
-
-    const pgs = subs.filter((s) => s.codec_name === 'hdmv_pgs_subtitle');
-
-    // If we only have PGS subs, warn user
-    if (pgs.length === subs.length) {
-        console.warn(`No SRT subtitle tracks were found for ${lang}`);
-    }
-
-    // Remove PGS streams from subs
-    return subs.filter((s) => s.codec_name !== 'hdmv_pgs_subtitle');
-};
-
-/**
- * Where the magic happens.
- */
-const main = async(): Promise<void> => {
-    // Get rid of video extension
-    baseName = videoPath.split('/').at(-1)!.replace(/\.[^.]*$/, '');
-
-    // ffprobe the video file to see available sub tracks
-    const data = await ffprobe(videoPath);
-
-    if (!data?.streams) {
-        console.error('Couldn\'t find streams in video file');
-
-        return;
-    }
-
-    // Check for languages wanted
-    languages.forEach((lang) => {
-        const subs = findSubs(lang, data.streams);
-
-        if (subs.length === 0) {
-            console.warn(`No subtitle tracks were found for ${lang}`);
-
-            return;
-        }
-
-        // Extract all subs
-        subs.forEach((sub) => { extractSub(sub); });
-    });
-
-    removeContainerSubs();
-};
-
-
-// Check if there are 2 params
-if (video && languages) {
-    videoPath = video;
-    main();
-}
-else {
-    console.error('Error: no argument passed');
-    process.exit(1);
-}
--- a/apps/extract-subs/src/ffprobe.ts
+++ b/apps/extract-subs/src/ffprobe.ts
@ -1,8 +0,0 @@
-import Ffmpeg from 'fluent-ffmpeg';
-
-
-export default (videoPath: string) => new Promise<Ffmpeg.FfprobeData>((resolve) => {
-    Ffmpeg.ffprobe(videoPath, (_e, data) => {
-        resolve(data);
-    });
-});
--- a/apps/extract-subs/tsconfig.json
+++ b/apps/extract-subs/tsconfig.json
@ -1,10 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/tsconfig",
-  "extends": "../config/tsconfig.base.json",
-  "includes": [
-    "*.ts",
-    "**/*.ts",
-    "*.js",
-    "**/*.js"
-  ]
-}
--- a/apps/gen-docs/default.nix
+++ b/apps/gen-docs/default.nix
@ -1,15 +0,0 @@
-{
-  writeShellApplication,
-  jq,
-  pandoc,
-  ...
-}:
-writeShellApplication {
-  name = "gen-docs";
-  runtimeInputs = [jq pandoc];
-  text = builtins.readFile ./script.sh;
-
-  meta.description = ''
-    Generates the READMEs in this repository from nix attributes.
-  '';
-}
--- a/apps/gen-docs/getAttrsMeta.nix
+++ b/apps/gen-docs/getAttrsMeta.nix
@ -1,13 +0,0 @@
-attr: selfPath: let
-  inherit (builtins) mapAttrs replaceStrings;
-
-  modules = import "${selfPath}/${attr}" {description = true;};
-
-  trimNewlines = s: replaceStrings ["\n"] [" "] s;
-in {
-  attrs =
-    mapAttrs (_: v: {
-      desc = trimNewlines v;
-    })
-    modules;
-}
--- a/apps/gen-docs/getConfigMeta.nix
+++ b/apps/gen-docs/getConfigMeta.nix
@ -1,12 +0,0 @@
-configs: let
-  inherit (builtins) mapAttrs replaceStrings;
-
-  trimNewlines = s: replaceStrings ["\n"] [" "] s;
-in {
-  attrs =
-    mapAttrs (_: v: {
-      roleDesc = trimNewlines (v.config.meta.roleDescription or "");
-      hwDesc = trimNewlines (v.config.meta.hardwareDescription or "");
-    })
-    configs;
-}
--- a/apps/gen-docs/getPackageMeta.nix
+++ b/apps/gen-docs/getPackageMeta.nix
@ -1,13 +0,0 @@
-x: let
-  inherit (builtins) currentSystem mapAttrs removeAttrs replaceStrings;
-
-  trimNewlines = s: replaceStrings ["\n"] [" "] s;
-  packages = removeAttrs x.${currentSystem} ["default"];
-in {
-  attrs =
-    mapAttrs (_: v: {
-      desc = trimNewlines (v.meta.description or "");
-      homepage = v.meta.homepage or "";
-    })
-    packages;
-}
--- a/apps/gen-docs/script.sh
+++ b/apps/gen-docs/script.sh
@ -1,32 +0,0 @@
-substitute() {
-    echo '' | pandoc --metadata-file <(
-        nix eval \
-            --impure \
-            --json \
-            "$FLAKE"#"$1" \
-            --apply "import \"$FLAKE/apps/gen-docs/$3.nix\"" |
-            jq -r
-    ) -t markdown --template "$FLAKE/apps/gen-docs/templates/$2.md" -o "$FLAKE/$2/README.md"
-}
-
-substituteAttrs() {
-    echo '' | pandoc --metadata-file <(
-        nix eval \
-            --impure \
-            --json \
-            --expr "\"$FLAKE\"" \
-            --apply "(import \"$FLAKE/apps/gen-docs/getAttrsMeta.nix\") \"$1\"" |
-            jq -r
-    ) -t markdown --template "$FLAKE/apps/gen-docs/templates/$1.md" -o "$FLAKE/$1/README.md"
-}
-
-substitute "appsPackages" "apps" "getPackageMeta"
-substitute "nixosConfigurations" "configurations" "getConfigMeta"
-substitute "devShells" "devShells" "getPackageMeta"
-substitute "packages" "packages" "getPackageMeta"
-substituteAttrs "modules"
-substituteAttrs "homeManagerModules"
-substituteAttrs "overlays"
-
-# TODO: add metadata of all packages
-substituteAttrs "scopedPackages"
--- a/apps/gen-docs/templates/apps.md
+++ b/apps/gen-docs/templates/apps.md
@ -1,11 +0,0 @@
-# Apps
-
-This directory contains every derivations for apps exposed by this flake.
-
-## List of my apps found in `self.apps`
-
-| Name | Description |
-| ---- | ----------- |
-$for(attrs/pairs)$
-| `$it.key$` | $it.value.desc/nowrap$ |
-$endfor$
--- a/apps/gen-docs/templates/configurations.md
+++ b/apps/gen-docs/templates/configurations.md
@ -1,13 +0,0 @@
-# NixosConfigurations
-
-This directory contains every device's main configuration file, their `hardware-configuration.nix` and some custom modules
-unique to them.
-
-## List of my devices
-
-| Name      | Model / Specs | Description                                                                                      |
-| --------- | ------------- | ------------------------------------------------------------------------------------------------ |
-| `android` | OnePlus 9 Pro | [Nix-On-Droid](https://github.com/nix-community/nix-on-droid) configuration for my OnePlus 9 Pro |
-$for(attrs/pairs)$
-| `$it.key$` | $it.value.hwDesc/nowrap$ | $it.value.roleDesc/nowrap$ |
-$endfor$
--- a/apps/gen-docs/templates/devShells.md
+++ b/apps/gen-docs/templates/devShells.md
@ -1,11 +0,0 @@
-# DevShells
-
-This directory contains every derivations for devShells exposed by this flake.
-
-## List of my devShells found in `self.devShells`
-
-| Name | Description |
-| ---- | ----------- |
-$for(attrs/pairs)$
-| `$it.key$` | $it.value.desc/nowrap$ |
-$endfor$
--- a/apps/gen-docs/templates/homeManagerModules.md
+++ b/apps/gen-docs/templates/homeManagerModules.md
@ -1,11 +0,0 @@
-# HomeManagerModules
-
-This directory contains every home-manager modules exposed by this flake.
-
-## List of my home-manager modules found in `self.homeManagerModules`
-
-| Name | Description |
-| ---- | ----------- |
-$for(attrs/pairs)$
-| `$it.key$` | $it.value.desc/nowrap$ |
-$endfor$
--- a/apps/gen-docs/templates/modules.md
+++ b/apps/gen-docs/templates/modules.md
@ -1,11 +0,0 @@
-# NixosModules
-
-This directory contains every modules for NixOS exposed by this flake.
-
-## List of my modules found in `self.nixosModules`
-
-| Name | Description |
-| ---- | ----------- |
-$for(attrs/pairs)$
-| `$it.key$` | $it.value.desc/nowrap$ |
-$endfor$
--- a/apps/gen-docs/templates/overlays.md
+++ b/apps/gen-docs/templates/overlays.md
@ -1,11 +0,0 @@
-# Overlays
-
-This directory contains every overlay exposed by this flake.
-
-## List of my overlays found in `self.overlays`
-
-| Name | Description |
-| ---- | ----------- |
-$for(attrs/pairs)$
-| `$it.key$` | $it.value.desc/nowrap$ |
-$endfor$
--- a/apps/gen-docs/templates/packages.md
+++ b/apps/gen-docs/templates/packages.md
@ -1,11 +0,0 @@
-# Packages
-
-This directory contains every derivations for packages exposed by this flake.
-
-## List of my packages found in `self.packages`
-
-| Name | Description | Homepage |
-| ---- | ----------- | -------- |
-$for(attrs/pairs)$
-| `$it.key$` | $it.value.desc/nowrap$ | $it.value.homepage/nowrap$ |
-$endfor$
--- a/apps/gen-docs/templates/scopedPackages.md
+++ b/apps/gen-docs/templates/scopedPackages.md
@ -1,11 +0,0 @@
-# ScopedPackages
-
-This directory contains every package scopes exposed by this flake.
-
-## List of my package scopes found in `self.scopedPackages`
-
-| Name | Description |
-| ---- | ----------- |
-$for(attrs/pairs)$
-| `$it.key$` | $it.value.desc/nowrap$ |
-$endfor$
--- a/apps/packages.nix
+++ b/apps/packages.nix
@ -1,15 +0,0 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: let
-  inherit (pkgs.lib) listToAttrs nameValuePair;
-
-  buildApp = attrs: (pkgs.callPackage ./buildApp.nix ({} // inputs // attrs));
-  callPackage = file: pkgs.callPackage file ({inherit buildApp;} // inputs);
-in
-  listToAttrs (map (x: nameValuePair x (callPackage ./${x})) [
-    "extract-subs"
-    "gen-docs"
-    "update-sources"
-  ])
--- a/apps/update-sources/.envrc
+++ b/apps/update-sources/.envrc
@ -1,2 +0,0 @@
-use flake $FLAKE#node
-npm ci
--- a/apps/update-sources/default.nix
+++ b/apps/update-sources/default.nix
@ -1,26 +0,0 @@
-{
-  buildApp,
-  callPackage,
-  go,
-  nix-update,
-  nodejs_latest,
-  prefetch-npm-deps,
-  ...
-}:
-buildApp {
-  src = ./.;
-  npmDepsHash = "sha256-k4m8fSF0zOznebbH87p8IPP2SzRR9siVFYBU5Cfs2T0=";
-
-  runtimeInputs = [
-    go
-    nix-update
-    nodejs_latest
-    prefetch-npm-deps
-    (callPackage ../../modules/docker/updateImage.nix {})
-  ];
-
-  meta.description = ''
-    Updates all derivation sources in this repository and
-    generates a commit message for the changes made.
-  '';
-}
--- a/apps/update-sources/eslint.config.ts
+++ b/apps/update-sources/eslint.config.ts
@ -1,3 +0,0 @@
-import eslintConf from 'eslint-conf';
-
-export default eslintConf;
--- a/apps/update-sources/package-lock.json
+++ b/apps/update-sources/package-lock.json
--- a/apps/update-sources/package.json
+++ b/apps/update-sources/package.json
@ -1,18 +0,0 @@
-{
-    "name": "update-sources",
-    "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-conf": "file:../config",
-        "@types/node": "22.10.7",
-        "esbuild": "0.24.2",
-        "eslint": "9.18.0",
-        "jiti": "2.4.2",
-        "pkg-types": "1.3.1",
-        "typescript": "5.7.3"
-    }
-}
--- a/apps/update-sources/src/app.ts
+++ b/apps/update-sources/src/app.ts
@ -1,175 +0,0 @@
-import { spawnSync } from 'node:child_process';
-import { writeFileSync } from 'node:fs';
-
-import { parseArgs } from './lib';
-
-import { updateDocker } from './docker';
-import { updateFirefoxAddons } from '././firefox';
-import { updateFlakeInputs } from './flake';
-import updateNodeModules from './node-modules';
-
-import {
-    runNixUpdate,
-    updateCaddyPlugins,
-    updateCustomPackage,
-    updateVuetorrent,
-} from './misc';
-
-
-/* Constants */
-const FLAKE = process.env.FLAKE;
-
-if (!FLAKE) {
-    console.error('Env var FLAKE not found');
-    process.exit(1);
-}
-
-const args = parseArgs();
-
-const main = async() => {
-    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['c'] || args['custom-sidebar']) {
-        console.log(updateCustomPackage(
-            'scopedPackages.x86_64-linux.lovelace-components.custom-sidebar',
-        ));
-    }
-
-    if (args['m'] || args['material-rounded-theme']) {
-        console.log(updateCustomPackage(
-            'scopedPackages.x86_64-linux.lovelace-components.material-rounded-theme',
-        ));
-    }
-
-    if (args['s'] || args['some-sass-language-server']) {
-        console.log(updateCustomPackage('some-sass-language-server'));
-    }
-
-    if (args['n'] || args['node_modules']) {
-        console.log(await updateNodeModules());
-    }
-
-    if (args['h'] || args['homepage']) {
-        console.log(runNixUpdate('homepage'));
-    }
-
-    if (args['cp'] || args['caddy-plugins']) {
-        console.log(updateCaddyPlugins());
-    }
-
-    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 nodeModulesOutput = await updateNodeModules();
-
-        console.log(nodeModulesOutput);
-
-
-        const vuetorrentOutput = updateVuetorrent();
-
-        console.log(vuetorrentOutput);
-
-
-        const caddyPluginsOutput = updateCaddyPlugins();
-
-        console.log(caddyPluginsOutput);
-
-
-        // This doesn't need to be added to commit msgs
-        console.log(updateCustomPackage(
-            'scopedPackages.x86_64-linux.lovelace-components.custom-sidebar',
-        ));
-        console.log(updateCustomPackage(
-            'scopedPackages.x86_64-linux.lovelace-components.material-rounded-theme',
-        ));
-        console.log(updateCustomPackage('some-sass-language-server'));
-
-        // nix-update executions
-        let nixUpdateOutputs = '';
-
-        const updatePackage = (pkg: string): void => {
-            const execution = runNixUpdate(pkg);
-
-            nixUpdateOutputs += execution.stdout;
-            console.log(execution.stderr);
-            console.log(execution.stdout);
-        };
-
-        updatePackage('homepage');
-
-
-        spawnSync('nixFastBuild', [], {
-            shell: true,
-            stdio: [process.stdin, process.stdout, process.stderr],
-        });
-
-        const indentOutput = (output: string): string => {
-            return `    ${output.split('\n').join('\n    ')}`;
-        };
-
-        const output = [
-            'chore: update sources\n\n',
-        ];
-
-        if (flakeOutput.length > 5) {
-            output.push(`Flake Inputs:\n${indentOutput(flakeOutput)}\n\n`);
-        }
-        if (dockerOutput.length > 5) {
-            output.push(`Docker Images:\n${indentOutput(dockerOutput)}\n`);
-        }
-        if (firefoxOutput.length > 5) {
-            output.push(`Firefox Addons:\n${indentOutput(firefoxOutput)}\n\n`);
-        }
-        if (nodeModulesOutput.length > 5) {
-            output.push(`Node modules:\n${indentOutput(nodeModulesOutput)}\n`);
-        }
-        if (vuetorrentOutput.length > 5) {
-            output.push(`Misc Sources:\n${indentOutput(vuetorrentOutput)}\n\n`);
-        }
-        if (caddyPluginsOutput.length > 5) {
-            output.push(`Caddy Plugins:\n${indentOutput(caddyPluginsOutput)}\n\n`);
-        }
-        if (nixUpdateOutputs.length > 5) {
-            output.push(`nix-update executions:\n${indentOutput(nixUpdateOutputs)}\n`);
-        }
-
-        if (args['f']) {
-            writeFileSync(args['f'] as string, output.join(''));
-        }
-        else {
-            console.log(output.join(''));
-        }
-    }
-
-    spawnSync('alejandra', ['-q', FLAKE], { shell: true });
-};
-
-main();
--- a/apps/update-sources/src/docker.ts
+++ b/apps/update-sources/src/docker.ts
@ -1,33 +0,0 @@
-import { readdirSync } from 'node:fs';
-import { spawnSync } from 'node:child_process';
-
-
-/* Constants */
-const FLAKE = process.env.FLAKE;
-
-const updateImages = (imagePath: string): string | undefined => {
-    console.log(`Updating ${imagePath.split('/').at(-1)} images`);
-
-    const out = spawnSync('updateImages', [imagePath], { shell: true }).stdout.toString();
-
-    if (!out.startsWith('# Locked')) {
-        return out;
-    }
-};
-
-export const updateDocker = () => {
-    let updates = '';
-
-    updates += updateImages(`${FLAKE}/configurations/nos/modules/jellyfin`) ?? '';
-    updates += updateImages(`${FLAKE}/configurations/homie/modules/home-assistant/netdaemon`) ?? '';
-
-    const DIR = `${FLAKE}/configurations/nos/modules/docker`;
-
-    readdirSync(DIR, { withFileTypes: true, recursive: true }).forEach((path) => {
-        if (path.name === 'compose.nix') {
-            updates += updateImages(path.parentPath) ?? '';
-        }
-    });
-
-    return updates;
-};
--- a/apps/update-sources/src/firefox.ts
+++ b/apps/update-sources/src/firefox.ts
@ -1,61 +0,0 @@
-import { spawnSync } from 'node:child_process';
-import { readFileSync } from 'node:fs';
-
-
-/* Constants */
-const FLAKE = process.env.FLAKE;
-
-export const updateFirefoxAddons = () => {
-    console.log('Updating firefox addons using mozilla-addons-to-nix');
-
-    const DIR = `${FLAKE}/scopedPackages/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',
-        '.#scopedPackages.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-sources/src/flake.ts
+++ b/apps/update-sources/src/flake.ts
@ -1,45 +0,0 @@
-import { spawnSync } from 'node:child_process';
-
-
-/* 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" |& grep -v "unpacking"',
-        [],
-        { shell: true },
-    ).stdout
-        .toString()
-        // Add an extra blank line between inputs
-        .split('\n•')
-        // Filter out some inputs
-        .filter((input) => ![
-            'systems',
-            'flake-compat',
-            'flake-utils',
-            'flake-parts',
-            'treefmt-nix',
-            'lib-aggregate',
-            'lib-aggregate/nixpkgs-lib',
-            'nix-gaming/umu',
-            'nix-github-actions',
-            'pre-commit-hooks',
-        ].some((inputName) => input.startsWith(` Updated input '${inputName}'`)))
-        .join('\n\n•')
-        // help readability of git revs
-        .split('\n')
-        .map((l) => l
-            .replace(
-                /\/(.{40})\?narHash=sha256[^']*(.*)/,
-                (_, backref1, backref2) => `${backref2} rev: ${backref1}`,
-            )
-            .replace(
-                /\?ref.*&rev=(.{40})[^'&]*(.*)/,
-                (_, backref1, backref2) => `${backref2} rev: ${backref1}`,
-            ))
-        .join('\n');
-
-    return output;
-};
--- a/apps/update-sources/src/lib.ts
+++ b/apps/update-sources/src/lib.ts
@ -1,43 +0,0 @@
-import { spawnSync } from 'node:child_process';
-import { readFileSync, writeFileSync } from 'node:fs';
-
-
-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;
-
-export const replaceInFile = (replace: RegExp, replacement: string, file: string) => {
-    const fileContents = readFileSync(file);
-
-    const replaced = fileContents.toString().replace(replace, replacement);
-
-    writeFileSync(file, replaced);
-};
-
-export const npmRun = (args: string[], workspaceDir: string) => spawnSync(
-    'npm', args, { cwd: workspaceDir },
-).stdout.toString();
--- a/apps/update-sources/src/misc.ts
+++ b/apps/update-sources/src/misc.ts
@ -1,148 +0,0 @@
-import { writeFileSync } from 'node:fs';
-import { spawnSync } from 'node:child_process';
-
-import { parseFetchurl, replaceInFile } from './lib';
-
-
-/* Constants */
-const FLAKE = process.env.FLAKE;
-
-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}/configurations/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}` : '';
-};
-
-
-export const updateCustomPackage = (pkg: string) => spawnSync(
-    `nix run ${FLAKE}#${pkg}.update`,
-    [],
-    { shell: true },
-).stderr.toString();
-
-
-const getAttrVersion = (attr: string): string => spawnSync('nix',
-    ['eval', '--raw', `${FLAKE}#${attr}.version`],
-    { shell: true }).stdout.toString();
-
-export const runNixUpdate = (
-    attr: string,
-    options: string[] = [],
-): { stdout: string, stderr: string } => {
-    const OLD_VERSION = getAttrVersion(attr);
-
-    const execution = spawnSync(
-        `nix-update --flake ${attr} --write-commit-message >(head -n 1 -) > /dev/null`,
-        options,
-        { shell: true, cwd: FLAKE },
-    );
-
-    const NEW_VERSION = getAttrVersion(attr);
-
-    return {
-        stdout: OLD_VERSION !== NEW_VERSION ? execution.stdout.toString() : '',
-        stderr: execution.stderr.toString(),
-    };
-};
-
-
-const genPluginsText = (
-    plugins: Record<string, { url: string, version: string }>,
-) => `# This file was autogenerated. DO NOT EDIT!
-{
-  plugins = {
-${Object.entries(plugins)
-    .map(([key, value]) => `
-    ${key} = {
-      url = "${value.url}";
-      version = "${value.version}";
-    };
-    `)
-    .join('')}
-  };
-
-  hash = "";
-}
-`;
-
-export const updateCaddyPlugins = () => {
-    let updates = '';
-    const dir = `${FLAKE}/configurations/cluster/modules/caddy`;
-
-    // Setup workspace
-    spawnSync(
-        [
-            'rm -rf /tmp/update-caddy',
-            'mkdir -p /tmp/update-caddy',
-            'cd /tmp/update-caddy || exit 1',
-            'go mod init temp',
-        ].join('; '),
-        [],
-        { shell: true, cwd: '/tmp' },
-    );
-
-    const plugins = JSON.parse(spawnSync('nix',
-        ['eval', '-f', `${dir}/plugins.nix`, '--json'],
-        { shell: true }).stdout.toString()).plugins as Record<string, { url: string, version: string }>;
-
-    // Get most recent versions of plugins
-    Object.entries(plugins).forEach(([key, value]) => {
-        const NEW_VERSION = spawnSync([
-            'go mod init temp > /dev/null',
-            `go get ${value.url} > /dev/null`,
-            `grep '${value.url}' go.mod`,
-        ].join('; '), [], { shell: true, cwd: '/tmp/update-caddy' })
-            .stdout
-            .toString()
-            .trim()
-            .replace(' // indirect', '')
-            .split(' ')[1];
-
-        if (plugins[key].version !== NEW_VERSION) {
-            updates += `${key}: ${plugins[key].version} -> ${NEW_VERSION}`;
-            plugins[key].version = NEW_VERSION;
-        }
-    });
-
-    writeFileSync(`${dir}/plugins.nix`, genPluginsText(plugins));
-
-    // Get new hash
-    const caddyPkgAttr = 'nixosConfigurations.thingone.config.services.caddy.package';
-
-    const NEW_HASH = spawnSync(
-        `nix build "$FLAKE#${caddyPkgAttr}" |& sed -n 's/.*got: *//p'`,
-        [],
-        { shell: true },
-    ).stdout.toString().trim();
-
-    replaceInFile(/hash = ".*";/, `hash = "${NEW_HASH}";`, `${dir}/plugins.nix`);
-
-    return updates;
-};
--- a/apps/update-sources/src/node-modules.ts
+++ b/apps/update-sources/src/node-modules.ts
@ -1,83 +0,0 @@
-import { readPackageJSON, writePackageJSON } from 'pkg-types';
-import { existsSync, readdirSync } from 'node:fs';
-import { spawnSync } from 'node:child_process';
-
-import { replaceInFile, npmRun } from './lib';
-
-
-/* Constants */
-const FLAKE = process.env.FLAKE as string;
-
-
-const updatePackageJson = async(workspaceDir: string, updates: object) => {
-    const currentPackageJson = await readPackageJSON(`${workspaceDir}/package.json`);
-
-    const outdated = JSON.parse(npmRun(['outdated', '--json'], workspaceDir));
-
-    const updateDeps = (deps: string) => {
-        Object.keys(currentPackageJson[deps]).forEach((dep) => {
-            const versions = outdated[dep];
-            const current = versions?.wanted || versions?.current;
-
-            if (!current) {
-                return;
-            }
-
-            if (current !== versions.latest) {
-                updates[dep] = `${current} -> ${versions.latest}`;
-            }
-
-            currentPackageJson[deps][dep] = versions.latest;
-        });
-    };
-
-    if (currentPackageJson.dependencies) {
-        updateDeps('dependencies');
-    }
-
-    if (currentPackageJson.devDependencies) {
-        updateDeps('devDependencies');
-    }
-
-    await writePackageJSON(`${workspaceDir}/package.json`, currentPackageJson);
-};
-
-
-const prefetchNpmDeps = (workspaceDir: string): string => {
-    npmRun(['update', '--package-lock-only'], workspaceDir);
-
-    return spawnSync(
-        'prefetch-npm-deps',
-        [`${workspaceDir}/package-lock.json`],
-    ).stdout.toString().replace('\n', '');
-};
-
-
-export default async() => {
-    const updates = {};
-
-    const packages = readdirSync(FLAKE, { withFileTypes: true, recursive: true });
-
-    for (const path of packages) {
-        if (
-            path.name === 'package.json' &&
-            !path.parentPath.includes('node_modules')
-        ) {
-            await updatePackageJson(path.parentPath, updates);
-
-            if (existsSync(`${path.parentPath}/default.nix`)) {
-                const hash = prefetchNpmDeps(path.parentPath);
-
-                replaceInFile(
-                    /npmDepsHash = ".*";/,
-                    `npmDepsHash = "${hash}";`,
-                    `${path.parentPath}/default.nix`,
-                );
-            }
-        }
-    }
-
-    return Object.entries(updates)
-        .map(([key, dep]) => `${key}: ${dep}`)
-        .join('\n');
-};
--- a/apps/update-sources/tsconfig.json
+++ b/apps/update-sources/tsconfig.json
@ -1,10 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/tsconfig",
-  "extends": "../config/tsconfig.base.json",
-  "includes": [
-    "*.ts",
-    "**/*.ts",
-    "*.js",
-    "**/*.js"
-  ]
-}
--- a/common/default.nix
+++ b/common/default.nix
@ -0,0 +1,126 @@
+{
+  config,
+  home-manager,
+  lib,
+  nh,
+  nix-melt,
+  nur,
+  nurl,
+  pkgs,
+  ...
+} @ inputs: {
+  imports = [
+    ./vars
+
+    ./modules
+    ./pkgs
+
+    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.cleanOnBoot = true;
+
+  nix = {
+    # Allow deleting store files with '.' in the name
+    package = pkgs.nix.overrideAttrs (o: {
+      patches =
+        (o.patches or [])
+        ++ [
+          ./overlays/nix/patch
+        ];
+    });
+    # Edit nix.conf
+    settings = {
+      # Store
+      keep-outputs = true;
+      keep-derivations = true;
+      auto-optimise-store = true;
+
+      # Commands
+      experimental-features = ["nix-command" "flakes"];
+      http-connections = 0; # unlimited for local cache
+      warn-dirty = false;
+      show-trace = true;
+
+      # remote building
+      trusted-users = ["matt" "nixremote"];
+    };
+  };
+
+  nh = {
+    enable = true;
+    # weekly cleanup
+    clean = {
+      enable = true;
+      extraArgs = "--keep-since 30d";
+    };
+  };
+
+  services = {
+    fwupd.enable = true;
+
+    xserver.xkb = {
+      layout = "ca";
+      variant = "multix";
+    };
+  };
+
+  home-manager = let
+    inherit (config.vars) mainUser;
+    mainUserConf = config.home-manager.users.${mainUser};
+
+    default = {
+      imports = [
+        # Make the vars be the same on Nix and HM
+        {
+          options.vars = lib.mkOption {
+            type = lib.types.attrs;
+            readOnly = true;
+            default = config.vars;
+          };
+        }
+
+        nur.hmModules.nur
+
+        ./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
+        ]);
+    };
+  in {
+    users = {
+      root =
+        default
+        // {
+          home.stateVersion = mainUserConf.home.stateVersion;
+        };
+      greeter =
+        lib.mkIf (config.services.greetd.enable)
+        (default
+          // {
+            home.stateVersion = mainUserConf.home.stateVersion;
+          });
+
+      ${mainUser} = default;
+    };
+  };
+}
--- a/homeManagerModules/shell/config/bashrc
+++ b/homeManagerModules/shell/config/bashrc
--- a/homeManagerModules/shell/config/colorgrid.sh
+++ b/homeManagerModules/shell/config/colorgrid.sh
--- a/homeManagerModules/shell/config/dracula/fzf.sh
+++ b/homeManagerModules/shell/config/dracula/fzf.sh
--- a/homeManagerModules/shell/config/dracula/less.sh
+++ b/homeManagerModules/shell/config/dracula/less.sh
--- a/common/home/bash/default.nix
+++ b/common/home/bash/default.nix
@ -0,0 +1,145 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) concatStrings fileContents;
+  inherit (config.vars) promptColors;
+in {
+  imports = [./programs.nix];
+
+  programs = {
+    starship = {
+      enable = true;
+      enableBashIntegration = true;
+
+      settings = {
+        format = concatStrings [
+          "╭╴"
+          "[](fg:${promptColors.firstColor})"
+          "[   ](bg:${promptColors.firstColor} fg:#090c0c)"
+          "[](bg:${promptColors.secondColor} fg:${promptColors.firstColor})"
+          "$username$hostname"
+          "[](fg:${promptColors.secondColor} bg:${promptColors.thirdColor})"
+          "$directory"
+          "[](fg:${promptColors.thirdColor} bg:${promptColors.fourthColor})"
+          "$git_branch"
+          "[](fg:${promptColors.fourthColor})$shlvl$nix_shell"
+          "\n╰╴$character"
+        ];
+
+        username = {
+          show_always = true;
+          style_user = "fg:${promptColors.textColor} bg:${promptColors.secondColor}";
+          style_root = "fg:red bg:${promptColors.secondColor} blink";
+          format = "[ $user]($style)";
+        };
+
+        hostname = {
+          ssh_only = false;
+          style = "fg:${promptColors.textColor} bg:${promptColors.secondColor}";
+          format = "[@$hostname ]($style)";
+        };
+
+        directory = {
+          style = "fg:${promptColors.firstColor} bg:${promptColors.thirdColor}";
+          format = "[ $path ]($style)";
+          truncate_to_repo = false;
+          truncation_length = 0;
+
+          substitutions = {
+            "Documents" = "󰈙 ";
+            "Downloads" = " ";
+            "Music" = " ";
+            "Pictures" = " ";
+          };
+        };
+
+        git_branch = {
+          style = "fg:${promptColors.secondColor} bg:${promptColors.fourthColor}";
+          symbol = "";
+          format = "[ $symbol $branch ]($style)";
+        };
+
+        shlvl = {
+          disabled = false;
+          repeat = true;
+          symbol = "󰔳 ";
+          format = "[ $symbol]($style)";
+          threshold = 1;
+        };
+
+        nix_shell = {
+          symbol = "❄️ ";
+          format = "[ $symbol]($style)";
+        };
+
+        character = {
+          success_symbol = "[\\$](bold green)";
+          error_symbol = "[\\$](bold red)";
+        };
+      };
+    };
+
+    bash = {
+      enable = true;
+      enableCompletion = true;
+
+      historyFile = "\$HOME/.cache/.bash_history";
+      historyFileSize = 100000; # default
+      historySize = 10000; # default
+      historyControl = [
+        "erasedups"
+        "ignorespace"
+      ];
+      historyIgnore = [
+        "ls"
+        "exit"
+        "logout"
+      ];
+
+      shellOptions = [
+        "histappend"
+        "checkwinsize"
+        "extglob"
+        "globstar"
+        "checkjobs"
+        "autocd"
+        "cdspell"
+        "dirspell"
+        "dotglob"
+      ];
+
+      shellAliases = {
+        # Add whitespace after, to allow
+        # sudo to inherit all other aliases
+        sudo = "sudo ";
+
+        ls = "ls -lah --color=auto";
+        tree = "tree -a -I node_modules";
+        cp = "cp -r";
+      };
+
+      #profileExtra = ''
+      #'';
+      bashrcExtra =
+        /*
+        bash
+        */
+        ''
+          # Check if shell is interactive
+          [[ $- == *i* ]] || return 0
+
+          ${fileContents ./config/dracula/less.sh}
+          ${fileContents ./config/dracula/fzf.sh}
+
+          ${fileContents ./config/colorgrid.sh}
+          ${fileContents ./config/bashrc}
+        '';
+      #initExtra = ''
+      #'';
+      #logoutExtra = ''
+      #'';
+    };
+  };
+}
--- a/homeManagerModules/shell/misc/default.nix
+++ b/homeManagerModules/shell/misc/default.nix
@ -1,14 +1,9 @@
-self: {
-  config,
-  lib,
+{
  pkgs,
+  config,
  ...
-}: let
-  inherit (lib) attrValues mkIf;
-
-  cfg = config.programs.bash;
-in {
-  config.programs = mkIf cfg.enable {
+}: {
+  programs = {
    fzf = {
      enable = true;
      enableBashIntegration = true;
@ -46,16 +41,18 @@ in {

    bat = {
      enable = true;
-
-      config.theme = "dracula-bat";
-      themes.dracula-bat.src = self.scopedPackages.${pkgs.system}.dracula.bat;
-
-      extraPackages = attrValues {
-        inherit (pkgs.bat-extras) batman;
+      config = {
+        theme = "dracula-bat";
      };
+      themes = {
+        dracula-bat = {
+          src = pkgs.dracula-theme;
+          file = "bat";
+        };
+      };
+      extraPackages = with pkgs.bat-extras; [
+        batman
+      ];
    };
  };
-
-  # For accurate stack trace
-  _file = ./default.nix;
 }
--- a/common/home/default.nix
+++ b/common/home/default.nix
@ -0,0 +1,11 @@
+{...}: {
+  imports = [
+    ./bash
+    ./direnv
+    ./git
+    ./neovim
+    ./nix-index
+    ./tmux
+    ./packages.nix
+  ];
+}
--- a/common/home/direnv/default.nix
+++ b/common/home/direnv/default.nix
@ -0,0 +1,10 @@
+{pkgs, ...}: {
+  programs.direnv = {
+    enable = true;
+    enableBashIntegration = true;
+    nix-direnv = {
+      enable = true;
+      package = pkgs.nix-direnv-flakes;
+    };
+  };
+}
--- a/common/home/git/default.nix
+++ b/common/home/git/default.nix
@ -0,0 +1,82 @@
+{pkgs, ...}: {
+  programs = {
+    git = {
+      enable = true;
+      lfs.enable = true;
+
+      includes = [
+        {path = "${pkgs.dracula-theme}/git-colors";}
+
+        {
+          condition = "hasconfig:remote.*.url:git@github.com:*/**";
+          contents = {
+            user = {
+              email = "matt@nelim.org";
+              name = "matt1432";
+            };
+          };
+        }
+
+        {
+          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";
+            };
+          };
+        }
+      ];
+
+      delta = {
+        enable = true;
+        options = {
+          side-by-side = true;
+          line-numbers-zero-style = "#E6EDF3"; #BD93F9";
+        };
+      };
+
+      extraConfig = {
+        diff.sopsdiffer.textconv = "sops --config /dev/null -d";
+
+        # https://github.com/dandavison/delta/issues/630#issuecomment-860046929
+        pager = let
+          cmd = "LESS='LRc --mouse' ${pkgs.delta}/bin/delta";
+        in {
+          diff = cmd;
+          show = cmd;
+          stash = cmd;
+          log = cmd;
+          reflog = cmd;
+        };
+      };
+    };
+  };
+
+  home.packages = with pkgs; [
+    (writeShellApplication {
+      name = "chore";
+      runtimeInputs = [git];
+
+      text = ''
+        DIR=''${1:-"$FLAKE"}
+
+        cd "$DIR" || exit 1
+
+        git add flake.lock
+        git commit -m 'chore: update flake.lock'
+        git push
+      '';
+    })
+  ];
+}
--- a/common/home/neovim/base.lua
+++ b/common/home/neovim/base.lua
@ -0,0 +1,2 @@
+-- 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
@ -0,0 +1,34 @@
+" 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
@ -0,0 +1,340 @@
+{
+  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;
+in {
+  home = optionalAttrs neovimIde {
+    packages = with pkgs; [
+      gradle
+      maven
+      alejandra
+    ];
+  };
+
+  xdg.dataFile = optionalAttrs neovimIde {
+    ".gradle/gradle.properties".text = ''
+      org.gradle.java.home = ${javaSdk}
+    '';
+  };
+
+  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;
+
+      extraPackages = with pkgs; ([
+          bat
+          gcc
+        ]
+        ++ optionals neovimIde [
+          nodejs_latest
+          nodePackages.npm
+          nodePackages.neovim
+          gradle
+          nil
+        ]);
+
+      extraPython3Packages = ps:
+        optionals neovimIde [
+          ps.pylint
+        ];
+
+      coc = optionalAttrs neovimIde {
+        enable = true;
+        settings = {
+          # General
+          colors.enable = true;
+          coc.preferences.formatOnType = true;
+          diagnostic.checkCurrentLine = true;
+          inlayHint.enable = false;
+
+          # ESLint
+          eslint = {
+            format.enable = true;
+            autoFixOnSave = true;
+          };
+
+          # Stylelint
+          stylelintplus = {
+            enable = true;
+            cssInJs = true;
+            autoFixOnSave = true;
+            autoFixOnFormat = true;
+          };
+          css.validate = false;
+          less.validate = false;
+          scss.validate = false;
+          wxss.validate = false;
+
+          # 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;
+          };
+
+          languageserver = {
+            # Nix
+            nix = {
+              command = "nil";
+              filetypes = ["nix"];
+              rootPatterns = ["flake.nix"];
+              settings = {
+                nil = {
+                  formatting.command = ["alejandra"];
+
+                  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
+            ]);
+          }
+        ]);
+    };
+  };
+}
--- a/common/home/neovim/plugins/autopairs.lua
+++ b/common/home/neovim/plugins/autopairs.lua
@ -0,0 +1,16 @@
+-- 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/dracula.vim
+++ b/common/home/neovim/plugins/dracula.vim
@ -0,0 +1,10 @@
+" 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
@ -0,0 +1,13 @@
+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/indent.lua
+++ b/common/home/neovim/plugins/indent.lua
@ -0,0 +1,26 @@
+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
@ -0,0 +1,9 @@
+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
@ -0,0 +1,23 @@
+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
@ -0,0 +1,38 @@
+-- Override netrw
+vim.g.loaded_netrw = 0
+vim.g.loaded_netrwPlugin = 0
+
+require('neo-tree').setup({
+  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 = {},
+    },
+  },
+
+  source_selector = {
+    winbar = true,
+    statusline = false
+  },
+
+  follow_current_file = {
+    enabled = true,
+    leave_dirs_open = true,
+  }
+})
--- a/common/home/neovim/plugins/neotree.vim
+++ b/common/home/neovim/plugins/neotree.vim
@ -0,0 +1,11 @@
+" 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
@ -0,0 +1,13 @@
+" 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
@ -0,0 +1,21 @@
+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/nix-index/default.nix
+++ b/common/home/nix-index/default.nix
@ -0,0 +1,11 @@
+{nix-index-db, ...}: {
+  imports = [nix-index-db.hmModules.nix-index];
+
+  programs = {
+    nix-index-database.comma.enable = true;
+    nix-index = {
+      enable = true;
+      enableBashIntegration = true;
+    };
+  };
+}
--- a/common/home/packages.nix
+++ b/common/home/packages.nix
@ -0,0 +1,30 @@
+{
+  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
@ -0,0 +1,31 @@
+{pkgs, ...}: {
+  programs = {
+    # Make sure we have color support
+    bash.shellAliases.tmux = "tmux -2";
+
+    tmux = {
+      enable = true;
+      mouse = true;
+      keyMode = "vi";
+      terminal = "tmux-256color";
+      newSession = true;
+      historyLimit = 30000;
+
+      plugins = with pkgs.tmuxPlugins; [dracula];
+
+      extraConfig =
+        /*
+        bash
+        */
+        ''
+          bind-key -n Home send Escape "OH"
+          bind-key -n End send Escape "OF"
+          bind -T root WheelUpPane   if-shell -F -t = "#{alternate_on}" "send-keys -M" "select-pane -t =; copy-mode -e; send-keys -M"
+          bind -T root WheelDownPane if-shell -F -t = "#{alternate_on}" "send-keys -M" "select-pane -t =; send-keys -M"
+
+          set -ga terminal-overrides ',xterm*:smcup@:rmcup@'
+          set -ga terminal-overrides ",*256col*:Tc"
+        '';
+    };
+  };
+}
--- a/common/home/trash-d/default.nix
+++ b/common/home/trash-d/default.nix
@ -0,0 +1,7 @@
+{pkgs, ...} @ inputs: let
+  trash = pkgs.callPackage ./trash-d.nix inputs;
+in {
+  home.packages = [trash];
+
+  programs.bash.shellAliases.rm = "trash";
+}
--- a/common/home/trash-d/trash-d.nix
+++ b/common/home/trash-d/trash-d.nix
@ -0,0 +1,31 @@
+{
+  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
@ -0,0 +1,51 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  environment.systemPackages = with pkgs; [
+    (writeShellApplication {
+      name = "rebuild-no-cache";
+      runtimeInputs = [config.nh.package];
+      text = ''
+        nh os switch -- --option binary-caches "https://cache.nixos.org" "$@"
+      '';
+    })
+  ];
+
+  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"
+      ];
+      trusted-public-keys = [
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+        "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
+        # Nixpkgs-Wayland
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+        "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
+        # Nix-community
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        # Nh
+        "viperml.cachix.org-1:qZhKBMTfmcLL+OG6fj/hzsMEedgKvZVFRRAhq7j8Vh8="
+        # Caddy
+        "caddycf.cachix.org-1:6vbQaeiec/zKv9XfEwi9yWVCe7opbeJMu6w81UEXugY="
+        # Personal config cache
+        "cache.nelim.org:JmFqkUdH11EA9EZOFAGVHuRYp7EbsdJDHvTQzG2pPyY="
+      ];
+    };
+  };
+}
--- a/common/modules/default.nix
+++ b/common/modules/default.nix
@ -0,0 +1,8 @@
+{...}: {
+  imports = [
+    ./cachix.nix
+    ./locale.nix
+    ./locate.nix
+    ./global.nix
+  ];
+}
--- a/common/modules/global.nix
+++ b/common/modules/global.nix
@ -0,0 +1,23 @@
+{
+  config,
+  lib,
+  nixpkgs,
+  ...
+}: let
+  inherit (config.sops.secrets) access-token;
+  inherit (lib) hasAttr optionalString;
+in {
+  # Minimize dowloads of indirect nixpkgs flakes
+  nix = {
+    registry.nixpkgs.flake = nixpkgs;
+    nixPath = ["nixpkgs=${nixpkgs}"];
+
+    extraOptions =
+      optionalString (hasAttr "sops" config)
+      "!include ${access-token.path}";
+  };
+
+  # Global hm settings
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+}
--- a/common/modules/locale.nix
+++ b/common/modules/locale.nix
@ -0,0 +1,39 @@
+{pkgs, ...}: {
+  fonts = {
+    fontconfig = {
+      enable = true;
+      defaultFonts = {
+        emoji = ["Noto Color Emoji"];
+        monospace = ["Noto Nerd Font"];
+        sansSerif = ["Noto Nerd Font"];
+        serif = ["Noto Nerd Font"];
+      };
+    };
+
+    packages = with pkgs; [
+      (nerdfonts.override {
+        fonts = [
+          "JetBrainsMono"
+          "Go-Mono"
+          "Iosevka"
+          "NerdFontsSymbolsOnly"
+          "SpaceMono"
+          "Ubuntu"
+          "Noto"
+        ];
+      })
+      noto-fonts
+      noto-fonts-cjk
+      noto-fonts-emoji
+      liberation_ttf
+      font-awesome
+      meslo-lgs-nf
+      jetbrains-mono
+      ubuntu_font_family
+    ];
+  };
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_CA.UTF-8";
+  console.useXkbConfig = true;
+}
--- a/common/modules/locate.nix
+++ b/common/modules/locate.nix
@ -0,0 +1,79 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (config.vars) mainUser;
+  cfg = config.services.locate;
+
+  locateGroup = lib.getName cfg.package.name;
+
+  locate = "${cfg.package}/bin/locate";
+  updatedb = "${cfg.package}/bin/updatedb";
+
+  database = "/var/lib/locate/locatedb";
+  pruneFS = builtins.concatStringsSep " " cfg.pruneFS;
+  pruneNames = builtins.concatStringsSep " " cfg.pruneNames;
+  prunePaths = builtins.concatStringsSep " " cfg.prunePaths;
+
+  updatedbBin = ''
+    ${updatedb} -o ${database} --prunefs "${pruneFS}" \
+      --prunepaths "${prunePaths}" --prunenames "${pruneNames}"
+  '';
+in {
+  users.users.${mainUser}.extraGroups = [
+    locateGroup
+  ];
+
+  # TODO: add timer
+  systemd.services.locate = {
+    wantedBy = ["default.target"];
+    serviceConfig = {
+      User = mainUser;
+      Group = locateGroup;
+      StateDirectory = "locate";
+      StateDirectoryMode = "0770";
+      ExecStart = updatedbBin;
+    };
+  };
+
+  home-manager.users.${mainUser}.programs.bash.shellAliases = {
+    locate = "${pkgs.writeShellScriptBin "lct" ''
+      exec ${locate} -d ${database} "$@" 2> >(grep -v "/var/cache/locatedb")
+    ''}/bin/lct";
+
+    updatedb = updatedbBin;
+  };
+
+  services.locate = {
+    enable = true;
+    package = pkgs.mlocate;
+    localuser = null;
+    interval = "never";
+
+    prunePaths = [
+      "/var/lib/flatpak"
+
+      # Defaults
+      "/tmp"
+      "/var/tmp"
+      "/var/cache"
+      "/var/lock"
+      "/var/run"
+      "/var/spool"
+      "/nix/var/log/nix"
+    ];
+
+    pruneNames = [
+      "node_modules"
+
+      # Defaults
+      ".bzr"
+      ".cache"
+      ".git"
+      ".hg"
+      ".svn"
+    ];
+  };
+}
--- a/configurations/android/nix-on-droid.nix
+++ b/configurations/android/nix-on-droid.nix
@ -1,19 +1,14 @@
 {
  config,
-  self,
+  lib,
+  nur,
  ...
 }: {
  imports = [
-    self.nixosModules.base-droid
-    {
-      roles.base = {
-        enable = true;
-        user = "nix-on-droid";
-      };
-    }
-
-    self.nixosModules.tmux
-    {programs.tmux.enableCustomConf = true;}
+    ./vars
+    ./pkgs
+    ./modules/global.nix
+    nur.nixosModules.nur
  ];

  nix = {
@ -28,32 +23,35 @@
    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="
    ];
  };

  # Global hm settings
  home-manager.config = {
    imports = [
-      self.homeManagerModules.neovim
+      # Make the vars be the same on Nix and HM
      {
-        programs.neovim = {
-          enable = true;
-          user = "nix-on-droid";
-
-          ideConfig = {
-            enableJava = false;
-            enableNix = false;
-            enablePython = false;
-          };
+        options.vars = lib.mkOption {
+          type = lib.types.attrs;
+          readOnly = true;
+          default = config.vars;
        };
      }

-      self.homeManagerModules.shell
-      {programs.bash.enable = true;}
+      nur.hmModules.nur
+
+      ./home
+      ./pkgs

      {
        programs.bash.sessionVariables = {
@ -75,9 +73,6 @@
          # Experimenting server
          servivi = "ssh -t matt@100.64.0.7 'tmux -2u new -At phone'";

-          # Home-assistant
-          homie = "ssh -t matt@100.64.0.10 'tmux -2u new -At phone'";
-
          # Cluster nodes
          thingone = "ssh -t matt@100.64.0.8 'tmux -2u new -At phone'";
          thingtwo = "ssh -t matt@100.64.0.9 'tmux -2u new -At phone'";
--- a/common/overlays/default.nix
+++ b/common/overlays/default.nix
@ -0,0 +1,5 @@
+{nixpkgs-wayland, ...} @ inputs: [
+  (import ./dracula-theme inputs)
+
+  nixpkgs-wayland.overlay
+]
--- a/common/overlays/dracula-theme/default.nix
+++ b/common/overlays/dracula-theme/default.nix
@ -0,0 +1,46 @@
+{
+  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
@ -0,0 +1,23 @@
+{
+  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/plymouth.nix
+++ b/common/overlays/dracula-theme/plymouth.nix
@ -1,14 +1,13 @@
 {
  stdenv,
-  dracula-plymouth-src,
-  mkVersion,
+  plymouth-theme-src,
  ...
 }:
 stdenv.mkDerivation {
-  pname = "dracula-plymouth";
-  version = mkVersion dracula-plymouth-src;
+  name = "dracula-plymouth";
+  version = plymouth-theme-src.shortRev;

-  src = dracula-plymouth-src;
+  src = plymouth-theme-src;

  installPhase = ''
    chmod 777 ./dracula
--- a/common/overlays/dracula-theme/wallpaper.nix
+++ b/common/overlays/dracula-theme/wallpaper.nix
@ -0,0 +1,4 @@
+{
+  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
@ -0,0 +1,12 @@
+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/pkgs/coloryou/LICENSE
+++ b/common/pkgs/coloryou/LICENSE
--- a/common/pkgs/coloryou/coloryou.py
+++ b/common/pkgs/coloryou/coloryou.py
@ -0,0 +1,45 @@
+#!/usr/bin/env python
+
+"""
+The original script:
+https://github.com/dharmx/vile/blob/7d486c128c7e553912673755f97b118aaab0193d/src/shell/playerctl.py#L2
+"""
+
+import argparse
+import json
+from material_color_utilities_python import themeFromImage, hexFromArgb, Image
+
+def range_type(value_string):
+    value = int(value_string)
+    if value not in range(0, 101):
+        raise argparse.ArgumentTypeError("%s is out of range, choose in [0-100]" % value)
+    return value
+
+parser = argparse.ArgumentParser(
+                    prog='coloryou',
+                    description='This program extract Material You colors from an image. It returns them as a JSON object for scripting.')
+
+parser.add_argument("image_path", help="A full path to your image", type=str)
+parser.add_argument('-i', '--image', dest='image', default=40, type=range_type, metavar='i', choices=range(0,101), help="Value should be within [0, 100] (default: %(default)s). Set the tone for the main image accent.")
+
+parser.add_argument('-b', '--button', dest='button', default=90, type=range_type, metavar='i', choices=range(0,101), help="Value should be within [0, 100] (default: %(default)s). Set the tone for the button accent.")
+
+parser.add_argument('-t', '--text', dest='text', default=10, type=range_type, metavar='i', choices=range(0,101), help="Value should be within [0, 100] (default: %(default)s). Set the tone for the button text accent.")
+
+parser.add_argument('-o', '--hover', dest='hover', default=80, type=range_type, metavar='i', choices=range(0,101), help="Value should be within [0, 100] (default: %(default)s). Set the tone for the hovering effect accent.")
+args = parser.parse_args()
+
+
+img = Image.open(args.image_path)
+basewidth = 64
+wpercent = (basewidth/float(img.size[0]))
+hsize = int((float(img.size[1])*float(wpercent)))
+img = img.resize((basewidth,hsize),Image.Resampling.LANCZOS)
+
+theme = themeFromImage(img).get("palettes").get("primary")
+parsed_colors = {"imageAccent":  hexFromArgb(theme.tone(args.image)),
+                 "buttonAccent": hexFromArgb(theme.tone(args.button)),
+                 "buttonText":   hexFromArgb(theme.tone(args.text)),
+                 "hoverAccent":  hexFromArgb(theme.tone(args.hover))}
+
+print(json.dumps(parsed_colors))
--- a/common/pkgs/coloryou/default.nix
+++ b/common/pkgs/coloryou/default.nix
@ -0,0 +1,19 @@
+{python3Packages, ...}:
+python3Packages.buildPythonPackage {
+  pname = "coloryou";
+  version = "0.0.1";
+
+  src = ./.;
+
+  propagatedBuildInputs = with python3Packages; [utils material-color-utilities];
+
+  postInstall = ''
+    mv -v $out/bin/coloryou.py $out/bin/coloryou
+  '';
+
+  meta = {
+    description = ''
+      Get Material You colors from an image.
+    '';
+  };
+}
--- a/common/pkgs/coloryou/requirements.txt
+++ b/common/pkgs/coloryou/requirements.txt
@ -0,0 +1,2 @@
+material-color-utilities
+utils
--- a/common/pkgs/coloryou/setup.py
+++ b/common/pkgs/coloryou/setup.py
@ -0,0 +1,7 @@
+from distutils.core import setup
+
+setup(
+    name='coloryou',
+    version='0.0.1',
+    scripts=['coloryou.py',],
+)
--- a/common/pkgs/coloryou/shell.nix
+++ b/common/pkgs/coloryou/shell.nix
@ -0,0 +1,7 @@
+with import <nixpkgs> {};
+with pkgs.python311Packages;
+  buildPythonPackage {
+    name = "coloryou";
+    src = ./.;
+    propagatedBuildInputs = [material-color-utilities utils];
+  }
--- a/common/pkgs/curseforge-server-downloader/default.nix
+++ b/common/pkgs/curseforge-server-downloader/default.nix
@ -0,0 +1,13 @@
+{
+  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
@ -0,0 +1,26 @@
+{
+  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
@ -0,0 +1,41 @@
+{
+  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/pokemon-colorscripts/default.nix
+++ b/common/pkgs/pokemon-colorscripts/default.nix
@ -1,13 +1,12 @@
 {
-  mkVersion,
  stdenv,
  python3Packages,
  pokemon-colorscripts-src,
  ...
 }:
 stdenv.mkDerivation {
-  pname = "pokemon-colorscripts";
-  version = mkVersion pokemon-colorscripts-src;
+  name = "pokemon-colorscripts";
+  version = pokemon-colorscripts-src.shortRev;

  src = pokemon-colorscripts-src;

@ -25,9 +24,4 @@ stdenv.mkDerivation {

    ln -s $out/pokemon-colorscripts/pokemon-colorscripts.py $out/bin/pokemon-colorscripts
  '';
-
-  meta = {
-    description = "A script to print out images of pokemon to the terminal.";
-    homepage = "https://gitlab.com/phoneybadger/pokemon-colorscripts";
-  };
 }
--- a/common/pkgs/rars-flatlaf/default.nix
+++ b/common/pkgs/rars-flatlaf/default.nix
@ -0,0 +1,110 @@
+{
+  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/Show more
+++ b/Show more