refactor: change hosts to devices and separate hm modules from nix modules

common/default.nix

@@ -13,13 +13,14 @@
 }: {
   imports = [
     ./cachix.nix
+    ./overlays
+    ./device-vars.nix
+
     home-manager.nixosModules.default
     nh.nixosModules.default
+
     ./modules/programs.nix
     ./modules/locale.nix
-    ./overlays
-
-    ./hostvars.nix
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -64,14 +65,14 @@
     default = {
       imports = [
         nur.hmModules.nur
-        ./modules/bash
+        ./home/bash
-        ./modules/git.nix
+        ./home/git.nix
-        ./modules/neovim
+        ./home/neovim
-        ./modules/tmux.nix
+        ./home/tmux.nix
 
-        ./hostvars.nix
+        ./device-vars.nix
         ({ osConfig, ... }: {
-          services.hostvars = osConfig.services.hostvars;
+          services.device-vars = osConfig.services.device-vars;
         })
       ];
 

common/device-vars.nix

@@ -1,5 +1,5 @@
 { lib, ... }: {
-  options.services.hostvars = with lib; {
+  options.services.device-vars = with lib; {
     username = mkOption {
       description = ''
         Username that was defined at the initial setup process
@@ -9,7 +9,7 @@
 
     configDir = mkOption {
       description = ''
-        The path to where most of the hosts' configs are in the .nix folder
+        The path to where most of the devices' configs are in the .nix folder
       '';
       type = types.nullOr types.str;
     };

common/home/bash/default.nix

@@ -1,5 +1,3 @@
-# Home-manager module
-
 { config, lib, ... }: {
   imports = [
     ./programs.nix

common/home/bash/programs.nix

@@ -1,5 +1,3 @@
-# Home-manager module
-
 { pkgs, ... }: {
   programs = {
     fzf = {

common/home/git.nix

@@ -1,5 +1,3 @@
-# Home-manager module
-
 { pkgs, ... }: {
   programs = {
 

common/home/neovim/default.nix

@@ -1,5 +1,3 @@
-# Home-manager module
-
 { pkgs, lib, ... }: let
   # installs a vim plugin from git with a given tag / branch
   plugin = owner: repo: rev: hash: pkgs.vimUtils.buildVimPlugin {
@@ -11,7 +9,7 @@
   };
   fileContents = lib.strings.fileContents;
 in {
-  # TODO: make a gradle module and have java in hostvars.nix
+  # TODO: make a gradle module and have java in device-vars.nix
   xdg.dataFile = {
     ".gradle/gradle.properties".source =
       pkgs.writeText "gradle.properties" ''

common/home/tmux.nix

@@ -1,5 +1,3 @@
-# Home-manager module
-
 { pkgs, ... }: {
   programs = {
     tmux = {

devices/binto/default.nix

@@ -12,7 +12,7 @@
     ./modules/nvidia.nix
   ];
 
-  services.hostvars = {
+  services.device-vars = {
     username = "matt";
     fontSize = 10.0;
   };
@@ -33,9 +33,9 @@
     matt = {
 
       imports = [
-        ../../modules/alacritty.nix
+        ../../home/alacritty.nix
-        ../../modules/dconf.nix
+        ../../home/dconf.nix
-        ../../modules/firefox
+        ../../home/firefox
       ];
 
       # No touchy