misc changes

xmonad: added new layout+keybinds, removed useless code
neovim: minor changes
hosts/satori: changed kernel to zen again
home/services and home/programs: minor changes
overlays: changed picom src and other minor changes

flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1626796208,
+        "lastModified": 1631325864,
-        "narHash": "sha256-NuHzubeQKHBD2GGMUn70I+tOkOsyM8meV3BtrLi4yVA=",
+        "narHash": "sha256-bBvrjUS0qfgC4LPFthGJ5E8Fl0f5UvlrCB3o5Bnn9ys=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "85da8b73661cd048386b136a995ff278946a4055",
+        "rev": "5c5bc282565f03f9c5b3d6e72b7cb985706148a6",
         "type": "github"
       },
       "original": {
@@ -34,30 +34,14 @@
         "type": "gitlab"
       }
     },
-    "discord-ipc-bridge": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1607757308,
-        "narHash": "sha256-hLdlvH0QITJjD3HQOnu/+7FKWFDsYqpr5h7AOcG+8k8=",
-        "owner": "hitomi-team",
-        "repo": "discord-ipc-bridge",
-        "rev": "7004fd3e073e5d44bde2101cd26203b10c6fa9a4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hitomi-team",
-        "repo": "discord-ipc-bridge",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1606424373,
+        "lastModified": 1627913399,
-        "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=",
+        "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf",
+        "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
         "type": "github"
       },
       "original": {
@@ -68,11 +52,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1623875721,
+        "lastModified": 1629481132,
-        "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
+        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
+        "rev": "997f7efcb746a9c140ce1f13c72263189225f482",
         "type": "github"
       },
       "original": {
@@ -86,11 +70,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1624228557,
+        "lastModified": 1630076227,
-        "narHash": "sha256-wwOqe73BsrXfRv1PhyXQFNC8iTET50KvE/HitdkRgxs=",
+        "narHash": "sha256-p3YdtqSPLnMudWsLMgd6XMEhQKB2oz1hvDkHtOlz5/Q=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "35a24648d155843a4d162de98c17b1afd5db51e4",
+        "rev": "f5adb9be829f487f99bcc0f1884f74ddb85f70c8",
         "type": "github"
       },
       "original": {
@@ -105,11 +89,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1626841047,
+        "lastModified": 1631134124,
-        "narHash": "sha256-DSS2Wuu9P0oUzVRTwkd9J/AALhS9kA2ZwSlX0u8gGsM=",
+        "narHash": "sha256-C17wJ2HyuFZllJ/PbpFuuDjkzWvg8np9UIAdSrpuwS0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "41101d0e62fe3cdb76e8e64349a2650da1433dd4",
+        "rev": "039f786e609fdb3cfd9c5520ff3791750c3eaebf",
         "type": "github"
       },
       "original": {
@@ -126,11 +110,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1626125282,
+        "lastModified": 1628684416,
-        "narHash": "sha256-5yQwvYz698KubuIouKP+6qAD8O853ZnC0t7mcPhhGZg=",
+        "narHash": "sha256-zm7JHe/K2NthgV57QhnmfT9i7azGa2tc5fJOzEiYlLo=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "a37dac9d66b0bbfc28ca64e7efbf4ce55be94143",
+        "rev": "fb85a3fe9e4f673f9c017a23ada00b05d61cdc6a",
         "type": "gitlab"
       },
       "original": {
@@ -141,11 +125,11 @@
     },
     "master": {
       "locked": {
-        "lastModified": 1626869884,
+        "lastModified": 1631384788,
-        "narHash": "sha256-UKLBJteX3hUgY7NOIRRzBpUT5NarwlDt9h79/nG2mPI=",
+        "narHash": "sha256-qud6zLYwwXoTGcPcI60oZv91djhNW79cwkgkVALaXww=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c1e00f694bf1cf14937a8c41e1ce5d75a940a9b1",
+        "rev": "73489348f63950e9e6089cdb1ca9342aa2bf213d",
         "type": "github"
       },
       "original": {
@@ -155,6 +139,26 @@
         "type": "github"
       }
     },
