From 21688ed5bfc383b2fdc4ae8f05dba5aa4e19f25a Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Fri, 12 Jul 2024 21:38:33 +0200
Subject: [PATCH] fix various flake erros

---
 modules/kodi/default.nix           | 13 +++----
 modules/users/jopejoe1/default.nix | 13 +------
 systems/default.nix                |  3 --
 systems/ebisu/default.nix          |  3 +-
 systems/kamimusubi/default.nix     | 33 ------------------
 systems/omoikane/default.nix       |  2 +-
 systems/pi4/default.nix            | 43 ------------------------
 systems/raspberry4/default.nix     | 54 ------------------------------
 systems/sukuna-biko-na/default.nix |  1 +
 systems/yokai/default.nix          |  5 +--
 10 files changed, 15 insertions(+), 155 deletions(-)
 delete mode 100644 systems/kamimusubi/default.nix
 delete mode 100644 systems/pi4/default.nix
 delete mode 100644 systems/raspberry4/default.nix

diff --git a/modules/kodi/default.nix b/modules/kodi/default.nix
index d222b19..9384aea 100644
--- a/modules/kodi/default.nix
+++ b/modules/kodi/default.nix
@@ -23,17 +23,18 @@ in
         package = pkgs.kodi-wayland;
       };
       displayManager = {
-        defaultSession = "plasmawayland";
-        autoLogin = {
-          enable = true;
-          user = "jopejoe1";
-        };
         lightdm = {
           enable = true;
           autoLogin.timeout = 3;
         };
-        sddm.enable = lib.mkForce false;
       };
     };
+    services.displayManager = {
+      autoLogin = {
+        enable = true;
+        user = "jopejoe1";
+      };
+      sddm.enable = lib.mkForce false;
+    };
   };
 }
diff --git a/modules/users/jopejoe1/default.nix b/modules/users/jopejoe1/default.nix
index 82ddf55..f802a18 100644
--- a/modules/users/jopejoe1/default.nix
+++ b/modules/users/jopejoe1/default.nix
@@ -49,18 +49,7 @@ in
           catppuccin-kde
           #catppuccin-gtk
           tela-icon-theme
-          (
-            (discord.overrideAttrs (old: {
-              desktopItem = old.desktopItem.override (old: {
-                exec = old.exec + " --disable-gpu-sandbox";
-              });
-            })).override
-            {
-              withOpenASAR = true;
-              withVencord = true;
-              withTTS = true;
-            }
-          )
+          vesktop
         ];
     };
     home-manager.users.jopejoe1 = {
diff --git a/systems/default.nix b/systems/default.nix
index f7f2e93..14289a8 100644
--- a/systems/default.nix
+++ b/systems/default.nix
@@ -40,10 +40,7 @@ in
   yokai = mkSystem "aarch64-unknown-linux-gnu" "yokai";
   sukuna-biko-na = mkSystem "aarch64-unknown-linux-gnu" "sukuna-biko-na";
   benzaiten = mkSystem "x86_64-unknown-linux-gnu" "benzaiten";
-  kamimusubi = mkSystem "x86_64-unknown-linux-gnu" "kamimusubi";
   ebisu = mkSystem "x86_64-unknown-linux-gnu" "ebisu";
   hetzner = mkSystem "x86_64-unknown-linux-gnu" "hetzner";
   zap = mkSystem "x86_64-unknown-linux-gnu" "zap";
-  pi4 = mkSystem "aarch64-unknown-linux-gnu" "pi4";
-  raspberry4 = mkSystem "aarch64-unknown-linux-gnu" "raspberry4";
 }
diff --git a/systems/ebisu/default.nix b/systems/ebisu/default.nix
index eabe15b..3696291 100644
--- a/systems/ebisu/default.nix
+++ b/systems/ebisu/default.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs, ... }:
 
 {
 
@@ -19,4 +19,5 @@
   environment.systemPackages = with pkgs; [ moonlight-qt ];
 
   time.timeZone = "Europe/Berlin";
+  imports = [ ./hardware-configuration.nix ];
 }
