Commit unstaged changes

flake.lock

@@ -20,11 +20,11 @@
     },
     "emacs": {
       "locked": {
-        "lastModified": 1636881202,
+        "lastModified": 1638668516,
-        "narHash": "sha256-XmXmV7ddohRKXcVzVDdw6LB0/53gu+rjQ+vScdakKGM=",
+        "narHash": "sha256-u67dzO+HVWlimD6OSXSajvkU6/c7fGp4faC48uCln7k=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "23c8464f4527a2b19f6b4776378dd03b8289aa85",
+        "rev": "bd45e439c084c145d67272419eaf96b978f5c2ce",
         "type": "github"
       },
       "original": {
@@ -35,11 +35,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1634851050,
+        "lastModified": 1638122382,
-        "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=",
+        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935",
+        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
         "type": "github"
       },
       "original": {
@@ -68,11 +68,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1636847964,
+        "lastModified": 1638571010,
-        "narHash": "sha256-hH2lbDgOPwCtlWDwp0wVCcOK7x0mtLf4nrNWfvUWrA8=",
+        "narHash": "sha256-KSO7u13VRLdklQTKYJaBSfVcurEvw+HifAsHR7V2i5E=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "accfbdf215dbf39eac2fbae67b574dac0be83d51",
+        "rev": "781d25b315def05cd7ede3765226c54216f0b1fe",
         "type": "github"
       },
       "original": {
@@ -84,10 +84,7 @@
     },
     "home-manager_2": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_4"
-          "ostylk",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1634544068,
@@ -106,11 +103,11 @@
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1635517258,
+        "lastModified": 1636812815,
-        "narHash": "sha256-8iV8f9eZ/5cE0DmG7VmNSiCqpe00yL5HbOO7nZJm1Oo=",
+        "narHash": "sha256-OG4/4cD2sGNM+ROaYhczwUJ3YCtzaIgX96rFjCs85JE=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "ce77ed9bd069e57a7a688d360196e576ca63a842",
+        "rev": "00df1e57bb9c7551b45a11c70f5472d0cbfbfff7",
         "type": "github"
       },
       "original": {
@@ -121,11 +118,7 @@
     },
     "naersk": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_6"
-          "ostylk",
-          "rnix-lsp",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1629707199,
@@ -143,28 +136,27 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1636385773,
+        "lastModified": 1635881984,
-        "narHash": "sha256-2uzAbVH/WFWBvxRfapXrTH3QF/bDgzCnBJlfCVYs02E=",
+        "narHash": "sha256-m6qai5HI+5/4uqSAiR1JceKQrimu/H3iOOn3BXWw3Rc=",
         "owner": "ostylk",
         "repo": "nixos-hardware",
-        "rev": "e660be563819c2be9410fbd20775283f3a2a8d76",
+        "rev": "b4238e8fb309c2d4ea1038423e9c47c5005aa0e6",
         "type": "github"
       },
       "original": {
         "owner": "ostylk",
-        "ref": "surface-update",
+        "ref": "surface-test",
         "repo": "nixos-hardware",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1636922351,
+        "lastModified": 1638198142,
-        "narHash": "sha256-x/jCHAVs4P9QGimbU/UcL7jr0OBvhr41z/L/agMTxwY=",
+        "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
-        "owner": "NixOS",
+        "path": "/nix/store/k5f8bdi01gs45m1nnfypja4is7mkpvb5-source",
-        "repo": "nixpkgs",
+        "rev": "8a308775674e178495767df90c419425474582a1",
-        "rev": "837604f22c3bd4819f96da7929486d9941d572b8",
+        "type": "path"
-        "type": "github"
       },
       "original": {
         "id": "nixpkgs",
@@ -172,22 +164,6 @@
       }
     },
     "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1636267212,
-        "narHash": "sha256-KDS173KqmqrYUPY9N4vf750GxIo+S6E0djyq2BsQm8s=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c935f5e0add2cf0ae650d072c8357533e21b0c35",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1636800699,
         "narHash": "sha256-SwbyVxXffu3G2ulJIbTf0iQfqhbGbdml4Dyv5j9BiAI=",