+    "nbfc": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_5",
+        "utils": "utils_2"
+      },
+      "locked": {
+        "lastModified": 1631007119,
+        "narHash": "sha256-Q/HxFgwp71ZJ6tQnDKz1Wzl85orES3Gq3He+jrl6xFI=",
+        "owner": "natto1784",
+        "repo": "nbfc-linux",
+        "rev": "f4137c8e6745faa3947116695bf46e413f446e57",
+        "type": "github"
+      },
+      "original": {
+        "owner": "natto1784",
+        "ref": "yawr",
+        "repo": "nbfc-linux",
+        "type": "github"
+      }
+    },
     "neovim-flake": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -164,11 +168,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1626816632,
+        "lastModified": 1631326779,
-        "narHash": "sha256-QDwTd5lw1T/0iZWLkk77b1lXLv51Q27tGzIeVtjh1rM=",
+        "narHash": "sha256-/T3QznIhQFVdpQLGk24JDI8bfFiPQOJ6+Ly4G6meiE4=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "6f48c018b526a776e38e94f58769c30141de9e0c",
+        "rev": "086631cd92d7b60f122963f9fd1779583b19004c",
         "type": "github"
       },
       "original": {
@@ -206,29 +210,13 @@
         "type": "indirect"
       }
     },
-    "nixpkgs-wine-osu": {
-      "locked": {
-        "lastModified": 1621361101,
-        "narHash": "sha256-jH4vlCdaWgTDMeNU/NUJXmSs+xrpBVPWzwb5xzq2aec=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "73b982e62194a5d85827d87b0851aee06932979f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "73b982e62194a5d85827d87b0851aee06932979f",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1626869884,
+        "lastModified": 1631384788,
-        "narHash": "sha256-UKLBJteX3hUgY7NOIRRzBpUT5NarwlDt9h79/nG2mPI=",
+        "narHash": "sha256-qud6zLYwwXoTGcPcI60oZv91djhNW79cwkgkVALaXww=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c1e00f694bf1cf14937a8c41e1ce5d75a940a9b1",
+        "rev": "73489348f63950e9e6089cdb1ca9342aa2bf213d",
         "type": "github"
       },
       "original": {
@@ -238,11 +226,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1626869884,
+        "lastModified": 1631384788,
-        "narHash": "sha256-UKLBJteX3hUgY7NOIRRzBpUT5NarwlDt9h79/nG2mPI=",
+        "narHash": "sha256-qud6zLYwwXoTGcPcI60oZv91djhNW79cwkgkVALaXww=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c1e00f694bf1cf14937a8c41e1ce5d75a940a9b1",
+        "rev": "73489348f63950e9e6089cdb1ca9342aa2bf213d",
         "type": "github"
       },
       "original": {
@@ -252,11 +240,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1607522989,
+        "lastModified": 1626852498,
-        "narHash": "sha256-o/jWhOSAlaK7y2M57OIriRt6whuVVocS/T0mG7fd1TI=",
+        "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e9158eca70ae59e73fae23be5d13d3fa0cfc78b4",
+        "rev": "16105403bdd843540cbef9c63fc0f16c1c6eaa70",
         "type": "github"
       },
       "original": {
@@ -267,11 +255,27 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1626679483,
+        "lastModified": 1626852498,
-        "narHash": "sha256-+BziIOkCKGqEvT8Xl59hym6CcB0hakqqxigKSuuBXmM=",
+        "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4181644d09b96af0f92c2f025d3463f9d19c7790",
+        "rev": "16105403bdd843540cbef9c63fc0f16c1c6eaa70",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1631275245,
+        "narHash": "sha256-vROU1OFI2zvKSBjbMpbpl9R08Or3eUwaW5HJLq88QWY=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "8b0b81dab17753ab344a44c04be90a61dc55badf",
         "type": "github"
       },
       "original": {
@@ -281,13 +285,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_7": {
       "locked": {
-        "lastModified": 1626643364,
+        "lastModified": 1631206977,
-        "narHash": "sha256-RuXbMt9X0j8g4t9i0m85XpbtM0ubzH92zpqZnyfHbG4=",
+        "narHash": "sha256-o3Dct9aJ5ht5UaTUBzXrRcK1RZt2eG5/xSlWJuUCVZM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "967d40bec14be87262b21ab901dbace23b7365db",
+        "rev": "4f6d8095fd51954120a1d08ea5896fe42dc3923b",
         "type": "github"
       },
       "original": {
@@ -297,28 +301,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1626019149,
-        "narHash": "sha256-0QeLkPoWjTDw9n1fmrwUg9IFIsjuD/YcX/DvMUQtqQw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "eed20f01e43e94f0adae14e8407e8ef386897060",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nur": {
       "locked": {
-        "lastModified": 1626856747,
+        "lastModified": 1631381877,
-        "narHash": "sha256-OxBQNKIHCMFkxYLc8Lyhv/mpmljgdjzxkhzMjG+HPxM=",
+        "narHash": "sha256-tJIiLHD8hFT/k3B23uSKRwo1uy/8pO7ow94hECjHAEQ=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "d77d673535ef0068779600c39cdfabf2af94de59",
+        "rev": "c965f192aaacb1d7fbf8afb049422043fe125dbe",
         "type": "github"
       },
       "original": {
@@ -331,14 +320,14 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "neovim-flake": "neovim-flake",
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1626855407,
+        "lastModified": 1631347924,
-        "narHash": "sha256-tw+NRzsImNXFV/bnDTTmVTt6y/W2j7l2sh5/yn1dIE4=",
+        "narHash": "sha256-JRVeXBlGp8eCic7HxEj/H9KEh9MLbbWq+rbMhDFLNkk=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "2ff2c52368a4e92c06e3cb01a5b7b174fc046dd5",
+        "rev": "3b416a38ba8f853aaeba9626712b3e64b85232c2",
         "type": "github"
       },
       "original": {
@@ -347,46 +336,6 @@
         "type": "github"
       }
     },
-    "oglfPatches": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1624106954,
-        "narHash": "sha256-PPchKKmTcGqCSMzmOcj2PhTeWcLgfzuCOU/yMAQh6mU=",
-        "owner": "openglfreak",
-        "repo": "wine-tkg-userpatches",
-        "rev": "ff6328a6b5e36dd8a007a7273290aa30ab3164d9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "openglfreak",
-        "repo": "wine-tkg-userpatches",
-        "rev": "ff6328a6b5e36dd8a007a7273290aa30ab3164d9",
-        "type": "github"
-      }
-    },
-    "osu-nix": {
-      "inputs": {
-        "discord-ipc-bridge": "discord-ipc-bridge",
-        "nixpkgs": "nixpkgs_7",
-        "nixpkgs-wine-osu": "nixpkgs-wine-osu",
-        "oglfPatches": "oglfPatches",
-        "tkgPatches": "tkgPatches",
-        "utils": "utils_2"
-      },
-      "locked": {
-        "lastModified": 1626818776,
-        "narHash": "sha256-o/vh2EfywbcAR/+9b7R0a9Dqg1/2GkQd8bGg4ZwoFcw=",
-        "owner": "fufexan",
-        "repo": "osu.nix",
-        "rev": "fdfb4fc0ef43bd75fac12e958f54696d1f777f29",
-        "type": "github"
-      },
-      "original": {
-        "owner": "fufexan",
-        "repo": "osu.nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -394,38 +343,21 @@
         "home-manager-unstable": "home-manager-unstable",
         "mailserver": "mailserver",
         "master": "master",
-        "nixpkgs": "nixpkgs_5",
+        "nbfc": "nbfc",
+        "nixpkgs": "nixpkgs_6",
         "nur": "nur",
         "nvim": "nvim",
-        "osu-nix": "osu-nix",
         "unstable": "unstable",
         "utils": "utils_3"
       }
     },
-    "tkgPatches": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1624646123,
-        "narHash": "sha256-MjN479YSlyhLt9fxoishGVCuQLg1SRMLF4TWh7cRuIQ=",
-        "owner": "Frogging-Family",
-        "repo": "wine-tkg-git",
-        "rev": "257bfe71c045db0fbbb9f3896f9697068b9f482a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Frogging-Family",
-        "repo": "wine-tkg-git",
-        "rev": "257bfe71c045db0fbbb9f3896f9697068b9f482a",
-        "type": "github"
-      }
-    },
     "unstable": {
       "locked": {
-        "lastModified": 1626793760,
+        "lastModified": 1631315520,
-        "narHash": "sha256-u8nOZte0QRjwcsx0B/lfutjk3Aufd6rlwOP7BAzISIU=",
+        "narHash": "sha256-Y8j0JYtZMifrHaWdTfTp1mYVXZ2PLJO/P0XZxMvo7KU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "314f595ab1cd09a27ad66dd1283344fa5745e473",
+        "rev": "b72ad04a8a324697d3fb92e19cd840379a902813",
         "type": "github"
       },
       "original": {
@@ -451,21 +383,6 @@
       }
     },
     "utils_2": {
-      "locked": {
-        "lastModified": 1620759905,
-        "narHash": "sha256-WiyWawrgmyN0EdmiHyG2V+fqReiVi8bM9cRdMaKQOFg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b543720b25df6ffdfcf9227afafc5b8c1fabfae8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "utils_3": {
       "locked": {
         "lastModified": 1623875721,
         "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
@@ -479,6 +396,21 @@
         "repo": "flake-utils",
         "type": "github"
       }
+    },
+    "utils_3": {
+      "locked": {
+        "lastModified": 1629481132,
+        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "997f7efcb746a9c140ce1f13c72263189225f482",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -10,16 +10,20 @@
     utils.url = github:numtide/flake-utils;
     nvim.url = github:nix-community/neovim-nightly-overlay;
     mailserver.url = gitlab:simple-nixos-mailserver/nixos-mailserver;
-    osu-nix.url = github:fufexan/osu.nix;
+    nbfc.url = github:natto1784/nbfc-linux/yawr;
   };
 
   outputs = inputs@{self, nixpkgs, unstable, master,  ... }:
   inputs.utils.lib.eachDefaultSystem (system: 
   let
+    mkPkgs = channel: system: import channel {
+      inherit system;
+      config.allowUnfree = true;
+    };
     channels = final: prev: {
-      unstable = unstable.legacyPackages.${prev.system};
+      unstable = mkPkgs unstable prev.system;
-      master = master.legacyPackages.${prev.system};
+      stable   = mkPkgs nixpkgs  prev.system;
-      stable = nixpkgs.legacyPackages.${prev.system};
+      master   = mkPkgs master   prev.system;
     };
     overlays = [
       (import ./overlays/overridesandshit.nix)
@@ -33,7 +37,7 @@
         inputs.nur.overlay 
         inputs.nvim.overlay
         channels
-        (_:_: {osu-nix = inputs.osu-nix.defaultPackage.${system};})
+        (_:_:{nbfc-linux=inputs.nbfc.defaultPackage.${system};})
       ];
       config.allowUnfree = true;
       config.allowBroken = true;
@@ -93,7 +97,7 @@
       Marisa = nixpkgs.lib.nixosSystem {
         system = "aarch64-linux";
         modules = [
-          ./hosts/marisa
+          ./hosts/servers/marisa.nix
           #inputs.mailserver.nixosModules.mailserver
           {
             nixpkgs.pkgs = self.legacyPackages.aarch64-linux; 
@@ -107,7 +111,7 @@
       Remilia = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          ./hosts/remilia
+          ./hosts/servers/remilia.nix
           inputs.mailserver.nixosModules.mailserver
           {
             nixpkgs.pkgs = self.legacyPackages.x86_64-linux; 

home/config/xmonad/xmobar.hs

@@ -16,13 +16,13 @@ Config {
         Run BatteryP ["BAT1","BAT0","BAT2"] ["-t", "<acstatus>", "-L", "10", "-H", "80", "-l", "#D3869B", "-h", "#8EC07C", "-n", "#EBDBB2", "--", "-O", "Charging", "-o", "<left>%", "-a", "notify-send -u critical 'Battery running out!'", "-A", "5", "--lows", "<fn=1>\xf243</fn> ", "--mediums", "<fn=1>\xf242</fn> ", "--highs", "<fn=1>\xf240</fn> "] 300,
         Run Network "wlp0s20f3" ["-t","<fn=1>\xf1eb</fn> <fc=#fabd2f><rx>/<tx></fc>"] 10,
         Run Date "<fn=1>\xf073 </fn> %a - %b, %_d ║ %H:%M:%S " "date" 100,
-        Run MPD ["-t", "<statei><title>", "--", "-P", ">>: ", "-Z", "||: ", "-S", "Stopped", "-h", "127.0.0.1", "-p", "6600"] 10,
+        Run MPD ["-t", "<statei><title>", "--", "-P", ">> ", "-Z", "|| ", "-S", "Stopped", "-h", "127.0.0.1", "-p", "6600"] 10,
  --       Run Com "playerctl" ["--player", "playerctld", "metadata", "--format", "{{status}}: {{title}}"] "" 10,
         Run Com "pamixer" ["--get-volume"] "" 600,
         Run UnsafeStdinReader
     ],
     sepChar = "*",
     alignSep = "--",
-    template = "<action=`dmenu_run` button=1><icon=/home/natto/.xmonad/lib/nixos.xpm/></action> *UnsafeStdinReader* ║ <fn=1></fn> *mpd* -- *multicpu* ║ *memory* ║ *wlp0s20f3* ║ *battery* ║ <fn=1></fn> <fc=#83a598>*pamixer*%</fc> ║ <fc=#ebdbb2>*date*</fc>"
+    template = "<action=`dmenu_run` button=1><icon=/home/natto/.xmonad/lib/nixos.xpm/></action> *UnsafeStdinReader* | <fn=1></fn> *mpd* -- *multicpu* | *memory* | *wlp0s20f3* | *battery* | <fn=1></fn> <fc=#83a598>*pamixer*%</fc> | <fc=#ebdbb2>*date*</fc>"
 }
 

home/config/xmonad/xmonad.hs

@@ -15,6 +15,7 @@ import XMonad.Util.Run (spawnPipe)
 import XMonad.Actions.FloatKeys (keysMoveWindow,
                                  keysResizeWindow)
 import Graphics.X11.ExtraTypes.XF86
+import XMonad.Actions.CycleWindows
 import qualified XMonad.StackSet as W
 import qualified Data.Map        as M
 
@@ -74,10 +75,12 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
      spawn "pamixer --allow-boost -i 5")
 
   , ((modMask .|. shiftMask, xK_comma),
-     spawn "pamixer -d 5")
+     spawn "pamixer --allow-boost -d 5")
 
-  , ((modMask .|. shiftMask, xK_q),
+  , ((modMask .|. shiftMask, xK_q), kill)
-     kill)
+
+  , ((mod1Mask, xK_Tab), 
+     cycleRecentWindows [xK_Alt_L] xK_Tab xK_q)
 
   , ((modMask .|. mod1Mask, xK_0), spawn "light -A 5")
 
@@ -125,28 +128,28 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
      windows W.swapUp    )
 
   , ((mod1Mask, xK_m),
-     withFocused (keysResizeWindow (-20, 0) (0, 0)))
+     sendMessage Expand)
 
   , ((mod1Mask, xK_i),
-     withFocused (keysResizeWindow (20, 0) (0, 0)))
+     sendMessage Shrink)
 
   , ((mod1Mask, xK_n),
-     withFocused (keysResizeWindow (0, 20) (0, 0)))
+     sendMessage MirrorExpand)
 
   , ((mod1Mask, xK_e),
-     withFocused (keysResizeWindow (0, -20) (0, 0)))
+     sendMessage MirrorShrink)
 
   , ((mod1Mask .|. shiftMask, xK_m),
-     withFocused (keysMoveWindow (-40, 0)))
+     withFocused (keysMoveWindow (-30, 0)))
 
   , ((mod1Mask .|. shiftMask, xK_i),
-     withFocused (keysMoveWindow (40, 0)))
+     withFocused (keysMoveWindow (30, 0)))
 
   , ((mod1Mask .|. shiftMask, xK_n),
-     withFocused (keysMoveWindow (0, 40)))
+     withFocused (keysMoveWindow (0, 30)))
 
   , ((mod1Mask .|. shiftMask, xK_e),
-     withFocused (keysMoveWindow (0, -40)))
+     withFocused (keysMoveWindow (0, -30)))
 
   , ((modMask, xK_t),
      withFocused $ windows . W.sink)
