From 144bbdf50ae4d2a75288467496cd55076801be78 Mon Sep 17 00:00:00 2001
From: vorboyvo <mrsirofvibe@outlook.com>
Date: Mon, 15 Jan 2024 14:26:21 -0500
Subject: [PATCH] Refactored sway, moving scripts to their own folder and
 getting rid of wayland folder

---
 home.nix                                 | 8 ++++----
 {wayland => programs}/sway.nix           | 6 +++---
 {wayland => scripts}/changebrightness.sh | 0
 {wayland => scripts}/dynscreenshot.sh    | 0
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename {wayland => programs}/sway.nix (94%)
 rename {wayland => scripts}/changebrightness.sh (100%)
 rename {wayland => scripts}/dynscreenshot.sh (100%)

diff --git a/home.nix b/home.nix
index 5b23fe2..a98d673 100644
--- a/home.nix
+++ b/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;
diff --git a/wayland/sway.nix b/programs/sway.nix
similarity index 94%
rename from wayland/sway.nix
rename to programs/sway.nix
index 4bb1fd6..85fadae 100644
--- a/wayland/sway.nix
+++ b/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;
diff --git a/wayland/changebrightness.sh b/scripts/changebrightness.sh
similarity index 100%
rename from wayland/changebrightness.sh
rename to scripts/changebrightness.sh
diff --git a/wayland/dynscreenshot.sh b/scripts/dynscreenshot.sh
similarity index 100%
rename from wayland/dynscreenshot.sh
rename to scripts/dynscreenshot.sh