From f86c5e2811fae27bebadac810db392b8a8278c90 Mon Sep 17 00:00:00 2001
From: cnst <adamhilmersson@gmail.com>
Date: Sun, 10 Nov 2024 14:01:30 +0100
Subject: [PATCH] thunar moved to nixos

---
 hosts/cnix/modules.nix                              | 3 +++
 hosts/cnixpad/modules.nix                           | 3 +++
 hosts/toothpc/modules.nix                           | 3 +++
 modules/default.nix                                 | 2 +-
 modules/{home => nixos}/programs/thunar/default.nix | 8 +++++---
 users/cnst/modules.nix                              | 3 ---
 users/toothpick/modules.nix                         | 3 ---
 7 files changed, 15 insertions(+), 10 deletions(-)
 rename modules/{home => nixos}/programs/thunar/default.nix (65%)

diff --git a/hosts/cnix/modules.nix b/hosts/cnix/modules.nix
index 74a11210..b98ffdac 100644
--- a/hosts/cnix/modules.nix
+++ b/hosts/cnix/modules.nix
@@ -119,6 +119,9 @@
       steam = {
         enable = true;
       };
+      thunar = {
+        enable = true;
+      };
       yubikey = {
         enable = true;
       };
diff --git a/hosts/cnixpad/modules.nix b/hosts/cnixpad/modules.nix
index 39f8959d..31aea69e 100644
--- a/hosts/cnixpad/modules.nix
+++ b/hosts/cnixpad/modules.nix
@@ -119,6 +119,9 @@
       steam = {
         enable = false;
       };
+      thunar = {
+        enable = true;
+      };
       yubikey = {
         enable = true;
       };
diff --git a/hosts/toothpc/modules.nix b/hosts/toothpc/modules.nix
index b6558231..3f25cb56 100644
--- a/hosts/toothpc/modules.nix
+++ b/hosts/toothpc/modules.nix
@@ -119,6 +119,9 @@
       steam = {
         enable = true;
       };
+      thunar = {
+        enable = true;
+      };
       yubikey = {
         enable = true;
       };
diff --git a/modules/default.nix b/modules/default.nix
index ac6b165a..922251c8 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -20,7 +20,6 @@
         ./home/programs/neovim
         ./home/programs/rofi
         ./home/programs/ssh
-        ./home/programs/thunar
         ./home/programs/tuirun
         ./home/programs/vscode
         ./home/programs/waybar
@@ -76,6 +75,7 @@
         ./nixos/programs/npm
         ./nixos/programs/obsidian
         ./nixos/programs/steam
+        ./nixos/programs/thunar
         ./nixos/programs/yubikey
         ./nixos/programs/zsh
 
diff --git a/modules/home/programs/thunar/default.nix b/modules/nixos/programs/thunar/default.nix
similarity index 65%
rename from modules/home/programs/thunar/default.nix
rename to modules/nixos/programs/thunar/default.nix
index 15fd46e7..f70e7c15 100644
--- a/modules/home/programs/thunar/default.nix
+++ b/modules/nixos/programs/thunar/default.nix
@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.programs.thunar;
+  cfg = config.nixos.programs.thunar;
 in {
   options = {
-    home.programs.thunar.enable = mkEnableOption "Enables thunar file manager";
+    nixos.programs.thunar.enable = mkEnableOption "Enables thunar file manager";
   };
   config = mkIf cfg.enable {
     programs.thunar = {
@@ -21,6 +21,8 @@ in {
     programs.xfconf.enable = true;
     services.tumbler.enable = true;
 
-    environment.systemPackages = [pkgs.file-roller];
+    environment.systemPackages = with pkgs; [
+      file-roller
+    ];
   };
 }
diff --git a/users/cnst/modules.nix b/users/cnst/modules.nix
index 9042cf6f..0fc81f9c 100644
--- a/users/cnst/modules.nix
+++ b/users/cnst/modules.nix
@@ -74,9 +74,6 @@
       ssh = {
         enable = true;
       };
-      thunar = {
-        enable = true;
-      };
       tuirun = {
         enable = true;
       };
diff --git a/users/toothpick/modules.nix b/users/toothpick/modules.nix
index 913f6a24..cfe80f51 100644
--- a/users/toothpick/modules.nix
+++ b/users/toothpick/modules.nix
@@ -65,9 +65,6 @@
       ssh = {
         enable = true;
       };
-      thunar = {
-        enable = true;
-      };
       tuirun = {
         enable = true;
       };