Merge remote branch 'origin/master'

Conflicts:
	flake.lock

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

flake.lock

@@ -39,11 +39,19 @@
         "utils": "utils"
       },
       "locked": {
+<<<<<<< ours
         "lastModified": 1667234164,
         "narHash": "sha256-oPMAvHZBDgamjmIQly5+sw2LtfKwY7qcWZZwKiwKQy8=",
         "owner": "nix-community",
         "repo": "home-manager",
         "rev": "722e8d65d3aba6f527100cc2d1539e4ca04d066f",
+=======
+        "lastModified": 1668900402,
+        "narHash": "sha256-IhVlueHoQNoN0SOHZIceKU3LyEL00g2ei0aUlaNypbQ=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "c0f9cbcf93ca22e4f0ca66843be61a4bdf6f0a44",
+>>>>>>> theirs
         "type": "github"
       },
       "original": {
@@ -123,11 +131,19 @@
     },
     "nixos-hardware": {
       "locked": {
+<<<<<<< ours
         "lastModified": 1667057402,
         "narHash": "sha256-MEIxCUD0Aiwr+QrZIbbcb8ReBsTYaleKie1AU6tRHfM=",
         "owner": "kekrby",
         "repo": "nixos-hardware",
         "rev": "5e738ab9bda8a53f284b52c74b7c5ac185e4a297",
+=======
+        "lastModified": 1668193714,
+        "narHash": "sha256-bmy4EBz5TQNH/DdQsDiOrpuXQQEoRMRf7bubxIfOz/o=",
+        "owner": "kekrby",
+        "repo": "nixos-hardware",
+        "rev": "f77985ad09ee071d9c98947f2e8896e23c013894",
+>>>>>>> theirs
         "type": "github"
       },
       "original": {
@@ -138,6 +154,7 @@
     },
     "nixpkgs": {
       "locked": {
+<<<<<<< ours
         "lastModified": 1602702596,
         "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=",
         "owner": "NixOS",
@@ -174,6 +191,13 @@
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "adf91a16c0354ba34f27c00c8ed3f4c73f2fd4d5",
+=======
+        "lastModified": 1668905981,
+        "narHash": "sha256-RBQa/+9Uk1eFTqIOXBSBezlEbA3v5OkgP+qptQs1OxY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "690ffff026b4e635b46f69002c0f4e81c65dfc2e",
+>>>>>>> theirs
         "type": "github"
       },
       "original": {
@@ -194,11 +218,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": {

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;

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