From 2006018e7a280f70c9a7d9efc70632fbb86059ac Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Tue, 8 Jul 2025 01:17:08 +0000
Subject: .source -> .text where possible

---
 modules/desktop/system/components/dunst.nix  | 4 ++--
 modules/desktop/system/environments/sway.nix | 8 ++++----
 modules/desktop/system/programs/foot.nix     | 6 +-----
 3 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'modules/desktop/system')

diff --git a/modules/desktop/system/components/dunst.nix b/modules/desktop/system/components/dunst.nix
index 37fce2b..9dfaa80 100644
--- a/modules/desktop/system/components/dunst.nix
+++ b/modules/desktop/system/components/dunst.nix
@@ -6,7 +6,7 @@
 }: let
   cfg = config.collinux.desktop.components.dunst;
 
-  settings = pkgs.writeText "dunstrc" ''
+  settings = ''
     [global]
       frame_color = "#89b4fa"
       separator_color = frame
@@ -32,7 +32,7 @@
 in
   lib.mkIf cfg.enable {
     hjem.users."${config.collinux.user.name}" = {
-      files.".config/dunst/dunstrc".source = settings;
+      files.".config/dunst/dunstrc".text = settings;
       packages = [pkgs.dunst pkgs.inotify-tools];
     };
   }
diff --git a/modules/desktop/system/environments/sway.nix b/modules/desktop/system/environments/sway.nix
index 880095b..2e0d2d1 100644
--- a/modules/desktop/system/environments/sway.nix
+++ b/modules/desktop/system/environments/sway.nix
@@ -6,7 +6,7 @@
 }: let
   cfg = config.collinux.desktop.sway;
 
-  colors = pkgs.writeText "catppuccin-mocha" ''
+  colors = ''
     set $rosewater #f5e0dc
     set $flamingo #f2cdcd
     set $pink #f5c2e7
@@ -35,7 +35,7 @@
     set $crust #11111b
   '';
 
-  settings = pkgs.writeText "config" ''
+  settings = ''
     exec ${pkgs.foot}/bin/foot --server
     exec ${pkgs.swaybg}/bin/swaybg -i ${config.collinux.desktop.wallpaper}
     exec ${pkgs.dunst}/bin/dunst
@@ -92,8 +92,8 @@ in
   lib.mkIf cfg.enable {
     hjem.users."${config.collinux.user.name}" = {
       files = {
-        ".config/sway/config".source = settings;
-        ".config/sway/catppuccin-mocha".source = colors;
+        ".config/sway/config".text = settings;
+        ".config/sway/catppuccin-mocha".text = colors;
       };
 
       packages = [pkgs.sway pkgs.bc];
diff --git a/modules/desktop/system/programs/foot.nix b/modules/desktop/system/programs/foot.nix
index fe93901..8c9edbe 100644
--- a/modules/desktop/system/programs/foot.nix
+++ b/modules/desktop/system/programs/foot.nix
@@ -10,11 +10,7 @@
   settings = ini'.generate "foot.ini" {
     main = {
       font = "Iosevka Nerd Font:size=12";
-      shell =
-        # if config.collinux.terminal.programs.tmux.enable
-        # then "${pkgs.tmux}/bin/tmux"
-        # else
-        "${pkgs.fish}/bin/fish";
+      shell = "${pkgs.fish}/bin/fish";
     };
 
     cursor.color = "11111b f5e0dc";
-- 
cgit v1.3.1