From e4fca0634c9e38a7dc6d15a15e7d665e16d6a743 Mon Sep 17 00:00:00 2001
From: Jade <obsidianical@gmail.com>
Date: Sun, 20 Nov 2022 22:01:49 +0100
Subject: [PATCH] shit i should've done long ago

Signed-off-by: Jade <obsidianical@gmail.com>
---
 common.nix                               |  1 +
 flake.lock                               | 24 ++++++++++++------------
 modules/desktop.nix                      |  3 +--
 monosodium-glutamate-g/configuration.nix |  1 +
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/common.nix b/common.nix
index 6cfe313..45be50f 100644
--- a/common.nix
+++ b/common.nix
@@ -154,6 +154,7 @@ with builtins;
     cava
     prismlauncher
     gitg gnome-builder
+    gpick qdirstat file whois ffmpeg_5 scribus p7zip file nmap cmatrix tree socat libreoffice
   ];
 
   environment.pathsToLink = [
diff --git a/flake.lock b/flake.lock
index e676cae..2fc5046 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1667574732,
-        "narHash": "sha256-73TVk3uSQOja6Q/5OuNcpcqwo6+SMzJPRtYAjU0rBx4=",
+        "lastModified": 1668900402,
+        "narHash": "sha256-IhVlueHoQNoN0SOHZIceKU3LyEL00g2ei0aUlaNypbQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b764068a506c6f70dba998efa0e7fcb99cb4deb2",
+        "rev": "c0f9cbcf93ca22e4f0ca66843be61a4bdf6f0a44",
         "type": "github"
       },
       "original": {
@@ -36,11 +36,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1667501134,
-        "narHash": "sha256-DvH2mS0cV0o3rSzKbSuD8m2G4rM+W53SRVssQgGFlq8=",
+        "lastModified": 1668193714,
+        "narHash": "sha256-bmy4EBz5TQNH/DdQsDiOrpuXQQEoRMRf7bubxIfOz/o=",
         "owner": "kekrby",
         "repo": "nixos-hardware",
-        "rev": "1b90099863ebb1b3cb71c82f6ba48d7e51748703",
+        "rev": "f77985ad09ee071d9c98947f2e8896e23c013894",
         "type": "github"
       },
       "original": {
@@ -51,11 +51,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1667552457,
-        "narHash": "sha256-9gH6VAK7idBb9owuLCKT2ODQUpDNc+UvcFWZ+lx41eM=",
+        "lastModified": 1668905981,
+        "narHash": "sha256-RBQa/+9Uk1eFTqIOXBSBezlEbA3v5OkgP+qptQs1OxY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7d09cc075f416997a8e547982b652ec2c7020a5f",
+        "rev": "690ffff026b4e635b46f69002c0f4e81c65dfc2e",
         "type": "github"
       },
       "original": {
@@ -75,11 +75,11 @@
     },
     "utils": {
       "locked": {
-        "lastModified": 1667077288,
-        "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
         "type": "github"
       },
       "original": {
diff --git a/modules/desktop.nix b/modules/desktop.nix
index e00b028..5116f91 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -64,7 +64,7 @@ in with lib; {
                 { command = "xkeysnail ${../other/xkeysnail.py}"; always = true; }
                 { command = "sleep 4 && setxkbmap -layout us -variant altgr-intl"; always = true; }
                 { command = "feh --bg-scale ${../other/wallpaper.jpg}"; always = true; notification = false; }
-                { command = "picom --experimental-backend"; }
+                { command = "picom"; }
                 { command = "pkill nm-applet; nm-applet"; always = true; }
                 { command = "pkill pa-applet; pa-applet"; always = true; } 
                 { command = "pkill oneko; oneko -tofocus -tora -position +-1+5 -fg palevioletred3 -bg pink -name 'Rose the desktop kitty'"; always = true; }
@@ -192,7 +192,6 @@ in with lib; {
       # Compositing {{{
       services.picom = mkIf config.jade.desktop.compositing {
         enable = true;
-        experimentalBackends = true;
         backend = "glx";
 
         shadow = true;
diff --git a/monosodium-glutamate-g/configuration.nix b/monosodium-glutamate-g/configuration.nix
index 9bc7358..b5bb14e 100644
--- a/monosodium-glutamate-g/configuration.nix
+++ b/monosodium-glutamate-g/configuration.nix
@@ -37,6 +37,7 @@
   # missing: menu-qalc picom-jonaburg
   environment.systemPackages = with pkgs; [
     # TODO: clean up.
+    nvtop-amd
   ];
 
   environment.pathsToLink = [