system/Ronin.nix

@@ -3,48 +3,6 @@
   imports = [ ./laptop.nix ];
   home-manager.users.${username} = {
     imports = [ ./home/work.nix ];
-    wayland.windowManager.sway.config = {
-      output."eDP-1".scale = "1.25";
-      workspaceOutputAssign = [
-        {
-          output = "eDP-1";
-          workspace = "1";
-        }
-      ];
-    };
-    services.kanshi = {
-      enable = true;
-      settings =
-        let
-          laptopScreen = {
-            criteria = "eDP-1";
-            scale = 1.25;
-            position = "2560,576";
-          };
-          monitor = {
-            criteria = "Dell Inc. DELL P3223QE CCG8YN3";
-            scale = 1.5;
-            position = "0,0";
-          };
-        in
-        [
-          {
-            profile = {
-              name = "undocked";
-              outputs = [ laptopScreen ];
-            };
-          }
-          {
-            profile = {
-              name = "docked";
-              outputs = [
-                laptopScreen
-                monitor
-              ];
-            };
-          }
-        ];
-    };
   };
   boot.initrd = {
     secrets = {

system/desktop.nix

@@ -5,10 +5,10 @@
   system.autoUpgrade.operation = "boot";
   hardware.bluetooth.enable = true;
   environment = {
+    plasma6.excludePackages = [ pkgs.kdePackages.plasma-browser-integration ];
     sessionVariables = {
       NIXOS_OZONE_WL = "1";
       QT_QPA_PLATFORM = "wayland";
-      GRIM_DEFAULT_DIR = "$HOME/Pictures/Screenshots";
     };
     systemPackages = with pkgs; [
       libsecret
@@ -33,12 +33,14 @@
     dconf.enable = true;
     noisetorch.enable = true;
     kdeconnect.enable = true;
-    sway.enable = true;
+    gamescope = {
+      enable = true;
+      capSysNice = true;
+    };
     xwayland.enable = true;
   };
   gtk.iconCache.enable = true;
   services = {
-    gnome.gnome-keyring.enable = true;
     flatpak.enable = true;
     printing.enable = true;
     pipewire = {
@@ -49,19 +51,13 @@
         support32Bit = true;
       };
     };
-    greetd = {
+    displayManager.sddm = {
       enable = true;
-      settings =
+      wayland.enable = true;
-        let
+    };
-          default_session.command = "sway";
+    desktopManager.plasma6 = {
-        in
+      enable = true;
-        {
+      enableQt5Integration = true;
-          inherit default_session;
-          initial_session = {
-            inherit (default_session) command;
-            user = username;
-          };
-        };
     };
     xserver = {
       enable = true;

system/home/avizo/default.nix

@@ -1,19 +0,0 @@
-{ config, accentColourName, ... }:
-{
-  services.avizo = {
-    enable = true;
-    settings.default =
-      let
-        sc = config.scheme;
-        rgba =
-          colourName: "${sc."${colourName}-rgb-r"}, ${sc."${colourName}-rgb-g"}, ${sc."${colourName}-rgb-b"}";
-      in
-      {
-        background = "rgba(${rgba "base00"}, 0.9)";
-        bar-bg-color = "rgba(${rgba "base00"}, 0.9)";
-        bar-fg-color = "rgba(${rgba "base05"}, 1.0)";
-        border-color = "rgba(${rgba accentColourName}, 1.0)";
-        image-opacity = "1.0";
-      };
-  };
-}

system/home/desktop.nix

@@ -1,15 +1,14 @@
 { config, pkgs, ... }:
 {
   imports = [
-    ./sway/default.nix
+    ./plasma/default.nix
-    ./alacritty/default.nix
     ./emacs/default.nix
     ./browser/default.nix
     ./services/email/default.nix
   ];
   home = {
     packages = with pkgs; [
-      libreoffice-fresh
+      libreoffice-qt-fresh
       webcord
       signal-desktop
       teams-for-linux

system/home/emacs/default.nix

@@ -49,7 +49,6 @@
         custom-theme-hash = builtins.hashFile "sha256" "${custom-theme}/${custom-theme-name}-theme.el";
       in
       ''
-        (add-to-list 'default-frame-alist '(alpha-background . 85))
         (add-to-list 'custom-theme-load-path "${custom-theme}")
         (add-to-list 'custom-safe-themes "${custom-theme-hash}")
         (load-theme '${custom-theme-name})
@@ -58,7 +57,7 @@
       epkgs: with epkgs; [
         treesit-grammars.with-all-grammars
         mu4e
-        emacsql-sqlite
+	emacsql-sqlite
       ];
   };
   home.packages = with pkgs; [
@@ -87,7 +86,6 @@
         ulem
         hyperref
         capt-of
-        listings
         ;
     })
 

system/home/foot/default.nix

@@ -1,48 +0,0 @@
-{ config, fonts, ... }:
-{
-  programs.foot = {
-    enable = true;
-    server.enable = true;
-    settings = {
-      main = {
-        term = "xterm-256color";
-        locked-title = false;
-        font = "${fonts.monospace.name}:size=${toString fonts.sizes.applications}";
-        dpi-aware = false;
-        pad = "10x10";
-      };
-      bell = {
-        urgent = false;
-        notify = false;
-        visual = false;
-      };
-      cursor = {
-        blink = true;
-      };
-      mouse = {
-        hide-when-typing = true;
-      };
-      colors = with config.scheme; rec {
-        alpha = 0.85;
-        background = base00;
-        foreground = base05;
-        regular0 = base02;
-        regular1 = red;
-        regular2 = green;
-        regular3 = yellow;
-        regular4 = blue;
-        regular5 = magenta;
-        regular6 = cyan;
-        regular7 = base05;
-        bright0 = base04;
-        bright1 = regular1;
-        bright2 = regular2;
-        bright3 = regular3;
-        bright4 = regular4;
-        bright5 = regular5;
-        bright6 = regular6;
-        bright7 = base05;
-      };
-    };
-  };
-}

system/home/fuzzel/default.nix

@@ -1,47 +0,0 @@
-{
-  config,
-  pkgs,
-  fonts,
-  accentColourName,
-  ...
-}:
-{
-  programs.fuzzel = {
-    enable = true;
-    settings = {
-      main = {
-        dpi-aware = false;
-        font = "${fonts.monospace.name}:size=${toString fonts.sizes.popups}";
-        icon-theme = config.gtk.iconTheme.name;
-        icons-enabled = true;
-        fields = "filename,name,generic,categories";
-        fuzzy = true;
-        filter-desktop = true;
-        terminal =
-          with config.programs;
-          "${if alacritty.enable then alacritty.package else pkgs.alacritty}/bin/alacritty -e";
-        lines = 24;
-        width = 80;
-        tabs = 4;
-        layer = "overlay";
-      };
-      colors =
-        let
-          sc = config.scheme;
-        in
-        {
-          background = "${sc.base00}cc"; # 80% Opacity
-          text = "${sc.base05}ff";
-          match = "${sc.red}ff";
-          selection = "${sc.base01}ff";
-          selection-text = "${sc.base05}ff";
-          selection-match = "${sc.red}ff";
-          border = "${sc.${accentColourName}}ff";
-        };
-      border = {
-        width = 1;
-        radius = 5;
-      };
-    };
-  };
-}

system/home/mako/default.nix

@@ -1,29 +0,0 @@
-{
-  config,
-  fonts,
-  accentColourName,
-  ...
-}:
-{
-  services.mako =
-    let
-      sc = config.scheme.withHashtag;
-    in
-    {
-      enable = true;
-      anchor = "top-right";
-      font = "${fonts.monospace.name} ${toString fonts.sizes.popups}";
-      layer = "top";
-      markup = true;
-      maxVisible = 10;
-      icons = true;
-      iconPath = with config.gtk.iconTheme; "${package}/share/icons/${name}";
-      textColor = "${sc.base05}ff";
-      progressColor = "over ${sc.red}ff";
-      backgroundColor = "${sc.base00}cc";
-      borderColor = "${sc.${accentColourName}}ff";
-      borderRadius = 5;
-      borderSize = 1;
-      defaultTimeout = 0;
-    };
-}

system/home/plasma/default.nix

@@ -35,7 +35,7 @@
           inherit (config.home.pointerCursor) size;
           theme = config.home.pointerCursor.name;
         };
-        wallpaper = "${../wallpapers/landscapes/tropic_island_day.jpg}";
+        wallpaper = "${./wallpapers/landscapes/tropic_island_day.jpg}";
       };
 
     fonts =