chore: add TODOs and small refactor

common/default.nix

@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   home-manager,
   nh,
   nix-melt,
@@ -58,6 +57,9 @@
   };
 
   home-manager.users = let
+    mainUser = config.vars.user;
+    mainUserConf = config.home-manager.users.${mainUser};
+
     default = {
       imports = [
         # Make the vars be the same on Nix and HM
@@ -79,11 +81,15 @@
         ++ (with config.nur.repos.rycee; [
           mozilla-addons-to-nix
         ]);
-      home.stateVersion = lib.mkDefault "23.05";
     };
   in {
-    root = default;
+    root =
+      default
+      // {
+        home.stateVersion = mainUserConf.home.stateVersion;
+      };
+
     # TODO: make user an array?
-    ${config.vars.user} = default;
+    ${mainUser} = default;
   };
 }

common/home/bash/default.nix

@@ -3,6 +3,7 @@
 
   programs = {
     starship = let
+      # TODO: have different colors depending on host
       textColor = "#e3e5e5";
       firstColor = "#bd93f9";
       secondColor = "#715895";

common/home/neovim/base.vim

@@ -21,6 +21,7 @@ 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/
 

common/home/neovim/default.nix

@@ -3,14 +3,14 @@
   pkgs,
   lib,
   coc-stylelintplus-flake,
-  tree-sitter-hypr-flake,
+  tree-sitter-hyprlang-flake,
   ...
 }:
 with lib; let
   nvimIde = config.vars.neovimIde;
 
   javaSdk = pkgs.temurin-bin-17;
-  nvim-treesitter-hypr = tree-sitter-hypr-flake.packages.${pkgs.system}.default;
+  nvim-treesitter-hyprlang = tree-sitter-hyprlang-flake.packages.${pkgs.system}.default;
   coc-stylelintplus = coc-stylelintplus-flake.packages.${pkgs.system}.default;
 in {
   home = optionalAttrs nvimIde {
@@ -237,7 +237,7 @@ in {
         ++ (with pkgs.vimPlugins; [
           nvim-treesitter-context
           nvim-treesitter-textobjects
-          nvim-treesitter-hypr
+          nvim-treesitter-hyprlang
           {
             type = "viml";
             config = fileContents ./plugins/treesitter.vim;

common/modules/locate.nix

@@ -25,6 +25,7 @@ in {
     locateGroup
   ];
 
+  # TODO: add timer
   systemd.services.locate = {
     wantedBy = ["default.target"];
     serviceConfig = {

common/pkgs/discommit/flake.nix

@@ -1,4 +1,5 @@
 {
+  # TODO: make this into a public github action
   #inputs.main.url = "path:../../../";
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";