massive overhaul

23 files changed, 612 insertions, 1381 deletions

diff --git a/modules/desktop/apps/browsers/firefox.nix b/modules/desktop/apps/browsers/firefox.nix
new file mode 100644
index 0000000..3c647f1
--- /dev/null
+++ b/modules/desktop/apps/browsers/firefox.nix
@@ -0,0 +1,67 @@
+{
+    config,
+    options,
+    lib,
+    pkgs,
+    ...
+}: let
+    firefoxConf = config.modules.desktop.apps.browsers.firefox;
+    arkenfox = {
+        owner = "arkenfox";
+        repo = "user.js";
+        version = "117.0";
+    };
+in
+{
+    options.modules.desktop.apps.browsers.firefox = {
+        enable = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+    };
+    config = lib.mkIf (firefoxConf.enable) {
+        env.MOZ_DBUS_REMOTE = "1";
+        home.packages = [pkgs.xdg-utils];
+
+        home.manager.programs.firefox = {
+            enable = true;
+            package = pkgs.firefox;
+            profiles."default" = {
+                extraConfig = builtins.readFile
+            ( builtins.fetchTarball {
+                url = "https://github.com/${arkenfox.owner}/${arkenfox.repo}/archive/refs/tags/${arkenfox.version}.tar.gz";
+                sha256="1pll4fbdn2390n05902l3pkg4rizxghkakpzi1r9z1b7blmk1x4s";
+            } + "/user.js");
+                search = {
+                    force = true;
+                    default = "DuckDuckGo";
+                    engines = {
+                       "Nix Packages" = {
+                            urls = [{
+                                template = "https://search.nixos.org/packages";
+                                params = [
+                                    { name = "type"; value = "packages"; }
+                                    { name = "query"; value = "{searchTerms}"; }
+                                ];
+                            }];
+                            definedAliases = [ "@np" ];
+                        };
+                        "NixOS Wiki" = {
+                            urls = [{ template = "https://nixos.wiki/index.php?search={searchTerms}"; }];
+                            iconUpdateURL = "https://nixos.wiki/favicon.png";
+                            updateInterval = 24 * 60 * 60 * 1000;
+                            definedAliases = [ "@nw" ];
+                        };
+                    };
+                };
+            };
+        };
+
+        modules.desktop.defaultApplications.apps.browser = rec {
+            package = pkgs.firefox;
+            install = false;
+            cmd = "${package}/bin/firefox";
+            desktop = "firefox";
+        };
+    };
+}
diff --git a/modules/desktop/apps/editors/neovim.nix b/modules/desktop/apps/editors/neovim.nix
new file mode 100644
index 0000000..77857a2
--- /dev/null
+++ b/modules/desktop/apps/editors/neovim.nix
@@ -0,0 +1,42 @@
+{
+    config,
+    options,
+    lib,
+    pkgs,
+    ...
+}: let
+    nvimConf = config.modules.desktop.apps.editors.neovim;
+    configDir = config.nixosConfig.configDir;
+in {
+    options.modules.desktop.apps.editors.neovim = {
+        enable = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+    };
+    
+    config = lib.mkIf (nvimConf.enable) {
+
+    	home.manager.xdg.configFile."nvim/init.vim".source = "${configDir}/nvim/init.vim";
+    	home.manager.xdg.configFile."nvim/lua/init.lua".source = "${configDir}/nvim/init.lua";
+    	home.manager.xdg.configFile."nvim/lua/plugins.lua".source = "${configDir}/nvim/plugins.lua";
+
+        modules.desktop.defaultApplications.apps.editor = rec {
+            package = pkgs.neovim;
+            install = false;
+            cmd = "${package}/bin/nvim";
+            desktop = "nvim";
+        };
+
+        home.packages = [
+            
+        ];
+
+        home.manager.programs.neovim = {
+            enable = true;
+            viAlias = true;
+            vimAlias = true;
+            withNodeJs = true;
+        };
+    };
+}
diff --git a/modules/desktop/apps/flatpak.nix b/modules/desktop/apps/flatpak.nix
new file mode 100644
index 0000000..30e2363
--- /dev/null
+++ b/modules/desktop/apps/flatpak.nix
@@ -0,0 +1,21 @@
+{
+    config,
+    options,
+    lib,
+    pkgs,
+    ...
+}: let
+    flatpakConf = config.modules.desktop.apps.flatpak;
+    configDir = config.nixosConfig.configDir;
+in {
+    options.modules.desktop.apps.flatpak = {
+        enable = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+    };
+    
+    config = lib.mkIf (flatpakConf.enable) {
+        services.flatpak.enable = true;
+    };
+}
diff --git a/modules/desktop/apps/games/steam.nix b/modules/desktop/apps/games/steam.nix
new file mode 100644
index 0000000..50b5c62
--- /dev/null
+++ b/modules/desktop/apps/games/steam.nix
@@ -0,0 +1,34 @@
+{
+    config,
+    options,
+    lib,
+    pkgs,
+    ...
+}: let
+    gamesConf = config.modules.desktop.apps.games;
+    configDir = config.nixosConfig.configDir;
+in {
+    options.modules.desktop.apps.games = {
+        enable = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+        steam.enable = lib.mkOption {
+            type = lib.types.bool;
+            default = true;
+        };
+    };
+
+    config = lib.mkIf (gamesConf.enable) {
+        home.packages = [
+            pkgs.steam-run
+        ];
+
+        programs.steam = lib.mkIf (gamesConf.steam.enable) {
+            enable = true;
+            remotePlay.openFirewall = true;
+            dedicatedServer.openFirewall = true;
+            gamescopeSession.enable = true;
+        };
+    };
+}
diff --git a/modules/desktop/apps/mpd.nix b/modules/desktop/apps/mpd.nix
new file mode 100644
index 0000000..e7af8c3
--- /dev/null
+++ b/modules/desktop/apps/mpd.nix
@@ -0,0 +1,39 @@
+{
+    config,
+    options,
+    lib,
+    pkgs,
+    ...
+}: let
+    mpdConfig = config.modules.desktop.apps.mpd;
+in
+{
+    options.modules.desktop.apps.mpd = {
+        enable = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+    };
+
+    config = lib.mkIf (mpdConfig.enable) {
+        home.packages = [
+            pkgs.mpc-cli
+            pkgs.ncmpcpp
+        ];
+        
+        services.mpd = {
+            enable = true;
+            musicDirectory = /home/jon/mus;
+            extraConfig = ''
+audio_output {
+    type "pipewire"
+    name "Pipewire Output"
+}
+                          '';
+            user = "jon";
+        };
+        systemd.services.mpd.environment = {
+            XDG_RUNTIME_DIR = "/run/user/1000";
+        };
+    };
+}
diff --git a/modules/desktop/apps/mpv.nix b/modules/desktop/apps/mpv.nix
new file mode 100644
index 0000000..96f9c87
--- /dev/null
+++ b/modules/desktop/apps/mpv.nix
@@ -0,0 +1,29 @@
+{
+    config,
+    options,
+    lib,
+    pkgs,
+    ...
+}: let
+    mpvConfig = config.modules.desktop.apps.mpv;
+in
+{
+    options.modules.desktop.apps.mpv = {
+        enable = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+    };
+
+    config = lib.mkIf (mpvConfig.enable) {
+        home.packages = [
+            pkgs.mpv
+        ];
+        modules.desktop.defaultApplications.apps.video = rec {
+            package = pkgs.mpv;
+            install = false;
+            cmd = "${package}/bin/mpv";
+            desktop = "mpv";
+        };
+    };
+}
diff --git a/modules/desktop/apps/newsboat.nix b/modules/desktop/apps/newsboat.nix
new file mode 100644
index 0000000..e0980d0
--- /dev/null
+++ b/modules/desktop/apps/newsboat.nix
@@ -0,0 +1,27 @@
+{
+    config,
+    options,
+    lib,
+    pkgs,
+    ...
+}: let
+    newsboatConfig = config.modules.desktop.apps.newsboat;
+    defaultApps = config.modules.desktop.defaultApplications.apps;
+in
+{
+    options.modules.desktop.apps.newsboat = {
+        enable = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+    };
+
+    config = lib.mkIf (newsboatConfig.enable) {
+        home.manager.programs.newsboat = {
+            enable = true;
+            extraConfig = ''
+macro y set browser "${defaultApps.video.cmd} %u" ; open-in-browser ; set browser "${defaultApps.browser.cmd} %u"
+'';
+        };
+    };
+}
diff --git a/modules/desktop/apps/terminals/kitty.nix b/modules/desktop/apps/terminals/kitty.nix
new file mode 100644
index 0000000..b2339c9
--- /dev/null
+++ b/modules/desktop/apps/terminals/kitty.nix
@@ -0,0 +1,54 @@
+{
+    config,
+    options,
+    lib,
+    pkgs,
+    ...
+}: let
+    kittyConf = config.modules.desktop.apps.terminals.kitty;
+    configDir = config.nixosConfig.configDir;
+in {
+    options.modules.desktop.apps.terminals.kitty = {
+        enable = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+    };
+
+    config = lib.mkIf (kittyConf.enable) {
+        modules.desktop.defaultApplications.apps.terminal = rec {
+            package = pkgs.kitty;
+            install = false;
+            cmd = "${package}/bin/kitty";
+            desktop = "kitty";
+        };
+
+        home.manager.programs.kitty = {
+            enable = true;
+            font = {
+                name = "FiraCode Nerd Font";
+                size = 12;
+            };
+            settings = {
+                repaint_delay = 10;
+                input_delay = 3;
+                sync_to_monitor = true;
+                
+                remember_window_size = false;
+                initial_window_width = 640;
+                initial_window_height = 480;
+                enabled_layouts = "*";
+                
+                tab_bar_min_tabs = 2;
+                tab_bar_edge = "bottom";
+                tab_bar_style = "powerline";
+                tab_powerline_style = "slanted";
+                tab_title_template = "{title}{' :{}'.format(num_windows) if num_windows > 1 else ''}";
+
+                background_opacity = "0.8";
+            };
+	    extraConfig = ''include ./theme.conf'';
+        };
+	home.manager.xdg.configFile."kitty/theme.conf".source = "${configDir}/kitty/themes/mocha.conf";
+    };
+}
diff --git a/modules/desktop/awesome/default.nix b/modules/desktop/awesome/default.nix
deleted file mode 100644
index 1959770..0000000
--- a/modules/desktop/awesome/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ config, lib, pkgs, user, ... }:
-with lib;
-let
-    awesomeLuaModules = with pkgs.luaPackages; [
-        luarocks
-        luadbi-mysql
-    ];
-in
-{
-    options = {
-        awesome = {
-            enable = mkOption {
-                type = types.bool;
-                default = false;
-            };
-        };
-    };
-
-    config = mkIf (config.awesome.enable)
-    {
-        xserver.enable = true;
-        rofi.enable = true;
-
-        services.xserver = {
-            displayManager = {
-              sddm.enable = true;
-              defaultSession = "none+awesome";
-            };
-            windowManager.awesome = {
-                enable = true;
-                luaModules = awesomeLuaModules;
-            };
-        };
-
-        home-manager.users.${user} = {
-            xsession.windowManager = {
-                awesome = {
-                    enable = true;
-                    luaModules = awesomeLuaModules;
-                };
-            };
-
-            home.activation.installAwesomeWMConfig = ''
-if [ ! -d "$HOME/.config/awesome" ]; then
-    ln -s "/etc/nixos/modules/desktop/awesome" "$HOME/.config/awesome"
-    chmod -R +w "$HOME/.config/awesome"
-fi
-            '';
-        };
-    };
-}
diff --git a/modules/desktop/awesome/rc.lua b/modules/desktop/awesome/rc.lua
deleted file mode 100644
index 99abc89..0000000
--- a/modules/desktop/awesome/rc.lua
+++ /dev/null
@@ -1,750 +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")
-
-local xresources =      require("beautiful.xresources")
-local dpi =             xresources.apply_dpi
-
--- Standard awesome library
-local gears =           require("gears")
-local awful =           require("awful")
-require("awful.autofocus")
-
--- Widget and layout library
-local wibox =           require("wibox")
-
--- Theme handling library
-local beautiful =       require("beautiful")
-
--- Notification library
-local naughty =         require("naughty")
-local menubar =         require("menubar")
-local hotkeys_popup =   require("awful.hotkeys_popup")
-
--- Scratch pad
-local scratch =         require("scratch")
-
--- Enable hotkeys help widget for VIM and other apps
--- when client with a matching name is opened:
-require("awful.hotkeys_popup.keys")
-
--- {{{ Error handling
--- Check if awesome encountered an error during startup and fell back to
--- another config (This code will only ever execute for the fallback config)
-if awesome.startup_errors then
-    naughty.notify({ preset = naughty.config.presets.critical,
-                     title = "Oops, there were errors during startup!",
-                     text = awesome.startup_errors })
-end
-
--- 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(os.getenv("HOME") .. "/.config/awesome/theme.lua")
-
-local update_taglist = function(item, tag, index)
-    if tag.selected then
-        item:get_children_by_id('shape_role')[1].bg = beautiful.tag_list_focused
-    elseif tag.urgent then
-        item:get_children_by_id('shape_role')[1].bg = beautiful.tag_list_urgent
-    elseif #tag:clients() > 0 then
-        item:get_children_by_id('shape_role')[1].bg = beautiful.tag_list_occupied
-    else
-        item:get_children_by_id('shape_role')[1].bg = beautiful.tag_list_empty
-    end
-end
-
--- This is used later as the default terminal and editor to run.
-terminal = "kitty"
-webbrowser = "firefox"
-editor = os.getenv("EDITOR") or "nvim"
-editor_cmd = terminal .. " -e " .. editor
-
--- Default modkey.
--- Usually, Mod4 is the key with a logo between Control and Alt.
--- If you do not like this or do not have such a key,
--- I suggest you to remap Mod4 to another key using xmodmap or other tools.
--- However, you can use another modifier like Mod1, but it may interact with others.
-modkey = "Mod4"
-
--- Table of layouts to cover with awful.layout.inc, order matters.
-awful.layout.layouts = {
-    awful.layout.suit.floating,
-    awful.layout.suit.tile,
-    -- awful.layout.suit.tile.left,
-    -- awful.layout.suit.tile.bottom,
-    -- awful.layout.suit.tile.top,
-    -- awful.layout.suit.fair,
-    -- awful.layout.suit.fair.horizontal,
-    -- awful.layout.suit.spiral,
-    -- awful.layout.suit.spiral.dwindle,
-    awful.layout.suit.max,
-    awful.layout.suit.max.fullscreen,
-    -- awful.layout.suit.magnifier,
-    -- awful.layout.suit.corner.nw,
-    -- awful.layout.suit.corner.ne,
-    -- awful.layout.suit.corner.sw,
-    -- awful.layout.suit.corner.se,
-}
--- }}}
-
--- {{{ 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 },
-}
-
-mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
-                                    { "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
-toptextclock = wibox.widget.textclock()
---toptextclock = wibox.widget {
---    {
---        widget = wibox.widget.textclock
---    },
---    bg = beautiful.bg_normal,
---    widget = wibox.container.background,
---    shape = gears.shape.rounded_rect
---}
-
-local calendar_widget = require("widgets.calendar")
-local topcalendar = calendar_widget()
-
-local volume_widget = require("widgets.volume")
-local volumebar = volume_widget()
-
-local mpd_widget = require("widgets.mpd")
-local mpdbar = mpd_widget()
-
-toptextclock:connect_signal("button::press",
-function(_, _, _, button)
-    if button == 1 then topcalendar.toggle() end
-end)
-
--- 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
-    if beautiful.wallpaper then
-        local wallpaper = beautiful.wallpaper
-        -- If wallpaper is a function, call it with the screen
-        if type(wallpaper) == "function" then
-            wallpaper = wallpaper(s)
-        end
-        gears.wallpaper.maximized(wallpaper, s, true)
-    end
-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,
-        style = {
-            shape = gears.shape.powerline
-        },
-        widget_template = {
-            {
-                {
-                    {
-                        left = 8,
-                        right = 8,
-                        top = 8,
-                        bottom = 8,
-                        widget = wibox.container.margin
-                    },
-                    id = "shape_role",
-                    bg =    beautiful.bg_normal,
-                    shape_border_width = 1,
-                    shape_border_color = beautiful.fg_minimize,
-                    shape = gears.shape.circle,
-                    widget = wibox.container.background,
-                },
-                left = 4,
-                right = 4,
-                widget = wibox.container.margin
-            },
-            widget = wibox.container.background,
-            create_callback = function(self, tag, index, objects)
-                self.align = "left"
-                self.valign = "center"
-                self.font = beautiful.taglist_text_font
-
-                update_taglist(self, tag, index)
-
-                self:connect_signal('mouse:enter', function()
-                    if self.bg ~= beautiful.bg_focused then
-                        self.backup = self.bg
-                        self.has_backup = true
-                    end
-                    self.bg = bg_focused
-                end)
-
-                self:connect_signal('mouse::leave', function()
-                    if self.has_backup then self.bg = self.backup end
-                end)
-
-            end,
-            update_callback = function(self, tag, index, objects)
-                update_taglist(self, tag, index)
-            end,
-        },
-        buttons = taglist_buttons
-    }
-
-    -- Create a tasklist widget
-    s.mytasklist = awful.widget.tasklist {
-        screen  = s,
-        filter  = awful.widget.tasklist.filter.currenttags,
-        buttons = tasklist_buttons,
-        style   = {
-            shape = gears.shape.rectangle
-        },
-        layout  = {
-            spacing = 4,
-            layout = wibox.layout.flex.horizontal
-        },
-        widget_template = 
-        {
-            {
-                layout = wibox.layout.fixed.horizontal,
-                {
-                    {
-                        id = "clienticon",
-                        widget = awful.widget.clienticon,
-                    },
-                    widget = wibox.container.margin,
-                    margins = 4
-                },
-                {
-                    {
-                        id = "text_role",
-                        widget = wibox.widget.textbox
-                    },
-                    widget = wibox.container.margin,
-                    margins = 4,
-                },
-            },
-            id = "background_role",
-            widget = wibox.container.background,
-            create_callback = function(self, c, index, objects)
-                self:get_children_by_id("clienticon")[1].client = c
-            end,
-        }
-    }
-
-    -- Create the wibox
-    s.mywibox = awful.wibar({ position = "top", screen = s, bg = "#00000000", border_width = 8,})
-
-    s.systray = wibox.widget.systray()
-    s.systray.visible = true
-
-    -- Add widgets to the wibox
-    s.mywibox:setup {
-        layout = wibox.layout.align.horizontal,
-        expand = "none",
-        { -- Left widgets
-            layout = wibox.layout.fixed.horizontal,
-            s.mytaglist,
-            s.mypromptbox,
-        },
-        s.mytasklist, -- Middle widget
-        { -- Right widgets
-            volumebar,
-            toptextclock,
-            wibox.container.margin(s.mylayoutbox, 4, 4, 4, 4),
-            wibox.container.margin(s.systray, 4, 4, 4, 4),
-            layout = wibox.layout.fixed.horizontal
-        },
-    }
-end)
--- }}}
-
-local mpd_dock = wibox {
-    visible = true,
-    ontop = false,
-    height = 24,
-    width = 300,
-    bg = "00000000"
-}
-
-mpd_dock:setup {
-    mpdbar,
-    halign = "center",
-    layout = wibox.container.place
-}
-
-awful.placement.top_right(mpd_dock, { margins = { top = 42, right = 8 }, parent = awful.screen.focused() })
-
--- {{{ 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"}),
-
-    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"}
-    ),
-
-    -- Layout manipulation
-    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end,
-              {description = "swap with next client by index", group = "client"}),
-    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx( -1)    end,
-              {description = "swap with previous client by index", group = "client"}),
-    awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end,
-              {description = "focus the next screen", group = "screen"}),
-    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end,
-              {description = "focus the previous screen", group = "screen"}),
-    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,           }, "w", function () awful.spawn(webbrowser) end,
-              {description = "open the web browser", group = "launcher"}),
-    awful.key({ modkey,           }, "`", function() scratch.toggle("kitty --name scratch-terminal",
-                                                         { instance = "scratch-terminal" }) end,
-              {description = "spawn a terminal scratch-pad", group = "launcher"}),
-    awful.key({ modkey }, "d", function() awful.spawn("rofi -show drun") end,
-              {description = "show the menubar", group = "launcher"}),
-
-    awful.key({ modkey, "Control" }, "r", awesome.restart,
-              {description = "reload awesome", group = "awesome"}),
-    awful.key({ modkey, "Shift"   }, "q", awesome.quit,
-              {description = "quit awesome", group = "awesome"}),
-
-    awful.key({ modkey,           }, "l",     function () awful.tag.incmwfact( 0.05)          end,
-              {description = "increase master width factor", group = "layout"}),
-    awful.key({ modkey,           }, "h",     function () awful.tag.incmwfact(-0.05)          end,
-              {description = "decrease master width factor", group = "layout"}),
-    awful.key({ modkey, "Shift"   }, "h",     function () awful.tag.incnmaster( 1, nil, true) end,
-              {description = "increase the number of master clients", group = "layout"}),
-    awful.key({ modkey, "Shift"   }, "l",     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"})
-)
-
-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   }, "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"}),
-    awful.key({ modkey, "Control" }, "m",
-        function (c)
-            c.maximized_vertical = not c.maximized_vertical
-            c:raise()
-        end ,
-        {description = "(un)maximize vertically", group = "client"}),
-    awful.key({ modkey, "Shift"   }, "m",
-        function (c)
-            c.maximized_horizontal = not c.maximized_horizontal
-            c:raise()
-        end ,
-        {description = "(un)maximize horizontally", 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
-     }
-    },
-
-    -- Floating clients.
-    { rule_any = {
-        instance = {
-          "DTA",  -- Firefox addon DownThemAll.
-          "copyq",  -- Includes session name in class.
-          "pinentry",
-          "scratch-terminal",
-        },
-        class = {
-          "Arandr",
-          "Blueman-manager",
-          "Gpick",
-          "Kruler",
-          "MessageWin",  -- kalarm.
-          "Sxiv",
-          "Tor Browser", -- Needs a fixed window size to avoid fingerprinting by screen size.
-          "Wpa_gui",
-          "veromix",
-          "xtightvncviewer"},
-
-        -- Note that the name property shown in xprop might be set slightly after creation of the client
-        -- and the name shown there might not match defined rules here.
-        name = {
-          "Event Tester",  -- xev.
-        },
-        role = {
-          "AlarmWindow",  -- Thunderbird's calendar.
-          "ConfigManager",  -- Thunderbird's about:config.
-          "pop-up",       -- e.g. Google Chrome's (detached) Developer Tools.
-        }
-      }, properties = { floating = true }},
-
-    -- Add titlebars to normal clients and dialogs
-    { rule_any = {type = { "normal", "dialog" }
-      }, properties = { titlebars_enabled = true }
-    },
-
-    -- Set Firefox to always map on the tag named "2" on screen 1.
-    -- { rule = { class = "Firefox" },
-    --   properties = { screen = 1, tag = "2" } },
-}
--- }}}
-
--- {{{ 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)
-
--- Add a titlebar if titlebars_enabled is set to true in the rules.
-client.connect_signal("request::titlebars", function(c)
-    -- buttons for the titlebar
-    local buttons = gears.table.join(
-        awful.button({ }, 1, function()
-            c:emit_signal("request::activate", "titlebar", {raise = true})
-            awful.mouse.client.move(c)
-        end),
-        awful.button({ }, 3, function()
-            c:emit_signal("request::activate", "titlebar", {raise = true})
-            awful.mouse.client.resize(c)
-        end)
-    )
-
-    awful.titlebar(c, {size = dpi(6), position = "top"}) : setup {
-        layout = wibox.layout.align.horizontal
-    }
-    awful.titlebar(c, {size = dpi(6), position = "bottom"}) : setup {
-        layout = wibox.layout.align.horizontal
-    }
-    awful.titlebar(c, {size = dpi(6), position = "right"}) : setup {
-        layout = wibox.layout.align.vertical
-    }
-    awful.titlebar(c, {size = dpi(26), position = "left"}) : setup {
-        { -- Left
-            awful.titlebar.widget.iconwidget(c),
-            widget = wibox.container.margin,
-            top = dpi(6),
-            bottom = dpi(6),
-            buttons = buttons,
-            layout  = wibox.layout.fixed.vertical,
-        },
-        { -- Middle
---          { -- Title
---              align  = "center",
---              widget = awful.titlebar.widget.titlewidget(c)
---          },
-            buttons = buttons,
-            layout  = wibox.layout.flex.horizontal
-        },
-        { -- Right
-            {
-                {
-                    {
-                        widget = awful.titlebar.widget.maximizedbutton(c),
-                    },
-                    widget = wibox.container.background,
-                    ontop = true,
-                    shape = gears.shape.circle,
-                    shape_border_width = 1,
-                    shape_border_color = "#12ac28",
-                    bg = "#28c940",
-                    forced_height = dpi(14),
-                    forced_width = dpi(14),
-                },
-                {
-                    {
-                        widget = awful.titlebar.widget.closebutton(c),
-                    },
-                    widget = wibox.container.background,
-                    ontop = true,
-                    shape = gears.shape.circle,
-                    shape_border_width = 1,
-                    shape_border_color = "#ad3934",
-                    bg = "#bf4943",
-                    forced_height = dpi(14),
-                    forced_width = dpi(14),
-                },
-                spacing = dpi(6),
-                layout = wibox.layout.fixed.vertical
-            },
-            widget = wibox.container.margin;
-            top = dpi(6);
-        },
-        layout = wibox.layout.align.vertical
-    }
-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/modules/desktop/awesome/scratch.lua b/modules/desktop/awesome/scratch.lua
deleted file mode 100644
index aa1fd1e..0000000
--- a/modules/desktop/awesome/scratch.lua
+++ /dev/null
@@ -1,54 +0,0 @@
-local client = client
-
-local awful = require("awful")
-local util = require("awful.util")
-
-local scratch = {}
-
-local function activate(c)
-    local ctag = awful.tag.selected(c.screen)
-    ctags = {ctag}
-    for k,tag in pairs(c:tags()) do
-        if tag ~= ctag then table.insert(ctags, tag) end
-    end
-    c:tags(ctags)
-    c:raise()
-    client.focus = c
-end
-
-local function deactivate(c)
-    local ctag = awful.tag.selected(c.screen)
-    ctags = {}
-    for k,tag in pairs(c:tags()) do
-        if tag ~= ctag then table.insert(ctags, tag) end
-    end
-    c:tags(ctags)
-end
-
-function scratch.raise(cmd, rule)
-    local rule = rule or { instance = "scratch" }
-    local function match(c) return awful.rules.match(c, rule) end
-
-    local clients = client.get()
-    local findex = util.table.hasitem(clients, client.focus) or 1
-    local start = util.cycle(#clients, findex + 1)
-
-    for c in awful.client.iterate(match, start) do
-        activate(c)
-        return
-    end
-    
-    util.spawn(cmd)
-end
-
-function scratch.toggle(cmd, rule)
-    local rule = rule or { instance = "scratch" }
-
-    if client.focus and awful.rules.match(client.focus, rule) then
-        deactivate(client.focus)
-    else
-        scratch.raise(cmd)
-    end
-end
-
-return scratch
diff --git a/modules/desktop/awesome/theme.lua b/modules/desktop/awesome/theme.lua
deleted file mode 100644
index 401eebb..0000000
--- a/modules/desktop/awesome/theme.lua
+++ /dev/null
@@ -1,137 +0,0 @@
----------------------------
--- Default awesome theme --
----------------------------
-
-local theme_assets = require("beautiful.theme_assets")
-local xresources = require("beautiful.xresources")
-local dpi = xresources.apply_dpi
-
-local gfs = require("gears.filesystem")
-local themes_path = gfs.get_themes_dir()
-
-local theme = {}
-
-theme.font          = "FiraCode Nerd Font 10"
-
-theme.bg_normal     = "#1e1e2e88"
-theme.bg_minimize   = theme.bg_normal
-theme.bg_focus      = "#2e2e3e88"
-theme.bg_urgent     = "#4e4e5e88"
-theme.bg_systray    = theme.bg_normal
-
-theme.fg_minimize   = "#45475A"
-theme.fg_normal     = "#cdd6f4"
-theme.fg_focus      = "#cdd6f4"
-theme.fg_urgent     = "#f38ba8"
-
-theme.tag_list_empty    = "#45475A"
-theme.tag_list_occupied = "#767d98"
-theme.tag_list_focused  = "#cdd6f4"
-theme.tag_list_urgent   = "#f38ba8"
-
-theme.useless_gap   = dpi(4)
-theme.border_width  = dpi(0)
-theme.border_normal = theme.bg_normal
-theme.border_focus  = theme.bg_normal
-theme.border_marked = theme.bg_normal
-
--- There are other variable sets
--- overriding the default one when
--- defined, the sets are:
--- taglist_[bg|fg]_[focus|urgent|occupied|empty|volatile]
--- tasklist_[bg|fg]_[focus|urgent]
--- titlebar_[bg|fg]_[normal|focus]
--- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
--- mouse_finder_[color|timeout|animate_timeout|radius|factor]
--- prompt_[fg|bg|fg_cursor|bg_cursor|font]
--- hotkeys_[bg|fg|border_width|border_color|shape|opacity|modifiers_fg|label_bg|label_fg|group_margin|font|description_font]
--- Example:
---theme.taglist_bg_focus = "#ff0000"
-
--- Generate taglist squares:
-local taglist_square_size = dpi(4)
-theme.taglist_squares_sel = theme_assets.taglist_squares_sel(
-    taglist_square_size, theme.fg_normal
-)
-theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
-    taglist_square_size, theme.fg_normal
-)
-
--- Variables set for theming notifications:
--- notification_font
--- notification_[bg|fg]
--- notification_[width|height|margin]
--- notification_[border_color|border_width|shape|opacity]
-
--- Variables set for theming the menu:
--- menu_[bg|fg]_[normal|focus]
--- menu_[border_color|border_width]
-theme.menu_submenu_icon = themes_path.."zenburn/submenu.png"
-theme.menu_height = dpi(15)
-theme.menu_width  = dpi(100)
-
--- You can add as many variables as
--- you wish and access them by using
--- beautiful.variable in your rc.lua
---theme.bg_widget = "#cc0000"
-
--- Define the image to load
-
-theme.titlebar_close_button_normal = themes_path.."zenburn/titlebar/close_normal.png"
-theme.titlebar_close_button_focus  = themes_path.."zenburn/titlebar/close_focus.png"
-
-theme.titlebar_minimize_button_normal = themes_path.."zenburn/titlebar/minimize_normal.png"
-theme.titlebar_minimize_button_focus  = themes_path.."zenburn/titlebar/minimize_focus.png"
-
-theme.titlebar_ontop_button_normal_inactive = themes_path.."zenburn/titlebar/ontop_normal_inactive.png"
-theme.titlebar_ontop_button_focus_inactive  = themes_path.."zenburn/titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_active = themes_path.."zenburn/titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_active  = themes_path.."zenburn/titlebar/ontop_focus_active.png"
-
-theme.titlebar_sticky_button_normal_inactive = themes_path.."zenburn/titlebar/sticky_normal_inactive.png"
-theme.titlebar_sticky_button_focus_inactive  = themes_path.."zenburn/titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_active = themes_path.."zenburn/titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_active  = themes_path.."zenburn/titlebar/sticky_focus_active.png"
-
-theme.titlebar_floating_button_normal_inactive = themes_path.."zenburn/titlebar/floating_normal_inactive.png"
-theme.titlebar_floating_button_focus_inactive  = themes_path.."zenburn/titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_active = themes_path.."zenburn/titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_active  = themes_path.."zenburn/titlebar/floating_focus_active.png"
-
-theme.titlebar_maximized_button_normal_inactive = themes_path.."zenburn/titlebar/maximized_normal_inactive.png"
-theme.titlebar_maximized_button_focus_inactive  = themes_path.."zenburn/titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_active = themes_path.."zenburn/titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_active  = themes_path.."zenburn/titlebar/maximized_focus_active.png"
-
-theme.wallpaper = themes_path.."zenburn/zenburn-background.png"
-
--- You can use your own layout icons like this:
---theme.layout_fairh = themes_path.."zenburn/layouts/fairhw.png"
---theme.layout_fairv = themes_path.."zenburn/layouts/fairvw.png"
-theme.layout_floating  = themes_path.."default/layouts/floatingw.png"
---theme.layout_magnifier = themes_path.."zenburn/layouts/magnifierw.png"
-theme.layout_max = themes_path.."default/layouts/maxw.png"
---theme.layout_fullscreen = themes_path.."zenburn/layouts/fullscreenw.png"
---theme.layout_tilebottom = themes_path.."zenburn/layouts/tilebottomw.png"
---theme.layout_tileleft   = themes_path.."zenburn/layouts/tileleftw.png"
-theme.layout_tile = themes_path.."default/layouts/tilew.png"
---theme.layout_tiletop = themes_path.."zenburn/layouts/tiletopw.png"
---theme.layout_spiral  = themes_path.."zenburn/layouts/spiralw.png"
---theme.layout_dwindle = themes_path.."zenburn/layouts/dwindlew.png"
---theme.layout_cornernw = themes_path.."zenburn/layouts/cornernww.png"
---theme.layout_cornerne = themes_path.."zenburn/layouts/cornernew.png"
---theme.layout_cornersw = themes_path.."zenburn/layouts/cornersww.png"
---theme.layout_cornerse = themes_path.."zenburn/layouts/cornersew.png"
-
--- Generate Awesome icon:
-theme.awesome_icon = theme_assets.awesome_icon(
-    theme.menu_height, theme.bg_focus, theme.fg_focus
-)
-
--- Define the icon theme for application icons. If not set then the icons
--- from /usr/share/icons and /usr/share/icons/hicolor will be used.
-theme.icon_theme = nil
-
-return theme
-
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/modules/desktop/awesome/widgets/calendar.lua b/modules/desktop/awesome/widgets/calendar.lua
deleted file mode 100644
index 6e791b3..0000000
--- a/modules/desktop/awesome/widgets/calendar.lua
+++ /dev/null
@@ -1,115 +0,0 @@
-local awful = require("awful")
-local beautiful = require("beautiful")
-local wibox = require("wibox")
-local gears = require("gears")
-
-local calendar_widget = {}
-
-local function worker(user_args)
-    local args = user_args or {}
-
-    local style = {}
-
-    style.month = {
-        padding = 4,
-        bg_color = beautiful.bg_normal,
-        border_width = 0
-    }
-
-    style.normal = {
-        markup = function(t) return t end,
-        shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 4) end,
-    }
-    
-    style.focused = {
-        bg_color = beautiful.bg_focus,
-        fg_color = beautiful.fg_focus,
-        markup = function(t) return '<b>' .. t .. '</b>' end,
-        shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 4) end,
-    }
-
-    style.header = {
-        bg_color = beautiful.bg_focus,
-        fg_color = beautiful.fg_focus,
-        markup = function(t) return '<b>'..t..'</b>' end,
-    }
-
-    style.weekday = {
-        bg_color = beautiful.bg_focus,
-        fg_color = beautiful.fg_focus,
-        markup = function(t) return '<b>'..t..'</b>' end,
-    }
-
-    local function decorate(widget, flag, date)
-        if flag == 'monthheader' then flag = 'header' end
-        if flag == 'focus' then
-            local today = os.date('*t')
-            if not today.month == date.month and today.year == date.year then
-                flag = 'normal'
-            end
-        end
-        local properties = style[flag] or {}
-        if properties.markup and widget.get_text and widget.set_markup then
-            widget:set_markup(properties.markup(widget:get_text()))
-        end
-        local thisdate = { year = date.year, month = (date.month or 1), day = (date.day or 1) }
-        local weekday = tonumber(os.date('%w', os.time(d)))
-        local default_bg = (weekday == 0 or weekday == 6)
-                           and beautiful.bg_focused
-                           or beautiful.bg_normal
-        return wibox.widget {
-            {
-                {
-                    widget,
-                    halign = 'center',
-                    widget = wibox.container.place
-                },
-                margins = (properties.padding or 2) + (properties.border_width or 0),
-                widget = wibox.container.margin
-            },
-            shape = properties.shape,
-            shape_border_color = properties.border_color or '#00000000',
-            shape_border_width = properties.border_width or 0,
-            fg = properties.fg_color or beautiful.fg_normal,
-            bg = properties.bg_color or beautiful.bg_normal,
-            widget = wibox.container.background
-        }
-    end
-
-    local cal = wibox.widget {
-        date = os.date('*t'),
-        font = beautiful.get_font(),
-        fn_embed = decorate,
-        long_weekdays = true,
-        start_sunday = true,
-        widget = wibox.widget.calendar.month
-    }
-
-    local popup = awful.popup {
-        ontop = true,
-        visible = false,
-        shape = gears.shape.rounded_rect,
-        offset = { y = 5 },
-        border_width = 2,
-        border_color = beautiful.fg_minimize,
-        widget = cal
-    }
-
-    function calendar_widget.toggle()
-        if popup.visible then
-            cal:set_date(nil)
-            cal:set_date(os.date('*t'))
-            popup:set_widget(nil)
-            popup:set_widget(cal)
-            popup.visible = not popup.visible
-        else
-            awful.placement.top_right(popup, { margins = { top = 30, right = 10 }, parent = awful.screen.focused() })
-            popup.visible = true
-        end
-    end
-    return calendar_widget
-end
-
-return setmetatable(calendar_widget, { __call = function(_, ...)
-    return worker(...)
-end})
diff --git a/modules/desktop/awesome/widgets/mpd.lua b/modules/desktop/awesome/widgets/mpd.lua
deleted file mode 100644
index d588089..0000000
--- a/modules/desktop/awesome/widgets/mpd.lua
+++ /dev/null
@@ -1,86 +0,0 @@
-local awful = require("awful")
-local spawn = require("awful.spawn")
-local watch = require("awful.widget.watch")
-local beautiful = require("beautiful")
-local wibox = require("wibox")
-local gears = require("gears")
-local naughty = require("naughty")
-
-local mpd_widget = {}
-
-local MUSIC_ICON = ' '
-local OFF_ICON = '󰝛 '
-
-local PLAY_ICON = ' '
-local PAUSE_ICON = ' '
-
-local PREV_ICON = ' '
-local NEXT_ICON = ' '
-
-local function worker(user_args)
-    local mpd_bar = wibox.widget {
-        {
-            id = "progress",
-            widget = wibox.widget.progressbar,
-            max_value = 1,
-            forced_height = 12,
-            forced_width = 150,
-            border_width = 0,
-            color = beautiful.bg_focus,
-            background_color = beautiful.bg_normal,
-        },
-        {
-            id = "title",
-            widget = wibox.widget.textbox,
-            text = "NO SONG",
-            valign = "center",
-            halign = "center",
-        },
-        layout = wibox.layout.stack
-    }
-
-    local status_icon = wibox.widget {
-        id = "status",
-        widget = wibox.widget.textbox,
-        text = PLAY_ICON
-    }
-
-    local update = function(widget, stdout, _, _, _)
-        local current_song = string.gmatch(stdout, "[^\r\n]+")()
-        stdout = string.gsub(stdout, "\n", "")
-        local mpd_percent = string.match(stdout, "(%d%d)%%")
-        local mpd_status = string.match(stdout, "%[(%a+)%]")
-
-        widget:get_children_by_id("title")[1].text = current_song
-        widget:get_children_by_id("progress")[1].value = tonumber(mpd_percent)/100
-
-        if mpd_status == "playing" then
-            status_icon.text = PLAY_ICON
-        elseif mpd_status == "paused" then
-            status_icon.text = PAUSE_ICON
-        end
-    end
-
-    mpd_bar:connect_signal("button::press", function(_, _, _, button)
-        if button == 1 then awful.spawn("mpc toggle", false)
-        elseif button == 3 then awful.spawn("kitty -e ncmpcpp", false)
-        elseif button == 4 then awful.spawn("mpc next", false)
-        elseif button == 5 then awful.spawn("mpc prev", false)
-        end
-    end)
-
-    watch("mpc status", 1, update, mpd_bar)
-
-    mpd_widget = wibox.widget {
-        status_icon,
-        mpd_bar,
-        layout = wibox.layout.align.horizontal,
-        spacing = 8,
-    }
-
-    return mpd_widget
-end
-
-return setmetatable(mpd_widget, { __call = function(_, ...)
-    return worker(...)
-end})
diff --git a/modules/desktop/awesome/widgets/volume.lua b/modules/desktop/awesome/widgets/volume.lua
deleted file mode 100644
index 21c200b..0000000
--- a/modules/desktop/awesome/widgets/volume.lua
+++ /dev/null
@@ -1,60 +0,0 @@
-local awful = require("awful")
-local spawn = require("awful.spawn")
-local watch = require("awful.widget.watch")
-local beautiful = require("beautiful")
-local wibox = require("wibox")
-local gears = require("gears")
-local naughty = require("naughty")
-
-local volume_widget = {}
-
-local get_volume_cmd = "bash -c 'wpctl get-volume @DEFAULT_AUDIO_SINK@'"
-
-local function worker(user_args)
-    local volume_bar = wibox.widget {
-        bar_shape = gears.shape.rounded_rect,
-        bar_height = 4,
-        bar_color = beautiful.fg_focus,
-        handle_color = beautiful.fg_focus,
-        handle_shape = gears.shape.circle,
-        handle_border_width = 0,
-        value = 0,
-        forced_width = 50,
-        widget = wibox.widget.slider,           
-    }
-
-    volume_widget = wibox.widget {
-        {
-            layout = wibox.layout.fixed.horizontal,
-            {
-                text = "󰕾 ",
-                widget = wibox.widget.textbox
-            },
-            volume_bar,
-            spacing = 4
-        },
-        widget = wibox.container.margin,
-        left = 8,
-    }
-
-    local function percentage(value)
-        return math.floor(value)
-    end
-
-    watch(get_volume_cmd, 1,
-    function(widget, stdout)
-        volume = stdout:match('0.%d+')
-        widget.value = tonumber(volume) * 100
-    end, volume_bar)
-
-    volume_bar:connect_signal("property::value",
-    function(self)
-        spawn.easy_async("bash -c 'wpctl set-volume @DEFAULT_AUDIO_SINK@ " .. self.value .. "%'", function() end)
-    end)
-    
-    return volume_widget
-end
-
-return setmetatable(volume_widget, { __call = function(_, ...)
-    return worker(...)
-end})
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
deleted file mode 100644
index 546d7de..0000000
--- a/modules/desktop/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-    ./xserver
-    ./awesome
-    ./hyprland
-    ./picom.nix
-    ./rofi.nix
-]
diff --git a/modules/desktop/defaults.nix b/modules/desktop/defaults.nix
new file mode 100644
index 0000000..2cf4a46
--- /dev/null
+++ b/modules/desktop/defaults.nix
@@ -0,0 +1,44 @@
+{
+    config,
+    options,
+    lib,
+    pkgs,
+    ...
+}: let
+    defaultApps = config.modules.desktop.defaultApplications;
+in {
+    options.modules.desktop.defaultApplications = {
+        enable = lib.mkOption {
+            type = lib.types.bool;
+            default = true;
+        };
+        apps = lib.mkOption {
+            type = lib.types.attrsOf (lib.types.submodule ({name, ...}: {
+                options = {
+                    package = lib.mkOption {type = lib.types.package;};
+                    install = lib.mkOption {type = lib.types.bool; default = true;};
+                    cmd = lib.mkOption {type = lib.types.path;};
+                    desktop = lib.mkOption {type = lib.types.str;};
+                };
+            }));
+        };
+    };
+
+    config = lib.mkIf (defaultApps.enable) {
+        modules.desktop.apps.terminals.kitty.enable = true;
+        modules.desktop.apps.editors.neovim.enable = true;
+        modules.desktop.apps.mpv.enable = true;
+
+        env = {
+            EDITOR = defaultApps.apps.editor.desktop;
+            TERM = defaultApps.apps.terminal.desktop;
+            VIDEO = defaultApps.apps.video.desktop;
+        };
+
+        home.packages = lib.filter (elem: elem != null) (lib.mapAttrsToList (name: value:
+            if value.install
+            then value.package
+            else null)
+        defaultApps.apps);
+    };
+}
diff --git a/modules/desktop/greetd.nix b/modules/desktop/greetd.nix
new file mode 100644
index 0000000..f9b6f90
--- /dev/null
+++ b/modules/desktop/greetd.nix
@@ -0,0 +1,22 @@
+{
+    config,
+    options,
+    lib,
+    pkgs,
+    ...
+}: let
+    greetdConf = config.modules.desktop.greetd;
+in {
+    options.modules.desktop.greetd = {
+        enable = lib.mkOption {
+            type = lib.types.bool;
+            default = true;
+        };
+    };
+
+    config = lib.mkIf (greetdConf.enable) {
+        services.greetd = {
+            enable = true;
+        };
+    };
+}
diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix
new file mode 100644
index 0000000..0440453
--- /dev/null
+++ b/modules/desktop/hyprland.nix
@@ -0,0 +1,233 @@
+{
+    config,
+    options,
+    lib,
+    pkgs,
+    ...
+}: let
+    hyprlandConf = config.modules.desktop.hyprland;
+    device = config.modules.device;
+    defaultApps = config.modules.desktop.defaultApplications.apps;
+    configDir = config.nixosConfig.configDir;
+
+    screenshotarea = "hyprctl keyword animation 'fadeOut,0,0,default'; grimblast --notify copysave area; hyprctl keyword animation 'fadeOut,1,4,default'";
+
+    # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
+    workspaces = builtins.concatLists (builtins.genList (
+        x: let
+            ws = let
+                c = (x + 1) / 10;
+            in
+                builtins.toString (x + 1 - (c * 10));
+        in
+            [
+                "$mod, ${ws}, exec, /etc/nixos/bin/hyprland/workspace ${toString (x + 1)}"
+                "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
+            ]
+        )
+    10);
+
+    decoration = {
+        rounding = 7;
+        blur = {
+            enabled = true;
+            size = 3;
+            passes = 1;
+        };
+        drop_shadow = true;
+        shadow_ignore_window = true;
+        shadow_offset = "0 2";
+        shadow_range = 20;
+        shadow_render_power = 3;
+        "col.shadow" = "rgba(00000055)";
+    };
+
+    animations = {
+        enabled = true;
+        animation = [
+            "border, 1, 2, default"
+            "fade, 1, 4, default"
+            "windows, 1, 3, default, popin 80%"
+            "workspaces, 1, 2, default, slide"
+        ];
+    };
+
+    keybinds = let
+        monocle = "dwindle:no_gaps_when_only";
+    in [
+        # Compositor commands
+        "$mod ALTL, Q, exec, pkill Hyprland"
+        "$mod, Q, killactive"
+
+        # Layout
+        "$mod, F, fullscreen"
+        "$mod, Space, togglefloating"
+        "$mod, S, togglesplit"
+        "$mod, P, pseudo"
+        "$mod SHIFT, grave, movetoworkspace, special"
+        "$mod, grave, togglespecialworkspace"
+
+        # Group
+        "$mod, G, togglegroup"
+        "$mod, TAB, changegroupactive"
+
+        #Focus windows
+        "$mod, left, movefocus, l"
+        "$mod, right, movefocus, r"
+        "$mod, up, movefocus, u"
+        "$mod, down, movefocus, d"
+
+        #Focus monitor
+        "$mod SHIFT, left, focusmonitor, l"
+        "$mod SHIFT, right, focusmonitor, r"
+
+        #Exec binds
+        "$mod, D, exec, wofi --show drun"
+        "$mod, Return, exec, ${defaultApps.terminal.cmd}"
+        "$mod, W, exec, ${defaultApps.browser.cmd}"
+        "$mod ALTL, B, exec, killall -SIGUSR2 waybar"
+    ]
+    ++ workspaces;
+
+    mousebinds = let
+    in [
+        "$mod, mouse:272, movewindow"
+        "$mod, mouse:273, resizewindow"
+    ];
+in {
+    options.modules.desktop.hyprland = {
+        enable = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+        xwayland = lib.mkOption {
+            type = lib.types.bool;
+            default = true;
+        };
+    };
+
+    config = lib.mkIf (hyprlandConf.enable) (lib.mkMerge [
+    {
+        environment.variables.WLR_NO_HARDWARE_CURSORS = "1";
+
+        home.packages = [
+            pkgs.killall
+            pkgs.wl-clipboard
+            pkgs.wdisplays
+            pkgs.swaylock
+            pkgs.swayidle
+            pkgs.wofi
+            pkgs.jq
+            pkgs.swww
+        ];
+
+        modules.device.displayProtocol = "wayland";
+
+        xdg.portal = {
+            enable = true;
+            wlr = {
+                enable = true;
+                settings = {
+                    screencast = {
+                        chooser_type = "simple";
+                        chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or";
+                    };
+                };
+            };
+            extraPortals = [pkgs.xdg-desktop-portal-gtk];
+            config.common.default = ["wlr" "gtk"];
+        };
+
+        home.manager.wayland.windowManager.hyprland = {
+            enable = true;
+            xwayland.enable = hyprlandConf.xwayland;
+
+            settings = {
+                "$mod" = "SUPER";
+
+                input = {
+                    kb_layout = "us";
+                    follow_mouse = 1;
+                    sensitivity = 0;
+                };
+
+                dwindle = {
+                    pseudotile = true;
+                    preserve_split = true;
+                };
+
+                general = {
+                    gaps_in = 5;
+                    gaps_out = 10;
+                    border_size = 2;
+                    "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
+                    "col.inactive_border" = "rgba(595959aa)";
+
+                    layout = "dwindle";
+                };
+                exec-once = [
+                    "swww init"
+                    "swww img ${configDir}/hypr/wallpaper.png"
+                ];
+
+                env = [
+                    "XDG_CURRENT_DESKTOP,Hyprland"
+                    "XDG_SESSION_TYPE,wayland"
+                    "XDG_SESSION_DESKTOP,Hyprland"
+
+                    "GDK_BACKEND,wayland"
+                    "QT_QPA_PLATFORM,wayland"
+                    "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
+                    "QT_AUTO_SCREEN_SCALE_FACTOR,1"
+                    
+                    "SDL_VIDEODRIVER,wayland"
+                ];
+
+                decoration = decoration;
+                animations = animations;
+                bind = keybinds;
+                bindm = mousebinds;
+            };
+        };
+
+        programs.waybar = {
+            enable = true;
+        };
+
+        home.manager.xdg.configFile."hypr/hyprpaper.conf".source = "${configDir}/hypr/hyprpaper.conf";
+        #Symlink waybar
+        system.userActivationScripts.linkwaybar.text = ''
+            if [[ ! -h "$HOME/.config/waybar" ]]; then
+                ln -s "${configDir}/waybar" "$HOME/.config/waybar"
+            fi
+        '';
+
+        security.pam.services.swaylock = {};
+    }
+    (lib.mkIf (device.gpu == "nvidia") {
+         home.manager.wayland.windowManager.hyprland.settings.env = [
+            "GBM_BACKEND,nvidia-drm"
+            "__GLX_VENDOR_LIBRARY_NAME,nvidia"
+            "LIBVA_DRIVER_NAME,nvidia"
+            "__GL_GSYNC_ALLOWED"
+            "__GL_VRR_ALLOWED"
+            "WLR_DRM_NO_ATOMIC,1"
+         ];
+    })
+    (lib.mkIf (config.modules.desktop.greetd.enable) {
+        services.greetd.settings = {
+            default_session.command = ''
+                ${pkgs.greetd.tuigreet}/bin/tuigreet \
+                    --time \
+                    --asterisks \
+                    --user-menu \
+                    --cmd Hyprland
+            '';
+        };
+
+        environment.etc."greetd/environments".text = ''
+            Hyprland
+        '';
+    })
+    ]);
+}
diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix
deleted file mode 100644
index 2acf5b6..0000000
--- a/modules/desktop/hyprland/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ config, lib, pkgs, user, ... }:
-with lib;
-let
-in
-{
-    options = {
-        hyprland = {
-            enable = mkOption {
-                type = types.bool;
-                default = false;
-            };
-        };
-    };
-
-    config = mkIf (config.hyprland.enable)
-    {
-        environment.variables.WLR_NO_HARDWARE_CURSORS = "1";
-        environment.systemPackages = with pkgs; [
-            wayland
-            glib
-            wl-clipboard
-            wdisplays
-            hyprpaper
-        ];
-
-        programs.hyprland = {
-            enable = true;
-            xwayland.enable = true;
-            enableNvidiaPatches = true;
-        };
-
-        programs.waybar = {
-            enable = true;
-        };
-    };
-}
diff --git a/modules/desktop/picom.nix b/modules/desktop/picom.nix
deleted file mode 100644
index dcee480..0000000
--- a/modules/desktop/picom.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ config, lib, pkgs, user, ... }:
-with lib;
-{
-    config = mkIf (config.xserver.enable) {
-        services.picom = {
-            enable = true;
-
-            fade = true;
-            fadeDelta = 2;
-
-            backend = "glx";
-            settings = {
-                corner-radius = 8;
-
-                blur = {
-                    method = "gaussian";
-                    size = 10;
-                    deviation = 5.0;
-                };
-            };
-        };
-    };
-}
diff --git a/modules/desktop/rofi.nix b/modules/desktop/rofi.nix
deleted file mode 100644
index 85726b8..0000000
--- a/modules/desktop/rofi.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ config, lib, pkgs, user, ...}:
-with lib;
-{
-    options = {
-        rofi = {
-            enable = mkOption {
-                type = types.bool;
-                default = false;
-            };
-        };
-    };
-
-    config.home-manager.users.${user} = mkIf (config.rofi.enable) {
-
-        programs.rofi = mkIf (config.xserver.enable) {
-            enable = true;
-        };
-
-        programs.wofi = mkIf (config.hyprland.enable) {
-            enable = true;
-        };
-    };
-}
diff --git a/modules/desktop/xserver/default.nix b/modules/desktop/xserver/default.nix
deleted file mode 100644
index 471c9ce..0000000
--- a/modules/desktop/xserver/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ config, lib, pkgs, user, ... }:
-with lib;
-let  
-
-in
-{
-    options = {
-        xserver = {
-            enable = mkOption {
-                type = types.bool;
-                default = false;
-            };
-        };
-    };
-
-    config = mkIf (config.xserver.enable)
-    {
-        services.xserver = {
-            enable = true;
-            layout = "us";
-            xkbVariant = "";
-        };
-
-        environment.systemPackages = with pkgs; [
-            xclip
-            xorg.xev
-            xorg.xkill
-            xorg.xrandr
-            arandr
-        ];
-
-        home-manager.users.${user} = {
-            xsession = {
-                enable = true;
-                numlock.enable = true;
-            };
-        };
-    };
-}