diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index 580d7a1..7a82274 100755
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -6,12 +6,8 @@
   imports =
     [
       ./hardware-configuration.nix
-      #./modules/autorandr
       ./modules/networks
-      #./modules/lightdm
-      #./modules/gdm
       ../../shared/vim.nix
-      #../../shared/input.nix
       ../../shared/sops.nix
       ../../shared/gpg.nix
       ../../shared/zsh-fix.nix
@@ -26,23 +22,14 @@
   console = {
     keyMap = "dvorak";
     font = "Lat2-Terminus16";
-    #useXkbConfig = true; # use xkbOptions in tty.
   };
 
-  services.xserver = {
-    enable = true;
-    #displayManager = {
-    #defaultSession = "none+awesome";
-    #};
-    windowManager.awesome = {
-      enable = true;
-      luaModules = with pkgs.luaPackages; [
-        luarocks
-        vicious
-      ];
-    };
-    libinput.enable = true;
-  };
+  fonts.fonts = with pkgs; [
+    noto-fonts
+    noto-fonts-cjk
+    noto-fonts-emoji
+    dejavu_fonts
+  ];
 
   # Enable sound.
   sound.enable = true;
@@ -81,7 +68,6 @@
 
 
   environment.systemPackages = with pkgs; [
-    # essentials
     wget
     gcc
     git
diff --git a/hosts/thinkpad/modules/autorandr/default.nix b/hosts/thinkpad/modules/autorandr/default.nix
deleted file mode 100644
index e131ef6..0000000
--- a/hosts/thinkpad/modules/autorandr/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ config, pkgs, ... }:
-let
-  fp_eDP-1 = "00ffffffffffff0009e5c608000000001f1d0104a522137803dae5955d59942924505400000001010101010101010101010101010101963b803671383c403020360058c21000001a000000000000000000000000000000000000000000fe00424f452043510a202020202020000000fe004e5631353646484d2d4e34380a0043";
-  fp_HDMI-1 = "00ffffffffffff00410ccfc0fb0100001f19010380301b782a3935a25952a1270c5054bd4b00d1c09500950fb30081c0818001010101023a801871382d40582c4500dd0c1100001e000000ff005a564331353331303030353037000000fc0050484c2032323356350a202020000000fd00384c1e5311000a202020202020017a020322f14f010203050607101112131415161f04230917078301000065030c001000023a801871382d40582c4500dd0c1100001e8c0ad08a20e02d10103e9600dd0c11000018011d007251d01e206e285500dd0c1100001e8c0ad090204031200c405500dd0c110000180000000000000000000000000000000000000000004d";
-in
-{
-  services.autorandr = {
-    enable = true;
-    profiles = {
-      default = {
-        fingerprint = {
-          eDP-1 = fp_eDP-1;
-        };
-        config = {
-          eDP-1 = {
-            enable = true;
-            primary = true;
-            position = "0x0";
-            mode = "1920x1080";
-          };
-          HDMI-1.enable = false;
-        };
-      };
-      home = {
-        fingerprint = {
-          eDP-1 = fp_eDP-1;
-          HDMI-1 = fp_HDMI-1;
-        };
-        config = {
-          eDP-1 = {
-            enable = true;
-            primary = true;
-            position = "0x0";
-            mode = "1920x1080";
-          };
-          HDMI-1 = {
-            enable = true;
-            position = "1920x0";
-            mode = "1920x1080";
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/hosts/thinkpad/modules/gdm/default.nix b/hosts/thinkpad/modules/gdm/default.nix
deleted file mode 100644
index a31ce17..0000000
--- a/hosts/thinkpad/modules/gdm/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, pkgs, ... }:
-{
-  services.xserver.displayManager.gdm = {
-    enable = true;
-  };
-}
diff --git a/hosts/thinkpad/modules/lightdm/default.nix b/hosts/thinkpad/modules/lightdm/default.nix
deleted file mode 100644
index 2a97da7..0000000
--- a/hosts/thinkpad/modules/lightdm/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, pkgs, ... }:
-{
-  services.xserver.displayManager.lightdm = {
-    enable = true;
-    background = ../../../../images/lockscreen.png;
-    greeters.slick = {
-      enable = true;
-      extraConfig = ''
-        logo = ${../../../../images/nixos-logo.png}
-        show-a11y=false
-        show-hostname=false
-      '';
-    };
-  };
-}
diff --git a/users/rouven/modules/awesome/default.nix b/users/rouven/modules/awesome/default.nix
deleted file mode 100644
index eabacd4..0000000
--- a/users/rouven/modules/awesome/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, ... }:
-{
-  xdg.configFile."awesome/rc.lua".source = ./rc.lua;
-  xdg.configFile."awesome/wallpaper.png".source = ../../../../images/wallpaper.png;
-}
diff --git a/users/rouven/modules/awesome/rc.lua b/users/rouven/modules/awesome/rc.lua
deleted file mode 100644
index 3b0fc25..0000000
--- a/users/rouven/modules/awesome/rc.lua
+++ /dev/null
@@ -1,505 +0,0 @@
--- If LuaRocks is installed, make sure that packages installed through it are
--- found (e.g. lgi). If LuaRocks is not installed, do nothing.
-pcall(require, "luarocks.loader")
-
--- Standard awesome library
-local gears = require("gears")
-local awful = require("awful")
-
-require("awful.autofocus")
--- Widget and layout library
-local wibox = require("wibox")
-local vicious = require("vicious")
--- Theme handling library
-local beautiful = require("beautiful")
--- Notification library
-local naughty = require("naughty")
-local menubar = require("menubar")
-local hotkeys_popup = require("awful.hotkeys_popup")
--- Enable hotkeys help widget for VIM and other apps
--- when client with a matching name is opened:
-require("awful.hotkeys_popup.keys")
-
--- Autstart some stuff
-awful.spawn.with_shell("light-locker --lock-on-lid")
-awful.spawn.with_shell("wpa_gui -t")
-
--- Handle runtime errors after startup
-do
-	local in_error = false
-	awesome.connect_signal("debug::error", function(err)
-		-- Make sure we don't go into an endless error loop
-		if in_error then
-			return
-		end
-		in_error = true
-
-		naughty.notify({
-			preset = naughty.config.presets.critical,
-			title = "Oops, an error happened!",
-			text = tostring(err),
-		})
-		in_error = false
-	end)
-end
-
--- Variable definitions
--- Themes define colours, icons, font and wallpapers.
-beautiful.init(gears.filesystem.get_themes_dir() .. "default/theme.lua")
-
--- This is used later as the default terminal and editor to run.
-terminal = "alacritty"
-editor = os.getenv("EDITOR") or "nvim"
-editor_cmd = terminal .. " -e " .. editor
-
--- Default modkey.
-modkey = "Mod4"
-
--- Table of layouts to cover with awful.layout.inc, order matters.
-awful.layout.layouts = {
-	awful.layout.suit.tile,
-	awful.layout.suit.tile.top,
-	awful.layout.suit.tile.left,
-	awful.layout.suit.fair,
-	awful.layout.suit.spiral,
-}
-
--- Enable gaps
-beautiful.useless_gap = 5
-
--- Background color for wibar
-beautiful.wibar_bg = "#282a36"
-
---  Notifications
-naughty.config.defaults.position = "top_right"
-naughty.config.defaults.timeout = 5
-naughty.config.defaults.margin = 8
-naughty.config.defaults.ontop = true
-naughty.config.defaults.icon_size = 64
-naughty.config.defaults.fg = beautiful.fg_focus
-naughty.config.defaults.bg = beautiful.bg_focus
-naughty.config.defaults.border_color = beautiful.border_focus
-naughty.config.defaults.border_width = 2
-
--- Menu
--- Create a launcher widget and a main menu
-myawesomemenu = {
-	{
-		"hotkeys",
-		function()
-			hotkeys_popup.show_help(nil, awful.screen.focused())
-		end,
-	},
-	{ "manual", terminal .. " -e man awesome" },
-	{ "edit config", editor_cmd .. " " .. awesome.conffile },
-	{ "restart", awesome.restart },
-	{
-		"quit",
-		function()
-			awesome.quit()
-		end,
-	},
-}
-
-local menu_awesome = { "awesome", myawesomemenu, beautiful.awesome_icon }
-local menu_terminal = { "open terminal", terminal }
-
-mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, menu = mymainmenu })
-
--- Menubar configuration
-menubar.utils.terminal = terminal -- Set the terminal for applications that require it
-
--- Wibar
--- Create a textclock widget
-mytextclock = wibox.widget.textclock()
-
--- logout
---local logout_menu_widget = require("awesome-wm-widgets.logout-menu-widget.logout-menu")
-
--- Simple cpu widget
---local cpu_widget = require("awesome-wm-widgets.cpu-widget.cpu-widget")
-
--- Simle network widget
---local net_widget = require("awesome-wm-widgets.net-speed-widget.net-speed")
-
--- battery
---local battery_widget = require("awesome-wm-widgets.battery-widget.battery")
-
--- Create a wibox for each screen and add it
-local taglist_buttons = gears.table.join(
-	awful.button({}, 1, function(t)
-		t:view_only()
-	end),
-	awful.button({ modkey }, 1, function(t)
-		if client.focus then
-			client.focus:move_to_tag(t)
-		end
-	end),
-	awful.button({}, 3, awful.tag.viewtoggle),
-	awful.button({ modkey }, 3, function(t)
-		if client.focus then
-			client.focus:toggle_tag(t)
-		end
-	end),
-	awful.button({}, 4, function(t)
-		awful.tag.viewnext(t.screen)
-	end),
-	awful.button({}, 5, function(t)
-		awful.tag.viewprev(t.screen)
-	end)
-)
-
-local tasklist_buttons = gears.table.join(
-	awful.button({}, 1, function(c)
-		if c == client.focus then
-			c.minimized = true
-		else
-			c:emit_signal("request::activate", "tasklist", { raise = true })
-		end
-	end),
-	awful.button({}, 3, function()
-		awful.menu.client_list({ theme = { width = 250 } })
-	end),
-	awful.button({}, 4, function()
-		awful.client.focus.byidx(1)
-	end),
-	awful.button({}, 5, function()
-		awful.client.focus.byidx(-1)
-	end)
-)
-
-local function set_wallpaper(s)
-	-- Wallpaper
-	awful.spawn.easy_async_with_shell("feh --no-fehbg --bg-scale $HOME/.config/awesome/wallpaper.png")
-end
-
--- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
-screen.connect_signal("property::geometry", set_wallpaper)
-
-awful.screen.connect_for_each_screen(function(s)
-	-- Wallpaper
-	set_wallpaper(s)
-
-	-- Each screen has its own tag table.
-	awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[1])
-
-	-- Create a promptbox for each screen
-	s.mypromptbox = awful.widget.prompt()
-	-- Create an imagebox widget which will contain an icon indicating which layout we're using.
-	-- We need one layoutbox per screen.
-	s.mylayoutbox = awful.widget.layoutbox(s)
-	s.mylayoutbox:buttons(gears.table.join(
-		awful.button({}, 1, function()
-			awful.layout.inc(1)
-		end),
-		awful.button({}, 3, function()
-			awful.layout.inc(-1)
-		end),
-		awful.button({}, 4, function()
-			awful.layout.inc(1)
-		end),
-		awful.button({}, 5, function()
-			awful.layout.inc(-1)
-		end)
-	))
-	-- Create a taglist widget
-	s.mytaglist = awful.widget.taglist({
-		screen = s,
-		filter = awful.widget.taglist.filter.all,
-		buttons = taglist_buttons,
-	})
-
-	-- Create a tasklist widget
-	s.mytasklist = awful.widget.tasklist({
-		screen = s,
-		filter = awful.widget.tasklist.filter.currenttags,
-		buttons = tasklist_buttons,
-	})
-
-	-- Create the wibox
-	s.mywibox = awful.wibar({ position = "top", screen = s })
-
-	-- Add widgets to the wibox
-	s.mywibox:setup({
-		layout = wibox.layout.align.horizontal,
-		{ -- Left widgets
-			layout = wibox.layout.align.horizontal,
-			mylauncher,
-			s.mytaglist,
-			s.mypromptbox,
-		},
-		s.mytasklist, -- Middle widget
-		{ -- Right widgets
-			layout = wibox.layout.fixed.horizontal,
-			mytextclock,
-			--cpu_widget(),
-			--net_widget(),
-			--battery_widget(),
-			wibox.widget.systray(),
-			s.mylayoutbox,
-			--logout_menu_widget()
-		},
-	})
-end)
--- }}}
-
--- {{{ Mouse bindings
-root.buttons(gears.table.join(
-	--awful.button({ }, 3, function () mymainmenu:toggle() end),
-	awful.button({}, 4, awful.tag.viewnext),
-	awful.button({}, 5, awful.tag.viewprev)
-))
--- }}}
-
--- {{{ Key bindings
-globalkeys = gears.table.join(
-	awful.key({ modkey }, "s", hotkeys_popup.show_help, { description = "show help", group = "awesome" }),
-	awful.key({ modkey }, "Left", awful.tag.viewprev, { description = "view previous", group = "tag" }),
-	awful.key({ modkey }, "Right", awful.tag.viewnext, { description = "view next", group = "tag" }),
-	awful.key({ modkey }, "Escape", awful.tag.history.restore, { description = "go back", group = "tag" }),
-
-	-- Movement
-	awful.key({ modkey }, "j", function()
-		awful.client.focus.byidx(1)
-	end, { description = "focus next by index", group = "client" }),
-	awful.key({ modkey }, "k", function()
-		awful.client.focus.byidx(-1)
-	end, { description = "focus previous by index", group = "client" }),
-	awful.key({ modkey }, "h", function()
-		awful.screen.focus_relative(1)
-	end, { description = "focus the next screen", group = "screen" }),
-	awful.key({ modkey }, "l", function()
-		awful.screen.focus_relative(-1)
-	end, { description = "focus the previous screen", group = "screen" }),
-
-	-- Layout manipulation
-	awful.key({ modkey, "Shift" }, "h", function()
-		awful.client.swap.byidx(1)
-	end, { description = "swap with next client by index", group = "client" }),
-	awful.key({ modkey, "Shift" }, "l", function()
-		awful.client.swap.byidx(-1)
-	end, { description = "swap with previous client by index", group = "client" }),
-	awful.key({ modkey }, "u", awful.client.urgent.jumpto, { description = "jump to urgent client", group = "client" }),
-	awful.key({ modkey }, "Tab", function()
-		awful.client.focus.history.previous()
-		if client.focus then
-			client.focus:raise()
-		end
-	end, { description = "go back", group = "client" }),
-
-	-- Standard program
-	awful.key({ modkey }, "Return", function()
-		awful.spawn(terminal)
-	end, { description = "open a terminal", group = "launcher" }),
-	awful.key({ modkey, "Control" }, "r", awesome.restart, { description = "reload awesome", group = "awesome" }),
-
-	awful.key({ modkey, "Shift" }, "k", function()
-		awful.tag.incmwfact(0.05)
-	end, { description = "increase master width factor", group = "layout" }),
-	awful.key({ modkey, "Shift" }, "j", function()
-		awful.tag.incmwfact(-0.05)
-	end, { description = "decrease master width factor", group = "layout" }),
-
-	awful.key({ modkey, "Control" }, "j", function()
-		awful.tag.incnmaster(1, nil, true)
-	end, { description = "increase the number of master clients", group = "layout" }),
-	awful.key({ modkey, "Control" }, "k", function()
-		awful.tag.incnmaster(-1, nil, true)
-	end, { description = "decrease the number of master clients", group = "layout" }),
-
-	awful.key({ modkey, "Control" }, "h", function()
-		awful.tag.incncol(1, nil, true)
-	end, { description = "increase the number of columns", group = "layout" }),
-	awful.key({ modkey, "Control" }, "l", function()
-		awful.tag.incncol(-1, nil, true)
-	end, { description = "decrease the number of columns", group = "layout" }),
-
-	awful.key({ modkey }, "space", function()
-		awful.layout.inc(1)
-	end, { description = "select next", group = "layout" }),
-	awful.key({ modkey, "Shift" }, "space", function()
-		awful.layout.inc(-1)
-	end, { description = "select previous", group = "layout" }),
-
-	awful.key({ modkey, "Control" }, "n", function()
-		local c = awful.client.restore()
-		-- Focus restored client
-		if c then
-			c:emit_signal("request::activate", "key.unminimize", { raise = true })
-		end
-	end, { description = "restore minimized", group = "client" }),
-
-	-- Prompt
-	awful.key({ modkey }, "r", function()
-		awful.screen.focused().mypromptbox:run()
-	end, { description = "run prompt", group = "launcher" }),
-
-	awful.key({ modkey }, "x", function()
-		awful.prompt.run({
-			prompt = "Run Lua code: ",
-			textbox = awful.screen.focused().mypromptbox.widget,
-			exe_callback = awful.util.eval,
-			history_path = awful.util.get_cache_dir() .. "/history_eval",
-		})
-	end, { description = "lua execute prompt", group = "awesome" }),
-
-	-- Menubar
-	awful.key({ "Mod1" }, "space", function()
-		menubar.show()
-	end, { description = "show the menubar", group = "launcher" }),
-
-	-- XF86 functions
-	awful.key({}, "Print", function()
-		awful.util.spawn("flameshot gui")
-	end, { description = "take a screenshot", group = "xf86" }),
-	awful.key({}, "XF86MonBrightnessDown", function()
-		awful.util.spawn("light -U 10")
-	end, { description = "decrease backlight brightness", group = "xf86" }),
-	awful.key({}, "XF86MonBrightnessUp", function()
-		awful.util.spawn("light -A 10")
-	end, { description = "increase backlight brightness", group = "xf86" })
-)
-
-clientkeys = gears.table.join(
-	awful.key({ modkey }, "f", function(c)
-		c.fullscreen = not c.fullscreen
-		c:raise()
-	end, { description = "toggle fullscreen", group = "client" }),
-
-	awful.key({ modkey, "Shift" }, "q", function(c)
-		c:kill()
-	end, { description = "close", group = "client" }),
-
-	awful.key(
-		{ modkey, "Control" },
-		"space",
-		awful.client.floating.toggle,
-		{ description = "toggle floating", group = "client" }
-	),
-
-	awful.key({ modkey, "Control" }, "Return", function(c)
-		c:swap(awful.client.getmaster())
-	end, { description = "move to master", group = "client" }),
-
-	awful.key({ modkey }, "o", function(c)
-		c:move_to_screen()
-	end, { description = "move to screen", group = "client" }),
-
-	awful.key({ modkey }, "t", function(c)
-		c.ontop = not c.ontop
-	end, { description = "toggle keep on top", group = "client" }),
-
-	awful.key({ modkey }, "n", function(c)
-		-- The client currently has the input focus, so it cannot be
-		-- minimized, since minimized clients can't have the focus.
-		c.minimized = true
-	end, { description = "minimize", group = "client" }),
-	awful.key({ modkey }, "m", function(c)
-		c.maximized = not c.maximized
-		c:raise()
-	end, { description = "(un)maximize", group = "client" })
-)
-
--- Bind all key numbers to tags.
--- Be careful: we use keycodes to make it work on any keyboard layout.
--- This should map on the top row of your keyboard, usually 1 to 9.
-for i = 1, 9 do
-	globalkeys = gears.table.join(
-		globalkeys,
-		-- View tag only.
-		awful.key({ modkey }, "#" .. i + 9, function()
-			local screen = awful.screen.focused()
-			local tag = screen.tags[i]
-			if tag then
-				tag:view_only()
-			end
-		end, { description = "view tag #" .. i, group = "tag" }),
-		-- Toggle tag display.
-		awful.key({ modkey, "Control" }, "#" .. i + 9, function()
-			local screen = awful.screen.focused()
-			local tag = screen.tags[i]
-			if tag then
-				awful.tag.viewtoggle(tag)
-			end
-		end, { description = "toggle tag #" .. i, group = "tag" }),
-		-- Move client to tag.
-		awful.key({ modkey, "Shift" }, "#" .. i + 9, function()
-			if client.focus then
-				local tag = client.focus.screen.tags[i]
-				if tag then
-					client.focus:move_to_tag(tag)
-				end
-			end
-		end, { description = "move focused client to tag #" .. i, group = "tag" }),
-		-- Toggle tag on focused client.
-		awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9, function()
-			if client.focus then
-				local tag = client.focus.screen.tags[i]
-				if tag then
-					client.focus:toggle_tag(tag)
-				end
-			end
-		end, { description = "toggle focused client on tag #" .. i, group = "tag" })
-	)
-end
-
-clientbuttons = gears.table.join(
-	awful.button({}, 1, function(c)
-		c:emit_signal("request::activate", "mouse_click", { raise = true })
-	end),
-	awful.button({ modkey }, 1, function(c)
-		c:emit_signal("request::activate", "mouse_click", { raise = true })
-		awful.mouse.client.move(c)
-	end),
-	awful.button({ modkey }, 3, function(c)
-		c:emit_signal("request::activate", "mouse_click", { raise = true })
-		awful.mouse.client.resize(c)
-	end)
-)
-
--- Set keys
-root.keys(globalkeys)
-
--- Rules
--- Rules to apply to new clients (through the "manage" signal).
-awful.rules.rules = {
-	-- All clients will match this rule.
-	{
-		rule = {},
-		properties = {
-			border_width = beautiful.border_width,
-			border_color = beautiful.border_normal,
-			focus = awful.client.focus.filter,
-			raise = true,
-			keys = clientkeys,
-			buttons = clientbuttons,
-			screen = awful.screen.preferred,
-			placement = awful.placement.no_overlap + awful.placement.no_offscreen,
-		},
-	},
-}
-
--- Signals
--- Signal function to execute when a new client appears.
-client.connect_signal("manage", function(c)
-	-- Set the windows at the slave,
-	-- i.e. put it at the end of others instead of setting it master.
-	-- if not awesome.startup then awful.client.setslave(c) end
-
-	if awesome.startup and not c.size_hints.user_position and not c.size_hints.program_position then
-		-- Prevent clients from being unreachable after screen count changes.
-		awful.placement.no_offscreen(c)
-	end
-end)
-
--- Enable sloppy focus, so that focus follows mouse.
-client.connect_signal("mouse::enter", function(c)
-	c:emit_signal("request::activate", "mouse_enter", { raise = false })
-end)
-
-client.connect_signal("focus", function(c)
-	c.border_color = beautiful.border_focus
-end)
-client.connect_signal("unfocus", function(c)
-	c.border_color = beautiful.border_normal
-end)
diff --git a/users/rouven/modules/default.nix b/users/rouven/modules/default.nix
index 30111d9..742f592 100644
--- a/users/rouven/modules/default.nix
+++ b/users/rouven/modules/default.nix
@@ -3,16 +3,14 @@
   imports =
     [
       ./accounts
-      ./awesome
       ./alacritty
-      ./flameshot
+      ./flameshot # TODO fix
       ./fzf
       ./git
       ./gpg
       ./hyprland
-      ./kdeconnect
+      ./kdeconnect #TODO fix
       ./neovim
-      #./picom
       ./ssh
       ./tmux
       ./vifm
diff --git a/users/rouven/modules/picom/default.nix b/users/rouven/modules/picom/default.nix
deleted file mode 100644
index 5b5b1a1..0000000
--- a/users/rouven/modules/picom/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, ... }:
-{
-  services.picom = {
-    enable = true;
-    # more configuration can go here, but I have no need for it yet
-  };
-}