Refactored sway, moving scripts to their own folder and getting rid of wayland folder

home.nix

@@ -1,5 +1,8 @@
 { config, lib, pkgs, ... }:
 
+let
+  scripts = ./scripts;
+in
 {
   home.username = "alice";
   home.homeDirectory = "/home/alice";
@@ -32,9 +35,6 @@
   # Enabling bash from home-manager means environment variables set by HM get set correctly
   programs.bash = {
     enable = true;
-    # initExtra = ''
-    #   . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
-    # '';
   };
 
   programs.git = {
@@ -42,7 +42,7 @@
     extraConfig = { init.defaultBranch = "main"; };
   };
   
-  wayland.windowManager.sway = import ./wayland/sway.nix { inherit config lib pkgs; };
+  wayland.windowManager.sway = import ./programs/sway.nix { inherit scripts config lib pkgs; };
   
   programs.swaylock = {
     enable = true;

programs/sway.nix

@@ -1,9 +1,9 @@
-{ config, lib, pkgs, ... }:
+{ scripts, config, lib, pkgs, ... }:
 
 
 let
-  dynscreenshot = pkgs.writeShellScript "dynscreenshot" (builtins.readFile ./dynscreenshot.sh);
-  changebrightness = pkgs.writeShellScript "changebrightness" (builtins.readFile ./changebrightness.sh);
+  dynscreenshot = pkgs.writeShellScript "dynscreenshot" (builtins.readFile "${scripts}/dynscreenshot.sh");
+  changebrightness = pkgs.writeShellScript "changebrightness" (builtins.readFile "${scripts}/changebrightness.sh");
   mod = config.wayland.windowManager.sway.config.modifier;
 in {
   enable = true;