@@ -170,6 +173,7 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
 
 
 myLayoutHook = smartSpacing 8 $ smartBorders $ avoidStruts (
+    ResizableTall 1 (3/100) (3/5) [] |||
     spiral (6/7) |||
     tabbed shrinkText tabConfig |||
     ThreeCol 1 (3/100) (1/2) |||
@@ -185,39 +189,9 @@ toggleFullscreen =
         let isFullFloat = w `M.lookup` W.floating ws == Just fullRect
         windows $ if isFullFloat then W.sink w else W.float w fullRect
 --}}}
---{{{
---couldnt get fullScreenEventHook to work normally so using this for now
---source code: https://github.com/xmonad/xmonad-contrib/blob/v0.16/XMonad/Hooks/EwmhDesktops.hs
-
-fullscreenFix :: XConfig a -> XConfig a
-fullscreenFix c = c {
-                      startupHook = startupHook c +++ setSupportedWithFullscreen
-                    }
-                  where x +++ y = mappend x y
-
-setSupportedWithFullscreen :: X ()
-setSupportedWithFullscreen = withDisplay $ \dpy -> do
-    r <- asks theRoot
-    a <- getAtom "_NET_SUPPORTED"
-    c <- getAtom "ATOM"
-    supp <- mapM getAtom ["_NET_WM_STATE_HIDDEN"
-                         ,"_NET_WM_STATE_FULLSCREEN"
-                         ,"_NET_NUMBER_OF_DESKTOPS"
-                         ,"_NET_CLIENT_LIST"
-                         ,"_NET_CLIENT_LIST_STACKING"
-                         ,"_NET_CURRENT_DESKTOP"
-                         ,"_NET_DESKTOP_NAMES"
-                         ,"_NET_ACTIVE_WINDOW"
-                         ,"_NET_WM_DESKTOP"
-                         ,"_NET_WM_STRUT"
-                         ]
-    io $ changeProperty32 dpy r a c propModeReplace (fmap fromIntegral supp)
-
-    setWMName "xmonad"
---}}}
 
 main = do xmproc <- spawnPipe ("xmobar " ++ myXmobarrc)
