From 2045692ad59fb3150b8c06cc3ef123ad95b61d80 Mon Sep 17 00:00:00 2001
From: meml0rz <meml0rz>
Date: Fri, 13 Dec 2024 00:40:29 +0100
Subject: [PATCH] kekl

---
 configuration.nix               |  31 +++---
 hardware-configuration.nix      |  15 +--
 modules/home.nix                |   2 +-
 modules/nix/bspwm/alacritty.nix |  44 ++++----
 modules/nix/bspwm/bspwm.nix     |   2 +-
 modules/nix/qutebrowser.nix     | 187 ++++++++++++++++++++++++++++++++
 6 files changed, 233 insertions(+), 48 deletions(-)
 create mode 100644 modules/nix/qutebrowser.nix

diff --git a/configuration.nix b/configuration.nix
index f40701a..84a2fef 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -159,23 +159,20 @@
 
   fonts = {
     fontconfig.enable = true;
-    fonts = {
-      fontDir.enable = true;
-      packages =
-        with pkgs;
-        [
-          noto-fonts
-          noto-fonts-emoji
-          liberation_ttf
-          fira-code
-          fira-code-symbols
-          fantasque-sans-mono
-          mplus-outline-fonts.githubRelease
-          dina-font
-          proggyfonts
-        ]
-        ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
-    };
+		packages =
+			with pkgs;
+			[
+				noto-fonts
+				noto-fonts-emoji
+				liberation_ttf
+				fira-code
+				fira-code-symbols
+				fantasque-sans-mono
+				mplus-outline-fonts.githubRelease
+				dina-font
+				proggyfonts
+			]
+			++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
   };
   system.stateVersion = "unstable";
 
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index c098d80..ecfbf7e 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -8,18 +8,18 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-label/NIXROOT";
+    { device = "/dev/disk/by-uuid/d15649f6-6928-4527-bb66-1e1c3c8bcd76";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-label/ESP";
+    { device = "/dev/disk/by-uuid/A38C-F2A8";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };
@@ -31,9 +31,10 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wwp0s20f0u3i12.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/modules/home.nix b/modules/home.nix
index 69c8c28..c57b38b 100644
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -9,7 +9,7 @@
     ./nix/user.nix
     ./nix/nvim/default.nix
     ./nix/hypr/default.nix
-    #./nix/bspwm/default.nix
+    ./nix/bspwm/default.nix
   ];
 
   home = {
diff --git a/modules/nix/bspwm/alacritty.nix b/modules/nix/bspwm/alacritty.nix
index ceb08a2..f798a49 100644
--- a/modules/nix/bspwm/alacritty.nix
+++ b/modules/nix/bspwm/alacritty.nix
@@ -4,37 +4,37 @@
     alacritty = {
       enable = true;
       settings = {
-        terminal.shell = {
-          program = "tmux";
-        };
+        #terminal.shell = {
+        #  program = "tmux";
+        #};
         colors = {
           primary = {
-            background = "#282828";
-            foreground = "#ebdbb2";
+            background = "#161616";
+            foreground = "#ffffff";
           };
           normal = {
-            black = "#282828";
-            red = "#cc241d";
-            green = "#98971a";
-            yellow = "#d79921";
-            blue = "#458588";
-            magenta = "#b16286";
-            cyan = "#689d6a";
-            white = "#a89984";
+            black = "#262626";
+            magenta = "#ff7eb6";
+            green = "#42be65";
+            yellow = "#ffe97b";
+            blue = "#33b1ff";
+            red = "#ee5396";
+            cyan = "#3ddbd9";
+            white = "#dde1e6";
           };
           bright = {
-            black = "#928374";
-            red = "#fb4934";
-            green = "#b8bb26";
-            yellow = "#fabd2f";
-            blue = "#83a598";
-            magenta = "#d3869b";
-            cyan = "#8ec07c";
-            white = "#ebdbb2";
+            black = "#393939";
+            magenta = "#ff7eb6";
+            green = "#42be65";
+            yellow = "#ffe97b";
+            blue = "#33b1ff";
+            red = "#ee5396";
+            cyan = "#3ddbd9";
+            white = "#ffffff";
           };
         };
         font = {
-          size = 20;
+          size = 10;
           normal = {
             family = "FantasqueSansMNerdFont";
           };
diff --git a/modules/nix/bspwm/bspwm.nix b/modules/nix/bspwm/bspwm.nix
index db56732..ffae748 100644
--- a/modules/nix/bspwm/bspwm.nix
+++ b/modules/nix/bspwm/bspwm.nix
@@ -33,7 +33,7 @@
     };
     extraConfig = ''
       sxhkd -c ~/.config/sxhkd/sxhkdrc & 
-      ${pkgs.feh}/bin/feh --bg-fill ~/.wp/gruvbox-dark-blue.png &
+      ${pkgs.feh}/bin/feh --bg-fill ~/.wp/anime_blue.png &
       bspc monitor -d 1 2 3 4 5 6 7 8 9 0
 
 
diff --git a/modules/nix/qutebrowser.nix b/modules/nix/qutebrowser.nix
new file mode 100644
index 0000000..859726a
--- /dev/null
+++ b/modules/nix/qutebrowser.nix
@@ -0,0 +1,187 @@
+{
+  config,
+  pkgs,
+  ...
+}:
+{
+  programs = {
+    qutebrowser = {
+      enable = true;
+      extraConfig = ''
+                c.colors.webpage.darkmode.enabled = True
+                config.load_autoconfig(True)
+                config.set("content.cookies.accept", "all", "chrome-devtools://*")
+                config.set("content.cookies.accept", "all", "devtools://*")
+                config.set("content.headers.accept_language", "", "https://matchmaker.krunker.io/*")
+                config.set("content.headers.user_agent", "Mozilla/5.0 ({os_info}) AppleWebKit/{webkit_version} (KHTML, like Gecko) {upstream_browser_key}/{upstream_browser_version} Safari/{webkit_version}", "https://web.whatsapp.com/")
+                config.set("content.headers.user_agent", "Mozilla/5.0 ({os_info}; rv:90.0) Gecko/20100101 Firefox/90.0", "https://accounts.google.com/*")
+                config.set("content.images", True, "chrome-devtools://*")
+                config.set("content.images", True, "devtools://*")
+                config.set("content.javascript.enabled", True, "chrome-devtools://*")
+                config.set("content.javascript.enabled", True, "devtools://*")
+                config.set("content.javascript.enabled", True, "chrome://*/*")
+                config.set("content.javascript.enabled", True, "qute://*/*")
+                config.set("content.local_content_can_access_remote_urls", True, "file:///home/fabian/.local/share/qutebrowser/userscripts/*")
+                config.set("content.local_content_can_access_file_urls", False, "file:///home/fabian/.local/share/qutebrowser/userscripts/*")
+                config.set("colors.webpage.darkmode.enabled", True)
+                config.bind(";st", ":open speedtest.net")
+                config.bind("Right", "tab-next")
+                config.bind("Left", "tab-prev")
+                config.bind(">", ":forward")
+                config.bind("<", ":back")
+                config.bind(";r", ":config-source")
+                config.bind(";q", ":tab-close")
+                config.bind(";f", ":fullscreen")
+                
+                bg0_hard = "#181818"
+        bg0_soft = "#32302f"
+        bg0_normal = "#282828"
+
+        bg0 = bg0_normal
+        bg1 = "#3c3836"
+        bg2 = "#504945"
+        bg3 = "#665c54"
+        bg4 = "#7c6f64"
+
+        fg0 = "#dcd7ba"
+        fg1 = "#a8a8a8"
+        fg2 = "#8a8a8a"
+        fg3 = "#5c5c5c"
+        fg4 = "#3e3e3e"
+
+        bright_red = "#ff5c57"
+        bright_green = "#5af78e"
+        bright_yellow = "#f3f99d"
+        bright_blue = "#57c7ff"
+        bright_purple = "#ff6ac1"
+        bright_aqua = "#9aedfe"
+        bright_gray = "#a8a8a8"
+        bright_orange = "#ff9d00"
+
+        dark_red = "#ff3f45"
+        dark_green = "#68d391"
+        dark_yellow = "#e0e0e0"
+        dark_blue = "#56c7ff"
+        dark_purple = "#f460a1"
+        dark_aqua = "#50fa7b"
+        dark_gray = "#333333"
+        dark_orange = "#ff8700"
+
+        ### Completion
+        c.colors.completion.fg = [fg1, bright_aqua, bright_yellow]
+        c.colors.completion.odd.bg = bg0
+        c.colors.completion.even.bg = c.colors.completion.odd.bg
+        c.colors.completion.category.fg = bright_blue
+        c.colors.completion.category.bg = bg1
+        c.colors.completion.category.border.top = c.colors.completion.category.bg
+        c.colors.completion.category.border.bottom = c.colors.completion.category.bg
+        c.colors.completion.item.selected.fg = fg0
+        c.colors.completion.item.selected.bg = bg4
+        c.colors.completion.item.selected.border.top = bg2
+        c.colors.completion.item.selected.border.bottom = c.colors.completion.item.selected.border.top
+        c.colors.completion.item.selected.match.fg = bright_orange
+        c.colors.completion.match.fg = c.colors.completion.item.selected.match.fg
+        c.colors.completion.scrollbar.fg = c.colors.completion.item.selected.fg
+        c.colors.completion.scrollbar.bg = c.colors.completion.category.bg
+
+        ### Context menu
+        c.colors.contextmenu.disabled.bg = bg3
+        c.colors.contextmenu.disabled.fg = fg3
+        c.colors.contextmenu.menu.bg = bg0
+        c.colors.contextmenu.menu.fg = fg2
+        c.colors.contextmenu.selected.bg = bg2
+        c.colors.contextmenu.selected.fg = c.colors.contextmenu.menu.fg
+
+        ### Downloads
+        c.colors.downloads.bar.bg = bg0
+        c.colors.downloads.start.fg = bg0
+        c.colors.downloads.start.bg = bright_blue
+        c.colors.downloads.stop.fg = c.colors.downloads.start.fg
+        c.colors.downloads.stop.bg = bright_aqua
+        c.colors.downloads.error.fg = bright_red
+
+        ### Hints
+        c.colors.hints.fg = bg0
+        c.colors.hints.bg = 'rgba(250, 191, 47, 200)'
+        c.colors.hints.match.fg = bg4
+
+        ### Keyhint widget
+        c.colors.keyhint.fg = fg4
+        c.colors.keyhint.suffix.fg = fg0
+        c.colors.keyhint.bg = bg0
+
+        ### Messages
+        c.colors.messages.error.fg = bg0
+        c.colors.messages.error.bg = bright_red
+        c.colors.messages.error.border = c.colors.messages.error.bg
+        c.colors.messages.warning.fg = bg0
+        c.colors.messages.warning.bg = bright_purple
+        c.colors.messages.warning.border = c.colors.messages.warning.bg
+        c.colors.messages.info.fg = fg2
+        c.colors.messages.info.bg = bg0
+        c.colors.messages.info.border = c.colors.messages.info.bg
+
+        ### Prompts
+        c.colors.prompts.fg = fg2
+        c.colors.prompts.border = f'1px solid {bg1}'
+        c.colors.prompts.bg = bg3
+        c.colors.prompts.selected.bg = bg2
+
+        ### Statusbar
+        c.colors.statusbar.normal.fg = fg2
+        c.colors.statusbar.normal.bg = bg0
+        c.colors.statusbar.insert.fg = bg0
+        c.colors.statusbar.insert.bg = dark_aqua
+        c.colors.statusbar.passthrough.fg = bg0
+        c.colors.statusbar.passthrough.bg = dark_blue
+        c.colors.statusbar.private.fg = bright_purple
+        c.colors.statusbar.private.bg = bg0
+        c.colors.statusbar.command.fg = fg3
+        c.colors.statusbar.command.bg = bg1
+        c.colors.statusbar.command.private.fg = c.colors.statusbar.private.fg
+        c.colors.statusbar.command.private.bg = c.colors.statusbar.command.bg
+        c.colors.statusbar.caret.fg = bg0
+        c.colors.statusbar.caret.bg = dark_purple
+        c.colors.statusbar.caret.selection.fg = c.colors.statusbar.caret.fg
+        c.colors.statusbar.caret.selection.bg = bright_purple
+        c.colors.statusbar.progress.bg = bright_blue
+        c.colors.statusbar.url.fg = fg4
+        c.colors.statusbar.url.error.fg = dark_red
+        c.colors.statusbar.url.hover.fg = bright_orange
+        c.colors.statusbar.url.success.http.fg = bright_red
+        c.colors.statusbar.url.success.https.fg = fg0
+        c.colors.statusbar.url.warn.fg = bright_purple
+
+        ### Tabs
+        c.colors.tabs.bar.bg = bg0
+        c.colors.tabs.indicator.start = bright_blue
+        c.colors.tabs.indicator.stop = bright_aqua
+        c.colors.tabs.indicator.error = bright_red
+        c.colors.tabs.odd.fg = fg2
+        c.colors.tabs.odd.bg = bg2
+        c.colors.tabs.even.fg = c.colors.tabs.odd.fg
+        c.colors.tabs.even.bg = bg3
+        c.colors.tabs.selected.odd.fg = fg2
+        c.colors.tabs.selected.odd.bg = bg0
+        c.colors.tabs.selected.even.fg = c.colors.tabs.selected.odd.fg
+        c.colors.tabs.selected.even.bg = bg0
+        c.colors.tabs.pinned.even.bg = bright_green
+        c.colors.tabs.pinned.even.fg = bg2
+        c.colors.tabs.pinned.odd.bg = bright_green
+        c.colors.tabs.pinned.odd.fg = c.colors.tabs.pinned.even.fg
+        c.colors.tabs.pinned.selected.even.bg = bg0
+        c.colors.tabs.pinned.selected.even.fg = c.colors.tabs.selected.odd.fg
+        c.colors.tabs.pinned.selected.odd.bg = c.colors.tabs.pinned.selected.even.bg
+        c.colors.tabs.pinned.selected.odd.fg = c.colors.tabs.selected.odd.fg
+
+      '';
+
+      greasemonkey = [
+        (pkgs.fetchurl {
+          url = "https://raw.githubusercontent.com/afreakk/greasemonkeyscripts/1d1be041a65c251692ee082eda64d2637edf6444/youtube_sponsorblock.js";
+          sha256 = "sha256-e3QgDPa3AOpPyzwvVjPQyEsSUC9goisjBUDMxLwg8ZE=";
+        })
+      ];
+    };
+  };
+}