From 29c0c3d52826151f146c2ba56aeadcf45379c7f0 Mon Sep 17 00:00:00 2001 From: lucy Date: Mon, 17 Aug 2026 20:25:50 +0200 Subject: [PATCH 1/3] move thunar to nixos --- home-manager/home.nix | 1 - nixos/configuration.nix | 1 + {home-manager => nixos}/programs/thunar.nix | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {home-manager => nixos}/programs/thunar.nix (100%) diff --git a/home-manager/home.nix b/home-manager/home.nix index 053df44..34be45a 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -15,7 +15,6 @@ ./programs/nixcord.nix ./programs/zsh.nix ./programs/ghostty.nix - ./programs/thunar.nix ./hyprland/hyprland.nix inputs.nixcord.homeModules.nixcord inputs.spicetify-nix.homeManagerModules.spicetify diff --git a/nixos/configuration.nix b/nixos/configuration.nix index f6a6caf..6c2cad5 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -10,6 +10,7 @@ ./programs/system-packages.nix ./programs/xppen.nix ./programs/fonts.nix + ./programs/thunar.nix ./hardware/bluetooth.nix ./services/common.nix ./services/pipewire.nix diff --git a/home-manager/programs/thunar.nix b/nixos/programs/thunar.nix similarity index 100% rename from home-manager/programs/thunar.nix rename to nixos/programs/thunar.nix From f1002e188313d3fb5641df3acae9af758cc416d1 Mon Sep 17 00:00:00 2001 From: lucy Date: Mon, 17 Aug 2026 20:27:49 +0200 Subject: [PATCH 2/3] remove zsh config nixos --- nixos/programs/zsh.nix | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 nixos/programs/zsh.nix diff --git a/nixos/programs/zsh.nix b/nixos/programs/zsh.nix deleted file mode 100644 index 30e71b4..0000000 --- a/nixos/programs/zsh.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: { - - programs.zsh = { - enable = true; - autosuggestions.enable = true; - syntaxHighlighting.enable = true; - promptInit = '' - source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme - source ${../../home-manager/programs/p10k.zsh} - ''; - }; -} From ea471ce28d29a0e56c90d02953979879166b0b28 Mon Sep 17 00:00:00 2001 From: lucy Date: Mon, 17 Aug 2026 20:30:40 +0200 Subject: [PATCH 3/3] fixup zsh config --- home-manager/programs/zsh.nix | 4 ++-- nixos/programs/thunar.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/programs/zsh.nix b/home-manager/programs/zsh.nix index 37c23c8..5a9940b 100644 --- a/home-manager/programs/zsh.nix +++ b/home-manager/programs/zsh.nix @@ -2,8 +2,8 @@ programs.zsh = { enable = true; enableCompletion = true; - enableAutosuggestions = true; - enableSyntaxHighlighting = true; + autosuggestion.enable = true; + syntaxHighlighting.enable = true; oh-my-zsh.enable = true; oh-my-zsh.theme = "gentoo"; }; diff --git a/nixos/programs/thunar.nix b/nixos/programs/thunar.nix index a013527..4e7cc2c 100644 --- a/nixos/programs/thunar.nix +++ b/nixos/programs/thunar.nix @@ -2,7 +2,7 @@ { programs.thunar = { enable = true; - plugins = with pkgs.xfce; [ + plugins = with pkgs; [ thunar-archive-plugin thunar-volman thunar-vcs-plugin