feat: sway

README.md

@@ -77,10 +77,9 @@
     - `nupkgs`: "nix user packages" - using that instead of a nur repo.
     - `secrets`: secrets module, using sops for encryption.
     - `wallpaper`: wallpaper definition.
-- `outputs`: outputs of the dotfiles.
-- `outputs`: Contains all the outputs of the dotfiles.
-- `scripts`: Contains all the scripts used in the dotfiles.
-- `vars`: Contains all the variables used in the dotfiles.
+- `outputs`: outputs of the config.
+- `scripts`: scripts used in the config.
+- `vars`: variables used in the config.
 
 ### General slices
 

flake.nix

@@ -4,6 +4,10 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    astal = {
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:aylur/astal/main";
+    };
     datsnvim = {
       inputs = {
         home-manager.follows = "home-manager";

home/linux/gui/base/gtk.nix

@@ -27,4 +27,9 @@
 
     gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
   };
+
+  xdg.configFile."gtk-3.0/settings.ini".text = ''
+    [Settings]
+    gtk-application-prefer-dark-theme=1
+  '';
 }

home/linux/gui/base/misc.nix

@@ -1,13 +1,35 @@
 {
+  config,
   pkgs,
   pkgs-unstable,
   ...
 }: {
-  home.packages = with pkgs; [
-    telegram-desktop
-    flameshot
-    pcmanfm
-  ];
+  home.packages = with pkgs;
+    [
+      telegram-desktop
+      pcmanfm
+      (
+        if config.modules.desktop.sway.enable
+        then
+          (flameshot.overrideAttrs (oldAttrs: {
+            src = pkgs.fetchFromGitHub {
+              owner = "flameshot-org";
+              repo = "flameshot";
+              rev = "3d21e4967b68e9ce80fb2238857aa1bf12c7b905";
+              sha256 = "sha256-OLRtF/yjHDN+sIbgilBZ6sBZ3FO6K533kFC1L2peugc=";
+            };
+            cmakeFlags = [
+              "-DUSE_WAYLAND_CLIPBOARD=1"
+              "-DUSE_WAYLAND_GRIM=1"
+            ];
+            buildInputs = oldAttrs.buildInputs ++ [pkgs.libsForQt5.kguiaddons];
+          }))
+        else flameshot
+      )
+    ]
+    ++ pkgs.lib.optionals config.modules.desktop.sway.enable [
+      grim
+    ];
 
   fonts.fontconfig.enable = false;
 }

home/linux/gui/sway/default.nix

@@ -0,0 +1,42 @@
+{
+  pkgs,
+  config,
+  lib,
+  anyrun,
+  ...
+} @ args:
+with lib; let
+  cfg = config.modules.desktop.sway;
+in {
+  options.modules.desktop.sway = {
+    enable = mkEnableOption "sway wm";
+    settings = lib.mkOption {
+      type = with lib.types; let
+        valueType =
+          nullOr (oneOf [
+            bool
+            int
+            float
+            str
+            path
+            (attrsOf valueType)
+            (listOf valueType)
+          ])
+          // {
+            description = "sway configuration value";
+          };
+      in
+        valueType;
+      default = {};
+    };
+  };
+
+  config = mkIf cfg.enable (
+    mkMerge ([
+        {
+          wayland.windowManager.sway.config = cfg.settings;
+        }
+      ]
+      ++ (import ./values args))
+  );
+}

home/linux/gui/sway/values/default.nix

@@ -0,0 +1,4 @@
+{mylib, ...} @ args:
+map
+(path: import path args)
+(mylib.file.scanPaths ./.)

home/linux/gui/sway/values/packages.nix

@@ -0,0 +1,9 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    dunst
+    wl-clipboard
+    libappindicator-gtk3
+    networkmanagerapplet
+    wmenu
+  ];
+}

home/linux/gui/sway/values/sway.nix

@@ -0,0 +1,16 @@
+{
+  lib,
+  pkgs-unstable,
+  ...
+}:
+with lib; let
+  pkg = pkgs-unstable.sway;
+in {
+  wayland.windowManager.sway = {
+    enable = true;
+    package = pkg;
+    extraSessionCommands = ''
+      export _JAVA_AWT_WM_NONREPARENTING=1
+    '';
+  };
+}

hosts/dtsf-pc/home/default.nix

@@ -1,5 +1,6 @@
 {
   pkgs,
+  mypkgs,
   lib,
   ...
 }: {
@@ -8,14 +9,13 @@
   modules.desktop.colorscheme.theme = "gruvbox";
 
   modules.desktop = {
-    i3 = let
+    sway = let
       mod = "Mod4";
       alt = "Mod1";
       keymaps = import ./keymaps.nix {inherit mod alt pkgs lib;};
       command = str: always: {
         command = str;
         always = always;
-        notification = false;
       };
     in {
       settings = {
@@ -24,12 +24,10 @@
         keybindings = keymaps.allBindings;
 
         startup = [
-          (command "dex --autostart --environment i3" true)
-          (command "xss-lock --transfer-sleep-lock -- i3lock-theme" true)
-          (command "autorandr --load desktop" true)
           (command "udiskie --tray --notify" false)
-          (command "i3-msg 'workspace 1'" false)
+          (command "swaymsg 'workspace 1'" false)
           (command "dunst -config $HOME/.config/dunstrc" false)
+          (command "systemctl --user restart wallpaper.service" true)
         ];
 
         modes = {
@@ -50,19 +48,26 @@
           };
         };
 
-        window.titlebar = true;
         fonts = {
           names = ["JetBrainsMono Nerd Font"];
           style = "Regular";
           size = 8.0;
         };
 
+        window.titlebar = true;
         window.commands = [
           {
             command = "floating enable, sticky enable";
             criteria = {title = "^win";};
           }
         ];
+
+        input = {
+          "1133:16500:Logitech_G305" = {
+            accel_profile = "flat";
+            pointer_accel = "0";
+          };
+        };
       };
     };
   };