@@ -203,6 +179,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1638698569,
+        "narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_3": {
       "locked": {
         "lastModified": 1618628710,
@@ -218,11 +210,53 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1636333654,
+        "lastModified": 1638198142,
-        "narHash": "sha256-3wh9PtCzcaJQuZrgZ+ygKfhltkDNNqT6zOzGsRbjZEo=",
+        "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
+        "path": "/nix/store/k5f8bdi01gs45m1nnfypja4is7mkpvb5-source",
+        "rev": "8a308775674e178495767df90c419425474582a1",
+        "type": "path"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1636855248,
+        "narHash": "sha256-ISyGm3p9uNvSqsgguK6+Pr0IDJ3pik14wTHZXfF3e/s=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e74894146a42ba552ebafa19ab2d1df7ccbc1738",
+        "rev": "195d5816cddc056e07fd2aa3fe81ee6e3f9d96e2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-21.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1638198142,
+        "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
+        "path": "/nix/store/k5f8bdi01gs45m1nnfypja4is7mkpvb5-source",
+        "rev": "8a308775674e178495767df90c419425474582a1",
+        "type": "path"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1638564543,
+        "narHash": "sha256-slB5V8mWwtpAYquwG/s7vlTROJhObkCPdGrshQlWicM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "b86b6bc5e753919ab4d7c902210234f324d0efa4",
         "type": "github"
       },
       "original": {
@@ -234,11 +268,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1636920392,
+        "lastModified": 1638683309,
-        "narHash": "sha256-mre/JUUA4168Y4NV1nfULPsAbDhwR1uvYI6rf0qvMV0=",
+        "narHash": "sha256-KH8l/3/Ptvw4t7fzMO9hb5RmrAK7KNiFM9hqBG1YgMs=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "faf37248a0b31f65353394924ffaf58da3a8445c",
+        "rev": "64e93e9e68325ed12029732bac269ada92ff65f5",
         "type": "github"
       },
       "original": {
@@ -254,16 +288,16 @@
         "home-manager": "home-manager_2",
         "impermanence": "impermanence",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "rnix-lsp": "rnix-lsp"
       },
       "locked": {
-        "lastModified": 1636386099,
+        "lastModified": 1636987186,
-        "narHash": "sha256-81kCDDzJfcYPl+hI/Oa2MVLrt603ipqXRvfXN4RNA3c=",
+        "narHash": "sha256-uJ0Px5gvwtXF+HoGhMnN6Sel30XFcJUhhZfqXPFh6/A=",
         "ref": "master",
-        "rev": "285b4548c52b3c6454186242d6dd9362d80d1545",
+        "rev": "44b8e77f43d9aadf31d8d696cf514784cc6a01eb",
-        "revCount": 141,
+        "revCount": 143,
         "type": "git",
         "url": "https://dev.ostylk.de/NixDistro/Config"
       },
@@ -275,18 +309,15 @@
     "rnix-lsp": {
       "inputs": {
         "naersk": "naersk",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_7",
-          "ostylk",
-          "nixpkgs"
-        ],
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1634449716,
+        "lastModified": 1636977689,
-        "narHash": "sha256-JuRCU4KCIA3/pp8BjHqqF9dj1d2xtpkxKKAtSuOzTIY=",
+        "narHash": "sha256-pQmAxKBoEhC851iRsowMErz9CYiJxGpARjhPeSapH1Y=",
         "owner": "nix-community",
         "repo": "rnix-lsp",
-        "rev": "a2d06d2d2910cbe35b4f323a54ef484f51d71e20",
+        "rev": "9462b0d20325a06f7e43b5a0469ec2c92e60f5fe",
         "type": "github"
       },
       "original": {
@@ -309,11 +340,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1636792033,
+        "lastModified": 1638564543,
-        "narHash": "sha256-5RwKd3+OolhWAPUQG9SNoptr9eks8j2oukKgjAo5NQA=",
+        "narHash": "sha256-slB5V8mWwtpAYquwG/s7vlTROJhObkCPdGrshQlWicM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "68d4f5970b69b0fd0a95c57c8d0ab4b2b68fb9aa",
+        "rev": "b86b6bc5e753919ab4d7c902210234f324d0efa4",
         "type": "github"
       },
       "original": {

flake.nix

@@ -4,7 +4,8 @@
   inputs = {
     home-manager.url = "github:nix-community/home-manager/master";
     flake-utils.url = "github:numtide/flake-utils";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    #nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/master";
     stable.url = "github:nixos/nixpkgs/nixos-21.05";
     emacs.url = "github:nix-community/emacs-overlay";
     nur.url = "github:nix-community/nur";

hosts/miku.nix

@@ -22,18 +22,18 @@
     replaysorcery # Custom package
     #evdev-proxy # Custom package
     vfio-isolate # Custom Package
-    steam-wrapped
+    steam-wrapped discord-wrapped # Custom package
-    discord-wrapped # Custom package
-    superpaper # 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,8 +166,8 @@
       layout = "de";
       libinput.enable = true;
       displayManager.gdm = {
-        enable = true;
         wayland = true;
+        enable = true;
       };
     };
   };

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 = {

modules/hardware/surface-pro6.nix

@@ -2,8 +2,8 @@
 
 let
   fetchurl = pkgs.fetchurl;
-  commit = "821d8f0685ebad0fa2c05c7080f45eafb28ad08c";
+  commit = "a602640f4334990828e07cf78bc78217b4e7901e";
-  kernelVersion = "5.14";
+  kernelVersion = "5.15";
   mkPatch = name: sha256: {
     name = name;
     patch = fetchurl {
@@ -59,19 +59,20 @@ in {
     };
 
     boot = {
-      kernelPackages = pkgs.linuxPackages_5_14;
+      kernelPackages = pkgs.linuxPackages_5_15;
       kernelPatches = [
-        (mkPatch "0001-surface3-oemb" "0ji3glnbaiy10kzi2zi80278vyf0pp23s7dqx8pwirbqxi6pygnp")
+        (mkPatch "0001-surface3-oemb" "0id92a1g9ghvw2wf05ad3j4i294m118rvb23rywvm04wcasgav4a")
-        (mkPatch "0002-mwifiex" "0d7jpfiyb74i5fm2gdhwa5bi9kd7ff4mb75yss0lvidga10r9hmp")
+        (mkPatch "0002-mwifiex" "091380bv1gmbzh9ldcnhdw64g8m5lz0akync7r0lazcm6fjcwnxa")
-        (mkPatch "0003-ath10k" "0a6iwdw5wkjd24bnz32msncr1am2db36x6qpf652rx12czia8ndj")
+        (mkPatch "0003-ath10k" "1hy22n8mdw743gnh82asnyjiivx9hz95a6svf6lr2pkdz5dl48ra")
-        (mkPatch "0004-ipts" "0ib7bnh4xanz5cakr50nirshhzn3rb29x9kq4m0snp38fhyaa8dv")
+        (mkPatch "0004-ipts" "0c192h414wp0zgcm78q79wcavrzah33k94vb1cjzfl6y53agzjam")
-        (mkPatch "0005-surface-sam" "19yjxgznhv65g1v6dcv6fklahi2inmf7gllbzmh6k98r3531kzjg")
+        (mkPatch "0005-surface-sam" "1awffwlp6wz0i0kb4xd7zy7y7syggzc04ay53nxjhn54n8djlb1r")
-        (mkPatch "0006-surface-sam-over-hid" "0np7zf8328yxy9xzbipqjw014kzy0kmm67c046fmgmvniibixvs7")
+        (mkPatch "0006-surface-sam-over-hid" "1nf9wy57hqr28f2lqk9vjvk0fkm9vs3j8nq4f8izhdqmazl8bbak")
-        (mkPatch "0007-surface-gpe" "164hhw0jh800qxmwiahw4hdsprghm760i8c6pwq89mh440wkfxnk")
+        (mkPatch "0007-surface-gpe" "0a77haazdsmv4kr76cfng829cgd4zrzvbn3pf1rl67vbl6il9wli")
-        (mkPatch "0008-surface-button" "0w03azjlhwdz9isjc5swlpimj48zx7jgjws6ws8xxlb37vbg4lq6")
+        (mkPatch "0008-surface-button" "1ja9n1iia3p6cjifds95cv684w8cr2kibj19k7fm8bm58achia6f")
-        (mkPatch "0009-surface-typecover" "0s2i13x780zmwbksv4rk1lryrv6n6mvc49ljn3zdy4d9yy10x272")
+        (mkPatch "0009-surface-typecover" "0dmcsilqcqzr3rdc8lpq857pjgkj9agmns8g1nrax9h0rfh9gl3m")
-        (mkPatch "0010-cameras" "0vwz609vbrracc8qm1jzm471ls4imqlilf3hh2whsb2w2npmd0kf")
+        (mkPatch "0010-cameras" "1clvd09qbl3cjmxmpjvnfq4f9csqarzk13ahz3s69hq401a2a83m")
-        (mkPatch "0011-amd-gpio" "09xjc0fl9vccz1nks6v62359digrk92svr75qz9zcvfmpyxg18z7") # TODO: Maybe drop
+        (mkPatch "0011-amd-gpio" "0552k7d9hajafryvjvlxbaxbxkqmhjmk4i3hxbpdb3czz7i9cyzj") # TODO: Maybe drop
+        (mkPatch "0012-misc-fixes" "16fslvys2zjp8fpysig51cchikskzpvjww9w4nk3wsz6yh1xdm0f")
 
         {
           name = "surface-config";

modules/programs/plasma/default.nix

@@ -25,6 +25,7 @@ in {
       libsForQt5.kdeconnect-kde
       index-fm
       kasts-git
+      rsibreak
     ];
   };
 }

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;

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 = {
+   #extraEnv = {
-      DRI_PRIME = "1";
+   #  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";
+      rev = "5d1545b0c4303e45b4ddf4ef8a1565eba822a9af";
-      sha256 = "1scwnjzlp27vx5gqx8zk3zy9swwn0xhv550ig4nmjjx609ic1j7n";
+      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 ];

packages/tools/games/replaysorcery/default.nix

@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://github.com/matanui159/${pname}.git";
-    rev = "d8d5921988b5161004aed6209bd88251d721611d";
+    rev = version;
-    sha256 = "14m67mlfp0zh9s0bhz1qxppivw2aignxqb51xb5cy3v8farxmcv4";
+    sha256 = "sha256-nzilMEAOOLrdtfal+y81WJr6LwOVaQpuheIsSN5m83A=";
     deepClone = true;
   };