Sway

3 files changed, 160 insertions, 28 deletions

diff --git a/home-manager/firefox.nix b/home-manager/addons/firefox.nix
index 0a3b922..0a3b922 100644
--- a/home-manager/firefox.nix
+++ b/home-manager/addons/firefox.nix
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 = {
diff --git a/home-manager/sway-config.nix b/home-manager/sway-config.nix
new file mode 100644
index 0000000..c53fb56
--- /dev/null
+++ b/home-manager/sway-config.nix
@@ -0,0 +1,135 @@
+{ pkgs }: { text = ''
+
+exec ${pkgs.pulseaudio}/bin/pulseaudio --start
+exec systemctl --user import-environment
+
+#exec ${pkgs.eww-wayland}/bin/eww daemon
+#exec ${pkgs.eww-wayland}/bin/eww open bar0
+#exec ${pkgs.eww-wayland}/bin/eww open bar1
+
+set $mod Mod1
+set $left h
+set $down j
+set $up k
+set $right l
+
+floating_modifier $mod normal
+
+# Apps
+  bindsym $mod+d exec ${pkgs.dmenu}/bin/dmenu_path | ${pkgs.wmenu}/bin/wmenu | xargs ${pkgs.sway}/bin/swaymsg exec --
+  bindsym $mod+Return exec ${pkgs.foot}/bin/foot
+
+# Basic
+  bindsym $mod+Shift+q kill
+  bindsym $mod+Shift+r reload;
+  bindsym $mod+f fullscreen
+  bindsym $mod+Shift+space floating toggle
+
+  bindsym $mod+b splith
+  bindsym $mod+v splitv
+
+# Multimedia
+  # Sound
+  bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
+  bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
+  bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
+  bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
+
+  # Screen Brightness
+  bindsym XF86MonBrightnessUp exec light -A 10
+  bindsym XF86MonBrightnessDown exec light -U 10
+
+# Movement
+  # Move your focus around
+  bindsym $mod+$left focus left
+  bindsym $mod+$down focus down
+  bindsym $mod+$up focus up
+  bindsym $mod+$right focus right
+
+  # Move the focused window with the same, but add Shift
+  bindsym $mod+Shift+$left move left
+  bindsym $mod+Shift+$down move down
+  bindsym $mod+Shift+$up move up
+  bindsym $mod+Shift+$right move right
+
+# Workspace
+  # Switch to workspace
+  bindsym $mod+1 workspace number 1
+  bindsym $mod+2 workspace number 2
+  bindsym $mod+3 workspace number 3
+  bindsym $mod+4 workspace number 4
+  bindsym $mod+5 workspace number 5
+  bindsym $mod+6 workspace number 6
+  bindsym $mod+7 workspace number 7
+  bindsym $mod+8 workspace number 8
+  bindsym $mod+9 workspace number 9
+  bindsym $mod+0 workspace number 10
+
+  # Move focused container to workspace
+  bindsym $mod+Shift+1 move container to workspace number 1
+  bindsym $mod+Shift+2 move container to workspace number 2
+  bindsym $mod+Shift+3 move container to workspace number 3
+  bindsym $mod+Shift+4 move container to workspace number 4
+  bindsym $mod+Shift+5 move container to workspace number 5
+  bindsym $mod+Shift+6 move container to workspace number 6
+  bindsym $mod+Shift+7 move container to workspace number 7
+  bindsym $mod+Shift+8 move container to workspace number 8
+  bindsym $mod+Shift+9 move container to workspace number 9
+  bindsym $mod+Shift+0 move container to workspace number 10
+
+
+
+# Resize
+  mode "resize" {
+    # left will shrink the containers width
+    # right will grow the containers width
+    # up will shrink the containers height
+    # down will grow the containers height
+    bindsym $left resize shrink width 10px
+    bindsym $down resize grow height 10px
+    bindsym $up resize shrink height 10px
+    bindsym $right resize grow width 10px
+
+    # Ditto, with arrow keys
+    bindsym Left resize shrink width 10px
+    bindsym Down resize grow height 10px
+    bindsym Up resize shrink height 10px
+    bindsym Right resize grow width 10px
+
+    # Return to default mode
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+  }
+
+  bindsym $mod+r mode "resize"
+
+
+
+# Status Bar
+  bar {
+    position top
+    font "Neo Comic Mono 12"
+  }
+
+# Window border
+  default_border none
+  default_floating_border none
+  font pango:monospace 0
+  titlebar_padding 1
+  titlebar_border_thickness 0
+
+
+# Input
+  input "type:keyboard" {
+    xkb_options caps:escape
+  }
+
+  input "2:7:SynPS/2_Synaptics_TouchPad" {
+    natural_scroll enabled
+  }
+
+
+
+
+include @sysconfdir@/sway/config.d/*
+''; }