@@ -76,4 +81,8 @@
       AddKeysToAgent yes
     '';
   };
+
+  modules.desktop.nupkgs.packages = with mypkgs; [
+    astal
+  ];
 }

hosts/dtsf-pc/home/keymaps.nix

@@ -8,6 +8,11 @@
   mod = "Mod4";
   alt = "Mod1";
   print = "Print";
+
+  exit = "-B 'leave' 'exec swaymsg exit && exec loginctl terminate-user $USER'";
+  turnoff = "-B 'shutdown' 'exec systemctl poweroff'";
+  reboot = "-B 'reboot' 'exec systemctl reboot'";
+
   workspaceBindings = builtins.listToAttrs (
     (map (i: {
       name = "${mod}+${toString i}";
@@ -32,8 +37,8 @@
     "${mod}+q" = "kill";
     "${mod}+t" = "exec ${pkgs.alacritty}/bin/alacritty";
     "${mod}+Return" = "exec ${pkgs.alacritty}/bin/alacritty -e ${pkgs.zellij}/bin/zellij attach dtsf -c";
-    "${mod}+a" = "exec chromium --wv --force-dark-mode --enable-features=WebUIDarkMode";
-    "${mod}+d" = "exec $HOME/.local/bin/dmenu-theme";
+    "${mod}+a" = "exec chromium --wv --force-dark-mode --enable-features=WebUIDarkMode --disable-gpu";
+    "${mod}+d" = "exec $HOME/.local/bin/launcher";
     "${mod}+Shift+m" = "exec shimeji";
 
     "${alt}+k" = "exec $HOME/.local/bin/switch-kb-variant";
@@ -64,9 +69,7 @@
     "${mod}+r" = "mode resize";
 
     "${mod}+Shift+c" = "reload";
-    "${mod}+Shift+r" = "exec i3-msg restart";
-    "${mod}+Shift+e" = "exec \"i3-nagbar -t warning -m 'leave i3' -B 'exit i3' 'exec i3-msg exit; pkill -15 Xorg'\"";
-    "${mod}+Shift+o" = "exec \"i3-nagbar -t error -m 'turn off the computer' -B 'turn off' 'systemctl poweroff'\"";
+    "${mod}+Shift+e" = "exec \"swaynag -t warning -m 'leave, shutdown or reboot?' ${turnoff} ${reboot} ${exit}\"";
 
     "XF86MonBrightnessUp" = "exec --no-startup-id brightnessctl set +5%";
     "XF86MonBrightnessDown" = "exec --no-startup-id brightnessctl set 5%-";

modules/colorscheme/home.nix

@@ -58,6 +58,10 @@
         to the user ".local/bin" folder, which should be used instead of i3lock.
       '';
     };
+    enableSwayIntegration = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+    };
     enableFishIntegration = lib.mkOption {
       type = lib.types.bool;
       default = false;
@@ -66,6 +70,10 @@
       type = lib.types.bool;
       default = false;
     };
+    enableAstalIntegration = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+    };
   };
 
   config = let
@@ -104,6 +112,16 @@
           })
         )
 
+        (
+          lib.mkIf config.modules.desktop.colorscheme.enableSwayIntegration
+          (import ./integrations/sway.nix {
+            inherit lib pkgs;
+            colorscheme = colorscheme;
+            enableI3StatusIntegration = config.modules.desktop.colorscheme.enableI3StatusIntegration;
+            enableAstalIntegration = config.modules.desktop.colorscheme.enableAstalIntegration;
+          })
+        )
+
         (
           lib.mkIf config.modules.desktop.colorscheme.enableDunstIntegration
           (import ./integrations/dunst.nix {
@@ -149,6 +167,13 @@
             colorscheme = colorscheme;
           })
         )
+
+        (
+          lib.mkIf config.modules.desktop.colorscheme.enableAstalIntegration
+          (import ./integrations/astal.nix {
+            colorscheme = colorscheme;
+          })
+        )
       ]))
     ];
 }

modules/colorscheme/integrations/astal.nix

@@ -0,0 +1,16 @@
+{colorscheme, ...}: {
+  home.file.".local/share/astal/variables.scss".source = builtins.toFile "variables.scss" ''
+    $primary: ${colorscheme.colors.primary};
+    $bg: ${colorscheme.colors.bg};
+    $altbg: ${colorscheme.colors.altbg};
+    $fg: ${colorscheme.colors.fg};
+    $black: ${colorscheme.colors.black};
+    $red: ${colorscheme.colors.red};
+    $green: ${colorscheme.colors.green};
+    $yellow: ${colorscheme.colors.yellow};
+    $blue: ${colorscheme.colors.blue};
+    $magenta: ${colorscheme.colors.magenta};
+    $cyan: ${colorscheme.colors.cyan};
+    $white: ${colorscheme.colors.white};
+  '';
+}