-          xmonad $ docks $ fullscreenFix $ ewmh def
+          xmonad $ docks $ ewmh def
               { borderWidth        = myBorderWidth
               , manageHook         = manageDocks <+> myManageHook 
               , handleEventHook    = handleEventHook def <+> fullscreenEventHook

home/natto.nix

@@ -44,7 +44,7 @@ in
       pamixer
       mpdas
       pavucontrol
-      anup
+      unstable.anup
       xfce.thunar
       xfce.xfconf
       xfce.tumbler
@@ -67,7 +67,6 @@ in
       xorg.xmodmap
       p7zip
       unrar
-      wineWowPackages.staging
       glxinfo
       sxiv
       vim
@@ -79,7 +78,15 @@ in
       xdotool
       arc-theme
       arc-icon-theme
-      osu-nix
+      tor-browser-bundle-bin
+      wineWowPackages.stable
+      (master.winetricks.override { wine = wineWowPackages.stable; })
+      csvtool
+      pmidi
+      dosbox
+      authy
+      unstable.premid
+      nbfc-linux
     ];
 
     file = {

home/stuff/programs.nix

@@ -14,6 +14,10 @@
  #       userContent = builtins.readFile ../config/firefox/userContent.css;
       };
     };
+   /* chromium = {
+      enable = true;
+      package = pkgs.ungoogled-chromium;
+    };*/
     zathura = {
       enable = true;
       extraConfig = builtins.readFile ../config/zathura/zathurarc;
@@ -31,5 +35,6 @@
         save-position-on-quit = "yes";
       };
     };
