diff --git a/programs/all.nix b/programs/all.nix
index ecbe736..611c4a3 100644
--- a/programs/all.nix
+++ b/programs/all.nix
@@ -4,7 +4,9 @@
   imports = [
     ./default.nix
     ./git.nix
+    ./greetd.nix
     ./home-manager.nix
     ./lix.nix
+    ./polkit.nix
   ];
 }
diff --git a/programs/greetd.nix b/programs/greetd.nix
new file mode 100644
index 0000000..2899312
--- /dev/null
+++ b/programs/greetd.nix
@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+
+{
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session.command = "${pkgs.tuigreet}/bin/tuigreet -t --asterisks -c 'sway'";
+    };
+  };
+  environment.etc."greetd/environments".text = ''
+    sway
+    fish
+    bash
+  '';
+}
diff --git a/programs/polkit.nix b/programs/polkit.nix
new file mode 100644
index 0000000..9481c0d
--- /dev/null
+++ b/programs/polkit.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  security.polkit.enable = true;
+}
diff --git a/users/mara/config/all.nix b/users/mara/config/all.nix
index 8acee6d..6259964 100644
--- a/users/mara/config/all.nix
+++ b/users/mara/config/all.nix
@@ -4,5 +4,7 @@
   imports = [
     ./fish.nix
     ./helix.nix
+    ./kitty.nix
+    ./sway.nix
   ];
 }
diff --git a/users/mara/config/kitty.nix b/users/mara/config/kitty.nix
new file mode 100644
index 0000000..d6ff1ec
--- /dev/null
+++ b/users/mara/config/kitty.nix
@@ -0,0 +1,66 @@
+{ ... }:
+
+{
+  programs.kitty = {
+    enable = true;
+
+    environment."TERM" = "xterm-256color";
+    font = {
+      name = "Maple Mono NF";
+      size = 11;
+    };
+
+    settings = {
+      confirm_os_window_close = 0;
+      enable_audio_bell = false;
+
+      foreground = "#e0def4";
+      background = "#232136";
+      background_opacity = 0.8;
+      background_blur = 0;
+      dim_opacity = 1;
+      selection_foreground = "#232136";
+      selection_background = "#a495d9";
+
+      cursor_shape = "beam";
+      cursor = "#a495d9";
+      cursor_text_color = "#e0def4";
+
+      url_color = "#c4a7e7";
+      url_style = "dotted";
+
+      active_tab_foreground = "#e0def4";
+      active_tab_background = "#393552";
+      inactive_tab_foreground = "#6e6a86";
+      inactive_tab_background = "#232136";
+      active_border_color = "#3e8fb0";
+      inactive_border_color = "#44415a";
+
+      color0 = "#333943";
+      color1 = "#dd759f";
+      color2 = "#539c9c";
+      color3 = "#dd759f";
+      color4 = "#70b6e5";
+      color5 = "#a495d9";
+      color6 = "#64c7dd";
+      color7 = "#d9e0e9";
+
+      color8 = "#3b5078";
+      color9 = "#dd3d7d";
+      color10 = "#009c9c";
+      color11 = "#dd3d7d";
+      color12 = "#0087e1";
+      color13 = "#856cd9";
+      color14 = "#00b4dd";
+      color15 = "#edf5ff";
+
+      window_margin_width = 3;
+      tab_bar_style = "separator";
+      tab_seperator = "|";
+      tab_bar_margin_width = 3;
+      tab_bar_margin_height = 3;
+      tab_switch_strategy = "right";
+      active_tab_font_style = "bold";
+    };
+  };
+}
diff --git a/users/mara/config/sway.nix b/users/mara/config/sway.nix
new file mode 100644
index 0000000..2691f66
--- /dev/null
+++ b/users/mara/config/sway.nix
@@ -0,0 +1,12 @@
+{ ... }:
+
+{
+  wayland.windowManager.sway = {
+    enable = true;
+    wrapperFeatures.gtk = true;
+    config = rec {
+      modifier = "Mod4";
+      terminal = "kitty";
+    };
+  };
+}