common/default.nix

@@ -1,9 +1,4 @@
-{ home-manager, lib, nixpkgs, nur, ... }: {
+({ nixpkgs, home-manager, lib, ... }: {
-  imports = [
-    home-manager.nixosModules.default
-    ./overlays/list.nix
-  ];
-
   # Select internationalisation properties.
   i18n.defaultLocale = "en_CA.UTF-8";
   console = {
@@ -32,9 +27,7 @@
   home-manager.users = let
     default = {
       imports = [
-        nur.hmModules.nur
+        ./modules/neovim/nvim.nix
-        ./modules/neovim
-        ./modules/bash
       ];
       home.stateVersion = lib.mkDefault "23.05";
     };
@@ -42,4 +35,8 @@
     root = default;
     matt = default;
   };
-}
+
+  imports = [
+    ./overlays/list.nix
+  ];
+})

flake.lock

@@ -279,11 +279,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1697393947,
+        "lastModified": 1697368971,
-        "narHash": "sha256-v0j5RAAfMv9nmjNUCcy+kXq9OIHUR4m5swruMyAgCxo=",
+        "narHash": "sha256-TVK2EN32mbHO8dtcUlzDpntKJ6yOC+uPJTFJhh6eDjw=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "1f582457cfdea7f2d0d2028f7b3dbabbebd0e164",
+        "rev": "43b39e0bc6a83ce190ff09054beb713e0431f19b",
         "type": "github"
       },
       "original": {
@@ -530,11 +530,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1697391992,
+        "lastModified": 1697363080,
-        "narHash": "sha256-J2piU0aOxp3d6hgYyWYF0XlJ/QSM0Vm2vjbJBQZaX6g=",
+        "narHash": "sha256-/49Rh5mohp0ZD6HaNbDn9oIsLt+d7Tzbc/BGkb/7o+g=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "99b3690779c7851e6c79f92b1c8717ec31f11739",
+        "rev": "5771ba6f22db037b037a8bdd82acc5467c965c7e",
         "type": "github"
       },
       "original": {

hosts/wim/home/bashdots.nix

@@ -1,5 +1,3 @@
-# Home-manager module
-
 { lib, ... }:
  
 {
@@ -148,11 +146,11 @@
       [[ -f ~/.bashrc ]] && . ~/.bashrc
     '';
     bashrcExtra = ''
-      ${lib.strings.fileContents ./config/dracula/less.sh}
+      ${lib.strings.fileContents ../config/bash/dracula/less.sh}
-      ${lib.strings.fileContents ./config/dracula/fzf.sh}
+      ${lib.strings.fileContents ../config/bash/dracula/fzf.sh}
 
-      ${lib.strings.fileContents ./config/colorgrid.sh}
+      ${lib.strings.fileContents ../config/bash/colorgrid.sh}
-      ${lib.strings.fileContents ./config/bashrc}
+      ${lib.strings.fileContents ../config/bash/bashrc}
     '';
     #initExtra = ''
     #'';

hosts/wim/home/main.nix

@@ -1,6 +1,12 @@
-{ ... }:
+{ home-manager, nur, ... }:
 
 {
+## Global config to add home-manager module
+#############################################################################
+  imports = [
+    home-manager.nixosModules.default
+  ];
+
   # Define a user account. Don't forget to set a password with 'passwd'.
   users.users.matt = {
     isNormalUser = true;
@@ -8,15 +14,27 @@
   };
 
   programs.dconf.enable = true;
+#############################################################################
 
   # TODO: use hm for tmux
   home-manager.users = {
+
+    root = {
+      imports = [
+        ./bashdots.nix
+      ];
+
+      home.stateVersion = "23.05";
+    };
+
     matt = {
 
       imports = [
+        nur.hmModules.nur
         ./dconf.nix
         ./theme.nix
         ./hyprland.nix
+        ./bashdots.nix
         ./dotfiles.nix
         ./packages.nix
         ./firefox/main.nix