+    go.enable = true;
   };
 }

home/stuff/services.nix

@@ -20,7 +20,7 @@ in
           blur-background = true;
           blur-method = "dual_kawase";
           blur-strength = 3;
-          blur-kern = "3x3box";
+          blur-kern = "11x11gaussian";
           fading = true;
           fade-in-step = 0.05;
           fade-out-step = 0.05;

hosts/satori/boot.nix

@@ -2,7 +2,7 @@
 
 {
   boot = {
-    kernelPackages = pkgs.linuxPackages_latest;
+    kernelPackages = pkgs.unstable.linuxPackages_zen;
     initrd={
       availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "vfio-pci"];
  /*     preDeviceCommands = ''
@@ -14,9 +14,9 @@
         '';*/
       kernelModules = [];
     };
-    kernelParams = [ "nvidia-drm.modeset=1" "intel_pstate=active" "intel_iommu=on" ]; 
+    kernelParams = [ "intel_pstate=active" "intel_iommu=on" ]; 
     kernelModules = [ "kvm-intel" ];
-    extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
+    extraModulePackages = with config.boot.kernelPackages; [ nvidia_x11 v4l2loopback];
     loader = {
       efi = {
         canTouchEfiVariables = true;

hosts/satori/stuff.nix

@@ -16,6 +16,7 @@
           users = [ "natto" ];
           keepEnv = true;
           persist = true;
+          setEnv =[ "SSH_AUTH_SOCK" "PATH" "SHELL" "HOME" ];
         }
       ];
     };
