From d915ba331bb7152a8cbd9fcd8b29e08135950ad3 Mon Sep 17 00:00:00 2001
From: "Alexander \"PapaTutuWawa" <papatutuwawa@polynom.me>
Date: Mon, 6 Dec 2021 13:39:37 +0100
Subject: [PATCH] Commit unstaged changes

---
 hosts/miku.nix                                | 17 +++++------
 lib/baseSystem.nix                            |  2 +-
 modules/programs/plasma/default.nix           |  1 +
 modules/programs/waybar/default.nix           |  2 +-
 packages/default.nix                          | 28 +++++++++++++------
 .../tools/games/replaysorcery/default.nix     |  4 +--
 6 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/hosts/miku.nix b/hosts/miku.nix
index 9fa708d..2ff9a6f 100644
--- a/hosts/miku.nix
+++ b/hosts/miku.nix
@@ -22,18 +22,18 @@
     replaysorcery # Custom package
     #evdev-proxy # Custom package
     vfio-isolate # Custom Package
-    steam-wrapped
-    discord-wrapped # Custom package
-    superpaper # Custom package
+    steam-wrapped discord-wrapped # Custom package
     mumble
     piper
-    anime-dl trackma # Custom package
+    trackma # Custom package
+    anime-dl # Custom package
     thunderbird
     multimc-wrapped # Custom package
     nwg-launchers
     gnome-podcasts
     cantata
     newsflash
+    sublime-music-no-test
   ];
 
   ptw = {
@@ -42,7 +42,7 @@
         primaryScreen = "C27F398";
         enable = true;
       }; 
-      sway.enable = true;
+      #sway.enable = true;
       alacritty.enable = true;
       emacs.enable = true;
       firefox.enable = true;
@@ -55,6 +55,7 @@
       };
       xournalpp.enable = true;
       zsh.enable = true;
+      plasma.enable = true;
     };
     services = {
       gamemode.enable = true;
@@ -93,7 +94,7 @@
           };
         };
       };
-      swaync.enable = true;
+      #swaync.enable = true;
       key-mapper.enable = true;
     };
     system = {
@@ -165,12 +166,12 @@
       layout = "de";
       libinput.enable = true;
       displayManager.gdm = {
-        enable = true;
         wayland = true;
+        enable = true;
       };
     };
   };
-  
+
   # TODO: Move into modules
   systemd.user.services = {
     scream = {
diff --git a/lib/baseSystem.nix b/lib/baseSystem.nix
index 242e857..1726099 100644
--- a/lib/baseSystem.nix
+++ b/lib/baseSystem.nix
@@ -98,7 +98,7 @@ in {
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
     "firmwareLinuxNonfree" "microcodeAmd" "microcodeIntel"
     "steam" "steam-original" "steam-runtime"
-    "discord"
+    "discord" "minecraft"
   ];
 
   services = {
diff --git a/modules/programs/plasma/default.nix b/modules/programs/plasma/default.nix
index 2ccca46..2122b21 100644
--- a/modules/programs/plasma/default.nix
+++ b/modules/programs/plasma/default.nix
@@ -25,6 +25,7 @@ in {
       libsForQt5.kdeconnect-kde
       index-fm
       kasts-git
+      rsibreak
     ];
   };
 }
diff --git a/modules/programs/waybar/default.nix b/modules/programs/waybar/default.nix
index 346b582..77f52ec 100644
--- a/modules/programs/waybar/default.nix
+++ b/modules/programs/waybar/default.nix
@@ -14,7 +14,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     home-manager.users."${config.ptw.system.singleUser}" = {
-      xdg.configFile."waybar/style.css".source = ./style.css;
+      xdg.configFile."waybar/style.css".source = lib.mkForce ./style.css;
       programs.waybar = {
         enable = true;
         style = builtins.readFile ./style.css;
diff --git a/packages/default.nix b/packages/default.nix
index 48ba77a..6fd3e41 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -61,14 +61,26 @@ key-mapper = prev.callPackage ./tools/games/key-mapper {};
 
   multimc-wrapped = wrapInSandbox {
     name = "multimc";
-    package = prev.multimc;
+    package = prev.multimc.override {
+      jdk = prev.jdk11;
+      jdk8 = prev.jdk11;
+    };
     binaryName = "multimc";
     mountInHome = [ ".local/share/multimc" ];
     additionalBlacklist = [ "/mnt" ];
     chdirTo = "/home/$USER";
-    extraEnv = {
-      DRI_PRIME = "1";
-    };
+   #extraEnv = {
+   #  DRI_PRIME = "1";
+   #};
+  };
+
+  minecraft-wrapped = wrapInSandbox {
+    name = "minecraft-launcher";
+    package = prev.minecraft;
+    binaryName = "minecraft-launcher";
+    mountInHome = [ ".local/share/minecraft" ".minecraft" ];
+    additionalBlacklist = [ "/mnt" ];
+    chdirTo = "/home/$USER";
   };
   
   steam-wrapped = wrapInSandbox {
@@ -98,10 +110,10 @@ key-mapper = prev.callPackage ./tools/games/key-mapper {};
   xournalpp-git = prev.xournalpp.overrideAttrs (old: {
     version = "1.1.1";
     src = prev.fetchFromGitHub {
-      owner = "xournalpp";
+      owner = "bhennion";
       repo = "xournalpp";
-      rev = "master";
-      sha256 = "1scwnjzlp27vx5gqx8zk3zy9swwn0xhv550ig4nmjjx609ic1j7n";
+      rev = "5d1545b0c4303e45b4ddf4ef8a1565eba822a9af";
+      sha256 = "1d17lvydlny9pvaxa9xy53wxs7i6d563lp5r9g3r1xpgnb7zli8v";
     };
   });
   
@@ -126,7 +138,7 @@ key-mapper = prev.callPackage ./tools/games/key-mapper {};
   kasts-git = prev.libsForQt5.kasts.overrideAttrs (old: {
     src = builtins.fetchTarball {
       url = "https://invent.kde.org/plasma-mobile/kasts/-/archive/master/kasts-master.tar.gz";
-      sha256 = "1n7j4011hgscmjj728iyjgifpbnwc1sy32b5aw834n1vgxfkq00l";
+      sha256 = "sha256:1n7j4011hgscmjj728iyjgifpbnwc1sy32b5aw834n1vgxfkq00l";
     };
 
     buildInputs = old.buildInputs ++ [ prev.taglib prev.libsForQt5.qtkeychain ];
diff --git a/packages/tools/games/replaysorcery/default.nix b/packages/tools/games/replaysorcery/default.nix
index 7e8092c..74828f8 100644
--- a/packages/tools/games/replaysorcery/default.nix
+++ b/packages/tools/games/replaysorcery/default.nix
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://github.com/matanui159/${pname}.git";
-    rev = "d8d5921988b5161004aed6209bd88251d721611d";
-    sha256 = "14m67mlfp0zh9s0bhz1qxppivw2aignxqb51xb5cy3v8farxmcv4";
+    rev = version;
+    sha256 = "sha256-nzilMEAOOLrdtfal+y81WJr6LwOVaQpuheIsSN5m83A=";
     deepClone = true;
   };