chore(apps): remove floorp, firedragon is now based on floorp

Also renames xserver options as required by nixpkgs changes.
dr460nf1r3 · Feb 6, 2024 · 3964f5a · 3964f5a
1 parent 94a938f
commit 3964f5a
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 30 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -24,8 +24,6 @@
       url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
       inputs.home-manager.follows = "home-manager";
       inputs.systems.follows = "systems";
-      inputs.flake-compat.follows = "flake-compat";
-      inputs.flake-utils.follows = "flake-utils";
     };
 
     # Devshell to set up a development environment

diff --git a/nixos/modules/apps.nix b/nixos/modules/apps.nix
@@ -44,7 +44,6 @@ in {
       aspellDicts.en
       chromium-flagged
       ffmpegthumbnailer
-      floorp
       freerdp
       gimp
       helvum

diff --git a/template/nixos/modules/locales.nix b/template/nixos/modules/locales.nix
@@ -65,9 +65,9 @@ in {
     };
 
     # X11 keyboard layout
-    services.xserver = mkIf cfgDesktops.enable {
+    services.xserver.xkb = mkIf cfgDesktops.enable {
       layout = "de";
-      xkbVariant = "";
+      variant = "";
     };
   };
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,6 @@ in { @@
           aspellDicts.en
           chromium-flagged
           ffmpegthumbnailer
-          floorp
           freerdp
           gimp
           helvum
@@ Expand Down @@