@@ -34,10 +35,13 @@
     home = "/home/natto";
     extraGroups = [ "wheel" "adbusers" "video" "libvirtd" ];
   };
-  i18n.inputMethod = {
+  i18n = {
+    inputMethod = {
       #   enabled = "fcitx5";
       #  fcitx5.addons = with pkgs; [ fcitx5-m17n fcitx5-mozc ];
       enabled = "fcitx";
       fcitx.engines = with pkgs.fcitx-engines; [ m17n mozc ];
     };
+  };
+  gtk.iconCache.enable = true;
 }

modules/nvidia-offload.nix

@@ -1,6 +1,6 @@
 {config, pkgs, ... }:
 let
-  nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" ''
+  nvidia-offload = pkgs.writeShellScriptBin "nvi" ''
     export __NV_PRIME_RENDER_OFFLOAD=1
     export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
     export __GLX_VENDOR_LIBRARY_NAME=nvidia
@@ -25,6 +25,10 @@ in
           nvidiaBusId = "PCI:1:0:0";
         };
         modesetting = { enable = true; };
+        powerManagement = {
+          enable = true;
+          finegrained = true;
+        };
       };
     };
     services.xserver.videoDrivers = [ "nvidia" ];

modules/nvim/default.nix

@@ -29,7 +29,7 @@
           nvim-tree-lua
           vim-vsnip
           nvim-treesitter
