From f389dbf795a4868db949aa0d1f1f01f35c464cec Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 24 May 2023 09:27:34 +0200
Subject: [PATCH] chore: cleanup and switching packages

---
 .../configuration/graphical-fullblown.nix            |  3 ++-
 nix/home-manager/profiles/sway-desktop.nix           | 12 ++++++++++++
 nix/home-manager/programs/zsh.nix                    |  8 ++++----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix
index 63ab149..8b8b9c6 100644
--- a/nix/home-manager/configuration/graphical-fullblown.nix
+++ b/nix/home-manager/configuration/graphical-fullblown.nix
@@ -104,10 +104,11 @@ in {
 
       # FIXME: depends on insecure openssl 1.1.1t
       # kotatogram-desktop
+      tdesktop
 
       thunderbird
       # gnome.cheese
-      pkgsUnstable.discord
+      discord
 
       # Virtualization
       # virtmanager
diff --git a/nix/home-manager/profiles/sway-desktop.nix b/nix/home-manager/profiles/sway-desktop.nix
index d4fe5c0..d420014 100644
--- a/nix/home-manager/profiles/sway-desktop.nix
+++ b/nix/home-manager/profiles/sway-desktop.nix
@@ -19,6 +19,14 @@ in {
       ../programs/salut.nix
   ];
 
+  # TODO: autostart
+  # environment.loginShellInit = ''
+  #   if [[ "$(tty)" == /dev/tty1 ]]; then
+  #     echo starting sway..
+  #     exec sway
+  #   fi
+  # '';
+
   services = {
     # TODO: doesn't work with 2 screens
     # flameshot.enable = true;
@@ -103,6 +111,10 @@ in {
         "${modifier}+0" = "workspace number 0";
         "${modifier}+Shift+0" = "move container to workspace number 0";
 
+        # disable splitting for now as i sometimes trigger it accidentally and then get stuck with it
+        "${modifier}+b" = "nop";
+        "${modifier}+v" = "nop";
+
         # move workspace to output
         "${modifier}+Control+Shift+${left}" = "move workspace to output left";
         "${modifier}+Control+Shift+${right}" = "move workspace to output right";
diff --git a/nix/home-manager/programs/zsh.nix b/nix/home-manager/programs/zsh.nix
index 6f8eaee..724051b 100644
--- a/nix/home-manager/programs/zsh.nix
+++ b/nix/home-manager/programs/zsh.nix
@@ -36,13 +36,13 @@
       '';
     };
 in {
-  home.file.".profile".text = ''
-    . "${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh"
-  '';
-
   programs.zsh = {
     enable = true;
 
+    profileExtra = ''
+      . "${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh"
+    '';
+
     # will be called again by oh-my-zsh
     enableCompletion = false;
     enableAutosuggestions = true;