From 9b9fd033d3b88ce62fb658eaed8765b5e5f51fed Mon Sep 17 00:00:00 2001
From: idcretard <singh.amneesh1784@gmail.com>
Date: Sat, 3 Apr 2021 22:06:18 +0530
Subject: [PATCH] changed username

---
 .gitmodules           |  6 ++++++
 Packages/dwm          |  1 +
 Packages/override.nix | 26 ++++++++++++++------------
 Packages/st           |  1 +
 Stuff/users.nix       |  4 ++--
 boot.nix              |  6 +++---
 hardware.nix          |  6 +++---
 stuff.nix             |  2 +-
 8 files changed, 31 insertions(+), 21 deletions(-)
 create mode 160000 Packages/dwm
 create mode 160000 Packages/st

diff --git a/.gitmodules b/.gitmodules
index 60573f6..d1773ae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "Packages/scripts"]
 	path = Packages/scripts
 	url = https://github.com/idcretard/custom-scripts
+[submodule "Packages/dwm"]
+	path = Packages/dwm
+	url = https://github.com/natto1784/dwm
+[submodule "Packages/st"]
+	path = Packages/st
+	url = https://github.com/natto1784/st
diff --git a/Packages/dwm b/Packages/dwm
new file mode 160000
index 0000000..cd69bb0
--- /dev/null
+++ b/Packages/dwm
@@ -0,0 +1 @@
+Subproject commit cd69bb00b0ecd941cdb5d048df029f3b762eea8c
diff --git a/Packages/override.nix b/Packages/override.nix
index bacd516..0ac42a5 100644
--- a/Packages/override.nix
+++ b/Packages/override.nix
@@ -5,20 +5,22 @@
     (callPackage ./customscripts.nix {})
     (callPackage ./mpd_discord_richpresence.nix {})
     (dwm.overrideAttrs (oldAttrs: rec {
-      src = fetchFromGitHub {
-        owner = "idcretard";
-        repo = "dwm";
-        rev = "363951cb05142f4c423af561a05658e74be7c768";
-        sha256 ="003sl6w5dkycw8wcymvhi843xjngsys6qsl3fc5b9vpyd1l7i0sr";
-      };
+      src = ./dwm;
+  #    src = fetchFromGitHub {
+   #     owner = "natto1784";
+    #    repo = "dwm";
+     #   rev = "363951cb05142f4c423af561a05658e74be7c768";
+    #    sha256 ="003sl6w5dkycw8wcymvhi843xjngsys6qsl3fc5b9vpyd1l7i0sr";
+   #   };
     }))
     (st.overrideAttrs (oldAttrs: rec {
-      src = fetchFromGitHub {
-        owner = "idcretard";
-        repo = "st";
-        rev = "0cd1e394e6d07c5f605ae23070c40de9690bafb1";
-        sha256 = "0riqg63aghx71v3rrpic3mxhcxqhry20312bicwbf3ks7ndl13hi";
-      };
+     src = ./st;
+     #src = fetchFromGitHub {
+       # owner = "natto1784";
+      #  repo = "st";
+      #  rev = "0cd1e394e6d07c5f605ae23070c40de9690bafb1";
+      #  sha256 = "0riqg63aghx71v3rrpic3mxhcxqhry20312bicwbf3ks7ndl13hi";
+  #    };
     }))
    (dmenu.overrideAttrs (oldAttrs: rec {
      configFile = writeText "config.def.h" (builtins.readFile ./dmenu/config.def.h);
diff --git a/Packages/st b/Packages/st
new file mode 160000
index 0000000..0cd1e39
--- /dev/null
+++ b/Packages/st
@@ -0,0 +1 @@
+Subproject commit 0cd1e394e6d07c5f605ae23070c40de9690bafb1
diff --git a/Stuff/users.nix b/Stuff/users.nix
index 521c517..ca6c0fb 100644
--- a/Stuff/users.nix
+++ b/Stuff/users.nix
@@ -1,10 +1,10 @@
 {lib, config, pkgs, ... }:
 
 {
-  users.users.otaku619 = {
+  users.users.natto = {
     isNormalUser = true;
     shell = pkgs.fish;
-    home = "/home/otaku619";
+    home = "/home/natto";
     extraGroups = [ "wheel" "video" "audio" ];
   };
 }
diff --git a/boot.nix b/boot.nix
index 156bd0c..d949aa9 100644
--- a/boot.nix
+++ b/boot.nix
@@ -9,9 +9,9 @@
       {
         name = "zenwithmuqqs";
         patch = null;
-        structuredExtraConfig = ''
-          SCHED_MUQQS y
-        '';
+        structuredExtraConfig = with lib.kernel; {
+          SCHED_MUQSS = yes;
+          };
         ignoreConfigErrors = true;
       }
     ];
diff --git a/hardware.nix b/hardware.nix
index 8b7e370..3e34bb8 100644
--- a/hardware.nix
+++ b/hardware.nix
@@ -27,17 +27,17 @@
   fileSystems."/mnt/Stuff" = 
   { device = "/dev/sda2";
     fsType = "ntfs";
-    options = ["uid=otaku619" "gid=users" "umask=0022" "rw"];
+    options = ["uid=natto" "gid=users" "umask=0022" "rw"];
   };
   fileSystems."/mnt/Games" = 
   { device = "/dev/sda4";
     fsType = "ntfs";
-    options = ["uid=otaku619" "gid=users" "umask=0022" "rw"];
+    options = ["uid=natto" "gid=users" "umask=0022" "rw"];
   };
   fileSystems."/mnt/Extra" = 
   { device = "/dev/sda3";
     fsType = "ntfs";
-    options = ["uid=otaku619" "gid=users" "umask=0022" "rw"];
+    options = ["uid=natto" "gid=users" "umask=0022" "rw"];
   };
   fileSystems."/mnt/LinuxGames" = 
   { device = "/dev/sda5";
diff --git a/stuff.nix b/stuff.nix
index 5baf361..f801aff 100644
--- a/stuff.nix
+++ b/stuff.nix
@@ -19,7 +19,7 @@
       enable = true;
       extraRules = [
         {
-          users = [ "otaku619" ];
+          users = [ "natto" ];
           keepEnv = true;
           persist = true;
         }