Add missed imports

extras/displays.nix

@@ -1,5 +1,6 @@
 {
-  d1 = ''DP-3'';
+  d1 = "DP-3";
-  d2 = ''DP-1'';
+  d2 = "DP-1";
-  d3 = ''DP-2'';
+  d3 = "DP-2";
+  dI = "eDP-1";
 }

flake.nix

@@ -87,7 +87,7 @@
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         extraSpecialArgs = {inherit inputs outputs;};
         modules = [
-          ./home-manager/jimbo_desktop.nix
+          ./home/jimbo_desktop.nix
 	  nur.nixosModules.nur
         ];
       };
@@ -95,14 +95,14 @@
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         extraSpecialArgs = {inherit inputs outputs;};
         modules = [
-          ./home-manager/jimbo_server.nix
+          ./home/jimbo_server.nix
         ];
       };
       "jimbo@JimPine" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.aarch64-linux;
         extraSpecialArgs = {inherit inputs outputs;};
         modules = [
-          ./home-manager/jimbo_pinebook.nix
+          ./home/jimbo_pinebook.nix
 	  nur.nixosModules.nur
         ];
       };
@@ -110,7 +110,7 @@
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         extraSpecialArgs = {inherit inputs outputs;};
         modules = [
-          ./home-manager/jimbo_lenovo.nix
+          ./home/jimbo_lenovo.nix
 	  nur.nixosModules.nur
         ];
       };
@@ -119,7 +119,7 @@
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         extraSpecialArgs = {inherit inputs outputs;};
         modules = [
-          ./home-manager/jimbo_ssh.nix
+          ./home/jimbo_ssh.nix
         ];
       };
     };

home/guiapps/rofi.nix

@@ -125,9 +125,7 @@
   };
   home.packages = let
     # All my rofi scripts in one file
-    rofiScripts = let
+    rofiScripts = pkgs.writeScriptBin "rofiscripts" ''
-      displays = import ../common/displays.nix;
-    in pkgs.writeScriptBin "rofiscripts" ''
       # Scratchpad function
       handle_scratchpads() {
         SCRATCHPADS=$(echo -e "Gotop\nMusic\nSound\nEasyEffects" | rofi -dmenu -i -p "Scratchpads")

home/jimbo_pinebook.nix

@@ -1,6 +1,4 @@
-let
+{outputs, ...}: {
-  displays = import ./common/displays.nix;
-in {
   imports = [
     # Common modules
     ./home.nix
@@ -35,5 +33,5 @@ in {
     ./services/udiskie.nix
   ];
 
-  wayland.windowManager.sway.config.output.${displays.dTouch}.scale = "1.3";
+  wayland.windowManager.sway.config.output.${outputs.displays.dI}.scale = "1.3";
 }

home/jimbo_ssh.nix

@@ -7,9 +7,7 @@
 
   # Rebuild this entire system
   programs.zsh = {
-    shellAliases = let
+    shellAliases = {
-      auth = import ./common/auth.nix;
-    in {
       sshswitch = "home-manager switch --flake ~/.home-manager/.#jimbo@SSH --extra-experimental-features 'nix-command flakes'";
     };
   };

home/sway/hotkeys.nix

@@ -1,7 +1,6 @@
 {config, pkgs, outputs, ...}: {
   wayland.windowManager.sway = {
     config = let
-      colors = import ../common/colors.nix;
       # Set default modifier and variables
       primeMod = "Mod4";
       secMod = "Mod1";

system/desktop/wireguard.nix

@@ -1,12 +1,10 @@
-{outputs, ...}: let
+{outputs, ...}: {
-  ips = import ../modules/ips.nix;
-in {
   networking.firewall = {
     allowedUDPPorts = [ 51820 ];
   };
 
   networking.wireguard.interfaces = {
-    "${ips.wgInt}" = {
+    "${outputs.ips.wgInt}" = {
       # Define IP of client in per device config
       listenPort = 51820;
       privateKey = outputs.secrets.wgClientPriv;