1 files changed, 25 insertions, 28 deletions

diff --git a/home-manager/home.nix b/home-manager/home.nix
index 7c0c4de..100e67d 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -15,9 +15,9 @@ let
 in {
   imports = [
     nix-colors.homeManagerModules.default
-   ./firefox.nix
-   ./addons/alacritty.nix
-   ./addons/xresources.nix
+   #./addons/firefox.nix
+   #./addons/alacritty.nix
+   #./addons/xresources.nix
   ];
 
   colorScheme = schemeFromYaml "lux-scheme" (builtins.readFile lux-scheme);
@@ -37,7 +37,6 @@ in {
   home.packages = [
     pkgs.picom
     pkgs.libnotify
-    pkgs.birdtray
     pkgs.dmenu-bluetooth
 
     #pkgs.pureref
@@ -59,8 +58,6 @@ in {
   home.file = {
     ".config/nvim/spell/pl.utf-8.spl".source = nvim-spell-pl-utf8-dict;
 
-    ".config/sx/sxrc".source = ./sxrc;
-
     ".local/share/gnupg/gpg-agent.conf".text = ''
       debug-pinentry
       debug ipc
@@ -70,6 +67,8 @@ in {
       #pinentry-program /run/current-system/sw/bin/pinentry
       pinentry-program /run/current-system/sw/bin/pinentry-gtk-2
     '';
+
+    ".config/sway/config" = (import ./sway-config.nix {inherit pkgs;});
   };
 
   dconf = {
@@ -86,26 +85,30 @@ in {
 
     font.name = "Neo Comic Mono 12";
 
-    theme = {
-      name = "lux-scheme";
-      package = nix-colors-lib.gtkThemeFromScheme {
-        scheme = config.colorScheme;
-      };
-    };
-
-    iconTheme = {
-      name = "Adwaita";
-      package = pkgs.gnome.adwaita-icon-theme;
-    };
-
-    cursorTheme = {
-      name = "Adwaita";
-      package = pkgs.gnome.adwaita-icon-theme;
-    };
+    #theme = {
+    #  name = "lux-scheme";
+    #  package = nix-colors-lib.gtkThemeFromScheme {
+    #    scheme = config.colorScheme;
+    #  };
+    #};
+
+    #iconTheme = {
+    #  name = "Adwaita";
+    #  package = pkgs.gnome.adwaita-icon-theme;
+    #};
+
+    #cursorTheme = {
+    #  name = "Adwaita";
+    #  package = pkgs.gnome.adwaita-icon-theme;
+    #};
   };
 
   services = {
     dunst.enable = true;
+
+    kanshi = {
+      enable = true;
+    };
   };
 
   programs = {
@@ -139,12 +142,6 @@ in {
         #QT_STYLE_OVERRIDE=adwaita
         #QT_QPA_PLATFORMTHEME=gnome
       };
-
-      profileExtra = ''
-        if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]; then
-          exec sx
-        fi
-      '';
     };
 
     git = {