2024-11-30

14 files changed, 177 insertions, 106 deletions

diff --git a/configurations/eonwe/default.nix b/configurations/eonwe/default.nix
index 9fd4ba2..f1a56e6 100644
--- a/configurations/eonwe/default.nix
+++ b/configurations/eonwe/default.nix
@@ -152,6 +152,14 @@ with lib;
   };
 
   services = {
+    displayManager = {
+      sddm.enable = lib.mkForce false;
+      ly = {
+        enable = true;
+        settings.animation = "matrix";
+      };
+    };
+
     languagetool = {
       enable = true;
       port = 8081;
diff --git a/configurations/eonwe/ollama.nix b/configurations/eonwe/ollama.nix
index a98fb3f..69fa9fd 100644
--- a/configurations/eonwe/ollama.nix
+++ b/configurations/eonwe/ollama.nix
@@ -5,7 +5,9 @@
 }:
 
 {
-  ark.directories = [ config.services.ollama.home ];
+  ark.directories = [
+    config.services.ollama.home
+  ];
 
   hm.programs.firefox.profiles.default.bookmarks = [
     {
@@ -22,7 +24,7 @@
 
   services = {
     ollama = {
-      enable = true;
+      enable = false;
 
       host = "0.0.0.0";
       port = 11434;
@@ -43,8 +45,22 @@
       openFirewall = true;
     };
 
+    open-webui = {
+      enable = false;
+      port = 11436;
+      environment = {
+        ANONYMIZED_TELEMETRY = "False";
+        DO_NOT_TRACK = "True";
+        ENABLE_SIGNUP = "False";
+        OLLAMA_BASE_URL = "http://127.0.0.1:11434";
+        SCARF_NO_ANALYTICS = "True";
+        WEBUI_AUTH = "False";
+        WEBUI_URL = "http://eonwe.shire.net:11436";
+      };
+    };
+
     nextjs-ollama-llm-ui = {
-      enable = true;
+      enable = false;
 
       hostname = "0.0.0.0";
       port = 11435;
diff --git a/flake.lock b/flake.lock
index 4fa2d06..68ca139 100644
--- a/flake.lock
+++ b/flake.lock
@@ -71,11 +71,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731496216,
-        "narHash": "sha256-nlQrNN+tmJ+iP6Ck/czwZI0Hxz3oNvUyGkVruxJwgwA=",
+        "lastModified": 1731774881,
+        "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "3b00e96f90cb0040de6d88ad99bf5f4d443f0c59",
+        "rev": "b31a6a4da8199ae3489057db7d36069a70749a56",
         "type": "github"
       },
       "original": {
@@ -135,11 +135,11 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1708890466,
-        "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
+        "lastModified": 1732200724,
+        "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
         "owner": "SenchoPens",
         "repo": "base16.nix",
-        "rev": "665b3c6748534eb766c777298721cece9453fdae",
+        "rev": "153d52373b0fb2d343592871009a286ec8837aec",
         "type": "github"
       },
       "original": {
@@ -183,11 +183,11 @@
     "base16-vim": {
       "flake": false,
       "locked": {
-        "lastModified": 1716150083,
-        "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
+        "lastModified": 1731949548,
+        "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=",
         "owner": "tinted-theming",
         "repo": "base16-vim",
-        "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
+        "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6",
         "type": "github"
       },
       "original": {
@@ -262,11 +262,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731746438,
-        "narHash": "sha256-f3SSp1axoOk0NAI7oFdRzbxG2XPBSIXC+/DaAXnvS1A=",
+        "lastModified": 1732742778,
+        "narHash": "sha256-i+Uw8VOHzQe9YdNwKRbzvaPWLE07tYVqUDzSFTXhRgk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "cb64993826fa7a477490be6ccb38ba1fa1e18fa8",
+        "rev": "341482e2f4d888e3f60cae1c12c3df896e7230d8",
         "type": "github"
       },
       "original": {
@@ -300,11 +300,11 @@
     },
     "flake-compat": {
       "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1732722421,
+        "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
         "type": "github"
       },
       "original": {
@@ -357,11 +357,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -373,11 +373,11 @@
     "fromYaml": {
       "flake": false,
       "locked": {
-        "lastModified": 1689549921,
-        "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
+        "lastModified": 1731966426,
+        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
         "owner": "SenchoPens",
         "repo": "fromYaml",
-        "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
+        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
         "type": "github"
       },
       "original": {
@@ -400,11 +400,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731363552,
-        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
+        "lastModified": 1732021966,
+        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
+        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
         "type": "github"
       },
       "original": {
@@ -458,11 +458,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731604581,
-        "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
+        "lastModified": 1732482255,
+        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
+        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
         "type": "github"
       },
       "original": {
@@ -474,11 +474,11 @@
     "homelab-svg-assets": {
       "flake": false,
       "locked": {
-        "lastModified": 1731595323,
-        "narHash": "sha256-j8sUwfjWuSeD9D8Id+zFJ6jkbLphUHLn29k4uNAEbVU=",
+        "lastModified": 1732477017,
+        "narHash": "sha256-HMfTbHfs2F4v3B6/f41Hn/R7H2/YKxL+NurVy4SyfHI=",
         "owner": "loganmarchione",
         "repo": "homelab-svg-assets",
-        "rev": "54342c639455e3b2258ad36a5c262d1d993b78e6",
+        "rev": "f1d8b8b097a243ebdc60d62b104eb8c1890c3447",
         "type": "github"
       },
       "original": {
@@ -532,11 +532,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1731712919,
-        "narHash": "sha256-368tg2qt73lTaY7nc7SzGpSwks024mSd0yxW65QZt/c=",
+        "lastModified": 1732737540,
+        "narHash": "sha256-ORogf5yeqxar+fMJek+rpUgfnCOYcoeomvczo/tYOcE=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "7affc34ab43c5d5cbf670759b839a9e990d8bbea",
+        "rev": "5329298b522e3cc1201894909443775b00aeb336",
         "type": "github"
       },
       "original": {
@@ -611,11 +611,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731518387,
-        "narHash": "sha256-aZZw1ZvTMLkcA6udlvkA3hrCkuipoWLy8s/JNnIclxY=",
+        "lastModified": 1731702627,
+        "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "315fba5d21d87ddb756d4bebdb49f99d86b0ffe8",
+        "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1",
         "type": "github"
       },
       "original": {
@@ -718,11 +718,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731721802,
-        "narHash": "sha256-bdzCCvI3spAsAhWOt8NUrnyVSXI0DBTf7ZAGxJq05pk=",
+        "lastModified": 1732688645,
+        "narHash": "sha256-SQBVnfTAhVmNs5mKjoe942GykhAh9RQbcqScK9XlsWM=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "b169b926e312ac0ea61367a191014a9d6e2114e8",
+        "rev": "6adec7f87f6c1d455f89f57bd697740bd6dc88fa",
         "type": "github"
       },
       "original": {
@@ -738,11 +738,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731593150,
-        "narHash": "sha256-FvksinoI2Y6kuwH+cKBu1oDA8uPGfoRqgtQV6O8GDc4=",
+        "lastModified": 1732519917,
+        "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "40d882b55e89add1ded379cc99edaab24983d6d9",
+        "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436",
         "type": "github"
       },
       "original": {
@@ -765,11 +765,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730803396,
-        "narHash": "sha256-5ycWNOxmR/wPftlSWLQEZ3odOIE3rPvSd2qjd5+nLAE=",
+        "lastModified": 1732192922,
+        "narHash": "sha256-xQO/3I99TFdiXTN5VoS28NpbNlCQWQUvxmPQHlfkzmU=",
         "owner": "oddlama",
         "repo": "nix-topology",
-        "rev": "82dbbdc3c4f8f86fefdee8d8875fd4fd9276881a",
+        "rev": "2b107e98bbde932a363874e0ef5b1739a932bbc5",
         "type": "github"
       },
       "original": {
@@ -780,11 +780,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1731740897,
-        "narHash": "sha256-teFd31vsE/0Z0WR6XVeKhKPw6Eyb2gXGpG0tjpMfBDM=",
+        "lastModified": 1732483221,
+        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c2c275fbb2e656948ba6e1f67b8ddd430f158c5f",
+        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
         "type": "github"
       },
       "original": {
@@ -795,11 +795,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731139594,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "lastModified": 1731676054,
+        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
         "type": "github"
       },
       "original": {
@@ -826,11 +826,11 @@
     },
     "nixpkgs-amneziawg": {
       "locked": {
-        "lastModified": 1729516182,
-        "narHash": "sha256-u+HH+gyGSUERSnhYVFX/jMykfpDrQJvGUNsBmN31GsM=",
+        "lastModified": 1732098616,
+        "narHash": "sha256-AK/xeDhbE6OI51K6GHmd7jo6HjfkJmewM3w/gmYbVzM=",
         "owner": "azahi",
         "repo": "nixpkgs",
-        "rev": "cebf00faa0dab35517b368b5d14dc42018bf3ee0",
+        "rev": "747f9c0752aeeee883c5bd6e9b064fa64ced5fbd",
         "type": "github"
       },
       "original": {
@@ -854,11 +854,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1731754023,
-        "narHash": "sha256-pP3mOxJzWNaE866eHXRkCN4q2kVdFflmj4ahWg64wgM=",
+        "lastModified": 1732743468,
+        "narHash": "sha256-HYLN8b8QqN/ot4GkxfrFd+04oxF2/HtoGxydsIktARc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1b68d687ec217df9ec606ed67b718d04d4eac14b",
+        "rev": "b5ad44e06e9d105ee44eb8fd099d2f7533300460",
         "type": "github"
       },
       "original": {
@@ -870,11 +870,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1731737433,
-        "narHash": "sha256-pT/lio7wmcXBZreoQ3xsPYd2wGvlFNKnottDYpwJSfs=",
+        "lastModified": 1732741259,
+        "narHash": "sha256-TmL2rRy84nHhuO2Aqqpy2Wemby3LJGaD7hYzb9PlKqQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3c1c28c6d6691914707719d33f2e88b0feb7c58d",
+        "rev": "adeae0fec1591618e7f1dafeb17573f44cad725f",
         "type": "github"
       },
       "original": {
@@ -886,11 +886,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1731531548,
-        "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
+        "lastModified": 1732617236,
+        "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "24f0d4acd634792badd6470134c387a3b039dace",
+        "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e",
         "type": "github"
       },
       "original": {
@@ -972,11 +972,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730940990,
-        "narHash": "sha256-FyRDs/jlmaBDL1ryf3tM9rFaOrlYn5wSa1VUr4k2w+4=",
+        "lastModified": 1732736067,
+        "narHash": "sha256-kYp/+aE8cEhW2F8Jrxrc8nVbjA3O3AUtWzrMc7CF2CU=",
         "owner": "nix-community",
         "repo": "srvos",
-        "rev": "dabae9d2062afd45f343d13d819eea1029d08162",
+        "rev": "122dc2d4ee9843dba6f8d4e9fb9b9e7f3cf7eb28",
         "type": "github"
       },
       "original": {
@@ -1008,11 +1008,11 @@
         "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1731657386,
-        "narHash": "sha256-Mm/JL8tFUS1SOmmZDPcswExUxzw0VpHcEyZI1h58CGA=",
+        "lastModified": 1732608183,
+        "narHash": "sha256-T5k5ill+PNIEW6KuS4CpUacMtZNJe2J2q5eBOF4xWuU=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f",
+        "rev": "7689e621f87bce7b6ab1925dfd70ad1f4c80f334",
         "type": "github"
       },
       "original": {
@@ -1118,11 +1118,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1696725902,
-        "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
+        "lastModified": 1729501581,
+        "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
+        "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14",
         "type": "github"
       },
       "original": {
@@ -1144,11 +1144,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731721953,
-        "narHash": "sha256-Wh+SleqO6vQc4M6UI90zbm3al2Hq3OLbMupJmrTIdq8=",
+        "lastModified": 1732672419,
+        "narHash": "sha256-lWTckUrhvGYTJId+mI9F2/bHXrNHrkdvzyy6xNzITUY=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "32e3b124252161fcd7e0623c6e6faf9d535c1a3f",
+        "rev": "c10eb0e26ca40bdc952b4d89aee9d0e9b673eb09",
         "type": "github"
       },
       "original": {
@@ -1185,11 +1185,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730743262,
-        "narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=",
+        "lastModified": 1731703417,
+        "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d",
+        "rev": "8070f36deec723de71e7557441acb17e478204d3",
         "type": "github"
       },
       "original": {
diff --git a/modules/common/networking.nix b/modules/common/networking.nix
index 71df24a..d7baa6c 100644
--- a/modules/common/networking.nix
+++ b/modules/common/networking.nix
@@ -102,10 +102,11 @@ in
         networkmanager = {
           enable = lib.mkDefault true;
           unmanaged = [
-            "bridge"
-            "ethernet"
-            "loopback"
-            "wireguard"
+            "type:amneziawg"
+            "type:bridge"
+            "type:ethernet"
+            "type:loopback"
+            "type:wireguard"
           ];
           plugins = lib.mkForce [ ];
           wifi.backend = "iwd";
diff --git a/modules/common/nix.nix b/modules/common/nix.nix
index 6a75e85..09d57ed 100644
--- a/modules/common/nix.nix
+++ b/modules/common/nix.nix
@@ -80,9 +80,6 @@ in
             "https://nix-community.cachix.org"
             "https://numtide.cachix.org"
           ];
-          trusted-substituters = [
-            "https://cache.tvl.su"
-          ];
           trusted-public-keys = [
             "cache.tvl.su:kjc6KOMupXc1vHVufJUoDUYeLzbwSr9abcAKdn/U1Jk="
           ];
diff --git a/modules/emacs/doom/config.el b/modules/emacs/doom/config.el
index 464a8b2..a212e17 100644
--- a/modules/emacs/doom/config.el
+++ b/modules/emacs/doom/config.el
@@ -271,11 +271,13 @@
          gptel-backend (gptel-make-ollama "ollama"
                          :host "eonwe.shire.net:11434"
                          :stream t
-                         :models '(mistral:7b
+                         :models '(dagbs/qwen2.5-coder-7b-instruct-abliterated:latest
+                                   qwen2.5-coder:7b
+                                   deepseek-coder-v2:16b
                                    codegemma:7b
                                    codellama:7b
-                                   deepseek-coder-v2:16b
-                                   llama3.2:3b))))
+                                   llama3.2:3b
+                                   mistral:7b))))
 
 (use-package! ellama
   :init
@@ -306,6 +308,18 @@
                                        :port 11434
                                        :chat-model "qwen2.5:7b"
                                        :embedding-model "nomic-embed-text:latest"))
+                            ("qwen-coder" . (make-llm-ollama
+                                             :scheme "http"
+                                             :host "eonwe.shire.net"
+                                             :port 11434
+                                             :chat-model "qwen2.5-coder:7b"
+                                             :embedding-model "nomic-embed-text:latest"))
+                            ("qwen-coder-instruct" . (make-llm-ollama
+                                                      :scheme "http"
+                                                      :host "eonwe.shire.net"
+                                                      :port 11434
+                                                      :chat-model "dagbs/qwen2.5-coder-7b-instruct-abliterated:latest"
+                                                      :embedding-model "nomic-embed-text:latest"))
                             ("gemma" . (make-llm-ollama
                                         :scheme "http"
                                         :host "eonwe.shire.net"
@@ -357,8 +371,7 @@
                                        :scheme "http"
                                        :host "eonwe.shire.net"
                                        :port 11434
-                                       :chat-model "llama3.2:3b"
+                                       :chat-model "dagbs/qwen2.5-coder-7b-instruct-abliterated:latest"
                                        :embedding-model "nomic-embed-text:latest"))
 
-
   (magit-gptcommit-status-buffer-setup))
diff --git a/modules/emacs/doom/packages.el b/modules/emacs/doom/packages.el
index 8fb24f4..a7085da 100644
--- a/modules/emacs/doom/packages.el
+++ b/modules/emacs/doom/packages.el
@@ -8,18 +8,19 @@
 
 (package! org-roam-ui)
 
+;; https://github.com/doomemacs/doomemacs/issues/8166
+;; https://github.com/org-roam/org-roam/issues/2485
+(unpin! emacsql)
+(package! emacsql
+  :recipe (:host github :repo "magit/emacsql")
+  :pin "491105a01f58bf0b346cbc0254766c6800b229a2")
+
 (package! nickel-mode)
 
 (package! hledger-mode)
 
 (package! sops
-  :recipe (:host github
-           :repo "djgoku/sops"))
-
-(unpin! ansible)
-(package! ansible
-  :recipe (:host gitlab
-           :repo "emacs-ansible/emacs-ansible"))
+  :recipe (:host github :repo "djgoku/sops"))
 
 (package! gptel)
 (package! ellama)
diff --git a/modules/firefox/addons.json b/modules/firefox/addons.json
index f189ed7..c194368 100644
--- a/modules/firefox/addons.json
+++ b/modules/firefox/addons.json
@@ -23,6 +23,9 @@
     "slug": "no-pdf-download"
   },
   {
+    "slug": "plasma-integration"
+  },
+  {
     "pname": "rikaichamp",
     "slug": "10ten-ja-reader"
   },
diff --git a/modules/firefox/addons.nix b/modules/firefox/addons.nix
index 6fac4df..5a08549 100644
--- a/modules/firefox/addons.nix
+++ b/modules/firefox/addons.nix
@@ -171,6 +171,29 @@
       platforms = platforms.all;
     };
   };