-          vim-nix
+          vim-polyglot
           (gruvbox.overrideAttrs (oa: { patches = [ ./gruvbox.patch ]; }))
         ];
       };

modules/nvim/init.lua

@@ -27,8 +27,8 @@ vim.o.splitbelow = true
 vim.o.splitright = true
 comm("set nowrap")
 vim.o.conceallevel = 0
-vim.o.tabstop = 4
+vim.o.tabstop = 2
-vim.o.shiftwidth = 4
+vim.o.shiftwidth = 2
 vim.o.smarttab = true
 vim.o.expandtab = true
 vim.o.smartindent = true

modules/xorg.nix

@@ -13,7 +13,7 @@
       libinput= {
         enable = true;
         mouse = {
-          accelSpeed = "0";
+          accelSpeed = null;
         };
         touchpad = {
           middleEmulation = false;

overlays/anup/default.nix

@@ -1,18 +0,0 @@
-{ lib, rustPlatform, fetchFromGitHub, sqlite, xdg_utils}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "anup";
-  version = "0.4.0";
-  src = fetchFromGitHub {
-    owner = "Acizza";
-    repo = "anup";
-    rev = version;
-    sha256 = "sha256-4pXF4p4K8+YihVB9NdgT6bOidmQEgWXUbcbvgXJ0IDA=";
-  };
-
-  buildInputs = [
-    sqlite.dev
-    xdg_utils
-  ];
-  cargoSha256 = "sha256-1TA2HDHKA3twFtlAWaC2zcRzS8TJwcbBt1OTQ3hC3qM=";
-}

overlays/customscripts/src/killmpd

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-killall mpdas
-killall mpd_discord_richpresence
-systemctl stop mpd.socket --user
-systemctl stop mpd.service --user

overlays/customscripts/src/mpdp

@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-#systemctl start mpd.service --user
-systemctl start mpd.socket --user
-mpdas &
-mpd_discord_richpresence &

overlays/overridesandshit.nix

@@ -36,12 +36,11 @@ final: prev: {
   };
 
   picom = prev.picom.overrideAttrs (oldAttrs: rec{
-    version = "Next";
     src = prev.fetchFromGitHub {
-      owner = "yshui";
+      owner = "jonaburg";
       repo = "picom";
-      rev = "v${version}";
+      rev = "a8445684fe18946604848efb73ace9457b29bf80";
-      sha256 = "0asp2hg1jx909kl7i876mcx00vwg9w2swr9i6d786iwgs247dc9i";
+      sha256 = "sha256-R+YUGBrLst6CpUgG9VCwaZ+LiBSDWTp0TLt1Ou4xmpQ=";
       fetchSubmodules = true;
     };
   });
@@ -52,4 +51,9 @@ final: prev: {
   proxychains = prev.proxychains.overrideAttrs (_ : { 
     postInstall = ":";
   });
+
+ /* tor-browser-bundle-bin = prev.tor-browser-bundle-bin.overrideAttrs (_ : { 
+    src = builtins.fetchurl { url = "https://www.torproject.org/dist/torbrowser/10.5.2/tor-browser-linux64-10.5.2_en-US.tar.xz"; sha256="16zk7d0sxm2j00vb002mjj38wxcxxlahnfdb9lmkmkfms9p9xfkb";};
+  });*/
+  
 }

overlays/packages.nix

@@ -2,5 +2,4 @@ final: prev: {
   mpd_discord_richpresence = prev.callPackage ./mpd-rpc {};
   customscripts = prev.callPackage ./customscripts {};
   gruvbox-icons = prev.callPackage ./gruvbox-icons {};
-  anup = prev.callPackage ./anup {};
 }