diff --git a/systems/kamimusubi/default.nix b/systems/kamimusubi/default.nix
deleted file mode 100644
index 294ae82..0000000
--- a/systems/kamimusubi/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-{
-  jopejoe1 = {
-    local.enable = true;
-    nix.enable = true;
-    user = {
-      root.enable = true;
-    };
-    ssh.enable = true;
-  };
-
-  time.timeZone = "Europe/Berlin";
-
-  services.openssh.settings.PermitRootLogin = lib.mkForce "yes";
-
-  boot.loader = {
-    efi = {
-      canTouchEfiVariables = false;
-    };
-    grub = {
-      efiSupport = true;
-      efiInstallAsRemovable = true;
-      device = "nodev";
-      forcei686 = true;
-    };
-  };
-}
diff --git a/systems/omoikane/default.nix b/systems/omoikane/default.nix
index a5e7b91..953e7a7 100644
--- a/systems/omoikane/default.nix
+++ b/systems/omoikane/default.nix
@@ -102,6 +102,6 @@
   };
   programs.nix-ld = {
     enable = true;
-    libraries = with pkgs; [];
+    libraries = with pkgs; [ ];
   };
 }
diff --git a/systems/pi4/default.nix b/systems/pi4/default.nix
deleted file mode 100644
index fd2feed..0000000
--- a/systems/pi4/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  modulesPath,
-  lib,
-  nixos-hardware,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-    nixos-hardware.nixosModules.raspberry-pi-4
-  ];
-
-  boot = {
-    initrd = {
-      availableKernelModules = [ "xhci_pci" ];
-    };
-    loader = {
-      generic-extlinux-compatible.enable = true;
-    };
-  };
-
-  hardware.raspberry-pi."4".fkms-3d.enable = true;
-
-  jopejoe1 = {
-    bluetooth.enable = true;
-    local.enable = true;
-    nix.enable = true;
-    user = {
-      jopejoe1.enable = true;
-      root.enable = true;
-    };
-    ssh.enable = true;
-  };
-
-  services.openssh.settings.PermitRootLogin = lib.mkForce "yes";
-
-  networking = {
-    useDHCP = lib.mkDefault true;
-  };
-
-  powerManagement.cpuFreqGovernor = "ondemand";
-}
diff --git a/systems/raspberry4/default.nix b/systems/raspberry4/default.nix
deleted file mode 100644
index 8cdbf6a..0000000
--- a/systems/raspberry4/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  modulesPath,
-  lib,
-  nixos-hardware,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-    nixos-hardware.nixosModules.raspberry-pi-4
-  ];
-
-  boot = {
-    initrd = {
-      availableKernelModules = [ "xhci_pci" ];
-    };
-    kernelPackages = pkgs.linuxPackages_latest;
-  };
-
-  boot.supportedFilesystems = lib.mkForce [
-    "btrfs"
-    "cifs"
-    "f2fs"
-    "jfs"
-    "ntfs"
-    "reiserfs"
-    "vfat"
-    "xfs"
-    "bchachefs"
-  ];
-
-  #hardware.raspberry-pi."4".fkms-3d.enable = true;
-
-  jopejoe1 = {
-    bluetooth.enable = true;
-    local.enable = true;
-    nix.enable = true;
-    user = {
-      jopejoe1.enable = true;
-      root.enable = true;
-    };
-    ssh.enable = true;
-  };
-
-  networking = {
-    useDHCP = lib.mkDefault true;
-  };
-
-  services.openssh.settings.PermitRootLogin = lib.mkForce "yes";
-
-  powerManagement.cpuFreqGovernor = "ondemand";
-}
diff --git a/systems/sukuna-biko-na/default.nix b/systems/sukuna-biko-na/default.nix
index 9b5b360..5d8ef1c 100644
--- a/systems/sukuna-biko-na/default.nix
+++ b/systems/sukuna-biko-na/default.nix
@@ -34,6 +34,7 @@
     nix.enable = true;
     kodi.enable = true;
     plasma.enable = true;
+    gui.enable = true;
     user = {
       jopejoe1.enable = true;
       root.enable = true;
diff --git a/systems/yokai/default.nix b/systems/yokai/default.nix
index f7105b5..8e80a15 100644
--- a/systems/yokai/default.nix
+++ b/systems/yokai/default.nix
@@ -16,6 +16,7 @@
     local.enable = true;
     nix.enable = true;
     sway.enable = true;
+    gui.enable = true;
     user = {
       jopejoe1.enable = true;
       root.enable = true;
@@ -27,7 +28,7 @@
     hostId = "af13bbec";
   };
 
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
 
   time.timeZone = "Europe/Berlin";
 
@@ -49,7 +50,7 @@
     keyMap = "us";
   };
   services.xserver = {
-    layout = "us";
+    xkb.layout = "us";
   };
 
   boot = {