+  "plasma-integration" = buildFirefoxXpiAddon {
+    pname = "plasma-integration";
+    version = "1.9.1";
+    addonId = "plasma-browser-integration@kde.org";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4298512/plasma_integration-1.9.1.xpi";
+    sha256 = "394a3525185679dd5430d05f980ab6be19d96557560fe86208c21a8807669b33";
+    meta = with lib; {
+      homepage = "http://kde.org";
+      description = "Multitask efficiently by controlling browser functions from the Plasma desktop.";
+      license = licenses.gpl3;
+      mozPermissions = [
+        "nativeMessaging"
+        "notifications"
+        "storage"
+        "downloads"
+        "tabs"
+        "<all_urls>"
+        "contextMenus"
+        "*://*/*"
+      ];
+      platforms = platforms.all;
+    };
+  };
   "redirector" = buildFirefoxXpiAddon {
     pname = "redirector";
     version = "3.5.3";
diff --git a/modules/firefox/default.nix b/modules/firefox/default.nix
index c207930..4b04c40 100644
--- a/modules/firefox/default.nix
+++ b/modules/firefox/default.nix
@@ -115,6 +115,7 @@ in
                 user-agent-switcher
                 violentmonkey
               ]
+              ++ optional config.nixfiles.modules.kde.enable plasma-integration
               ++ optional config.nixfiles.modules.ipfs.enable ipfs-companion;
 
             search = {
@@ -201,7 +202,7 @@ in
 
                   "GitHub" = {
                     urls = [ { template = "https://github.com/search?q={searchTerms}"; } ];
-                    icon = getIcon "https://github.githubassets.com/favicons/favicon-dark.svg" "sha256-qu/d9ftvsntplFuxw9RFL8BpI9b2g5b6xfeGw6Ekh6w=";
+                    icon = getIcon "https://github.githubassets.com/favicons/favicon.svg" "sha256-apV3zU9/prdb3hAlr4W5ROndE4g3O1XMum6fgKwurmA=";
                     definedAliases = [
                       "@github"
                       "@gh"
@@ -352,7 +353,7 @@ in
 
                   "SourceHut" = {
                     urls = [ { template = "https://sr.ht/projects?search={searchTerms}"; } ];
-                    icon = getIcon "https://sr.ht/static/logo.png" "sha256-NBzKZhqE9//zVJlOwYiwyW/jRFh8+nS2YvC3zMCQ1fU=";
+                    icon = getIcon "https://sourcehut.org/logo.svg" "sha256-tX7ppdGitgaVFCI1aGc41n6er7srHi+GMv5+lpFvYBc=";
                     definedAliases = [
                       "@sourcehut"
                       "@srht"
diff --git a/modules/firefox/userContent.css b/modules/firefox/userContent.css
index 72382db..a009ad8 100644
--- a/modules/firefox/userContent.css
+++ b/modules/firefox/userContent.css
@@ -260,7 +260,8 @@
   #highlight__main-container,
   .global-footer,
   .global-navigation,
-  .global-registration-buttons {
+  .global-registration-buttons,
+  .notifications-placeholder {
     display: none !important;
   }
 
diff --git a/modules/kde.nix b/modules/kde.nix
index e017e11..9490b71 100644
--- a/modules/kde.nix
+++ b/modules/kde.nix
@@ -50,9 +50,14 @@ in
 
     services = {
       desktopManager.plasma6.enable = true;
+
       displayManager.sddm = {
         enable = true;
-        wayland.enable = true;
+
+        wayland = {
+          enable = false;
+          compositor = "kwin";
+        };
       };
     };
 
@@ -64,7 +69,9 @@ in
         khelpcenter
         print-manager
       ];
-      systemPackages = with pkgs.kdePackages; [ plasma-disks ];
+      systemPackages = with pkgs.kdePackages; [
+        plasma-disks
+      ];
     };
   };
 }
diff --git a/modules/profiles/dev/default.nix b/modules/profiles/dev/default.nix
index b0755d2..bc761f5 100644
--- a/modules/profiles/dev/default.nix
+++ b/modules/profiles/dev/default.nix
@@ -71,6 +71,7 @@ in
           nixpkgs-review
           scaleway-cli
           sops
+          toolbox
           vultr-cli
           yq
         ];
diff --git a/modules/profiles/headful.nix b/modules/profiles/headful.nix
index 3a795f1..e2ed1df 100644
--- a/modules/profiles/headful.nix
+++ b/modules/profiles/headful.nix
@@ -123,7 +123,6 @@ in
     services = {
       fwupd.enable = true;
       libinput.enable = true;
-      psd.enable = true;
       upower.enable = true;
     };