From 46a34a6ef58d1d2ed02ffd4f791ec178c49c3aca Mon Sep 17 00:00:00 2001 From: Kris Date: Sat, 28 Mar 2026 22:37:08 +0200 Subject: [PATCH] upd --- config/hypr/config/display.conf | 5 ++++- config/hypr/config/keybindings/other.conf | 6 +++--- flake.lock | 7 ++++--- flake.nix | 2 +- hosts/default/configuration.nix | 7 +------ hosts/default/packages.nix | 8 -------- hosts/server/configuration.nix | 3 --- modules/nixos/bootloader.nix | 6 ++---- modules/nixos/main-user.nix | 2 +- modules/nixos/nixpkgs.nix | 7 +++++++ 10 files changed, 23 insertions(+), 30 deletions(-) diff --git a/config/hypr/config/display.conf b/config/hypr/config/display.conf index 50aad41..72c0eb2 100644 --- a/config/hypr/config/display.conf +++ b/config/hypr/config/display.conf @@ -13,7 +13,10 @@ monitor=,1920x1080@240,auto,1 general { gaps_in = 5 gaps_out = 20 - border_size = 0 + border_size = 2 + + col.active_border = rgb(ffffff) + col.inactive_border = rgb(ffffff) # col.active_border = rgb(89b4fa) # col.inactive_border = rgb(585b70) diff --git a/config/hypr/config/keybindings/other.conf b/config/hypr/config/keybindings/other.conf index 233346a..312664f 100644 --- a/config/hypr/config/keybindings/other.conf +++ b/config/hypr/config/keybindings/other.conf @@ -12,9 +12,9 @@ bind = $mainMod SHIFT, B, exec, bash /etc/nixos/scripts/hot-reload.sh bind = $mainMod SHIFT, RETURN, exec, bash /etc/nixos/scripts/select-wallpaper.sh # Screenshot keybinds -bindu = , PRINT, exec, bash -lc 'QT_QPA_PLATFORM=wayland flameshot gui' -bindu = $mainMod SHIFT, PRINT, exec, bash -lc 'QT_QPA_PLATFORM=wayland flameshot full --path ~/Pictures/Screenshots' -bind = $mainMod CTRL SHIFT, PRINT, exec, bash -lc 'QT_QPA_PLATFORM=wayland flameshot launcher' +bindu = , PRINT, exec, bash -lc 'env -u QT_STYLE_OVERRIDE QT_QPA_PLATFORMTHEME=qt6ct QT_QPA_PLATFORM=wayland flameshot gui' +bindu = $mainMod SHIFT, PRINT, exec, bash -lc 'env -u QT_STYLE_OVERRIDE QT_QPA_PLATFORMTHEME=qt6ct QT_QPA_PLATFORM=wayland flameshot full --path ~/Pictures/Screenshots' +bind = $mainMod CTRL SHIFT, PRINT, exec, bash -lc 'env -u QT_STYLE_OVERRIDE QT_QPA_PLATFORMTHEME=qt6ct QT_QPA_PLATFORM=wayland flameshot launcher' # Music Get Keybind diff --git a/flake.lock b/flake.lock index f1ce613..8c9f797 100644 --- a/flake.lock +++ b/flake.lock @@ -2018,15 +2018,16 @@ "nixpkgs": "nixpkgs_14" }, "locked": { - "lastModified": 1774706015, - "narHash": "sha256-rEzceyYrSKJ5Ur5FyjwswEVPdzijbLcmixM9IU4NMq0=", + "lastModified": 1774708879, + "narHash": "sha256-rTYvYkQL69/YkZB+MRA/IaX1qJ1lPx5KXoQS2/9+7Mw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "99ec80a50cb5bba8a840e04f24c4c10603a3e43c", + "rev": "d01d23c798cceef42307d5789bfbce70515e8800", "type": "github" }, "original": { "owner": "0xc000022070", + "ref": "beta", "repo": "zen-browser-flake", "type": "github" } diff --git a/flake.nix b/flake.nix index cd7e7fc..78003d3 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,7 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.systems.follows = "hyprland/systems"; }; - zen-browser.url = "github:0xc000022070/zen-browser-flake"; + zen-browser.url = "github:0xc000022070/zen-browser-flake/beta"; quickshell = { url = "github:outfoxxed/quickshell"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 09d9c14..274df88 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -58,12 +58,6 @@ in { openFirewall = false; }; - programs.virt-manager.enable = true; - users.groups.libvirtd.members = [ userName ]; - virtualisation.libvirtd.enable = true; - # virtualisation.waydroid.enable = true; - virtualisation.spiceUSBRedirection.enable = true; - networking.extraHosts = '' # dont worry, i still don't like the guy # but i need to community note roblox on how their moderation is still shit @@ -279,6 +273,7 @@ in { settings = { General = { disabledTrayIcon = true; + showDesktopNotification = false; showStartupLaunchMessage = false; savePath = "/home/kris/Pictures/Screenshots"; savePathFixed = true; diff --git a/hosts/default/packages.nix b/hosts/default/packages.nix index 1b7d6ab..bd1b423 100644 --- a/hosts/default/packages.nix +++ b/hosts/default/packages.nix @@ -14,8 +14,6 @@ (callPackage ./packages/nonnix-fonts.nix { }) ]; - environment.sessionVariables.LD_LIBRARY_PATH = "${pkgs.gcc15}/lib"; - security.polkit.enable = true; security.soteria.enable = true; @@ -28,12 +26,6 @@ inputs.hyprlock.packages.${pkgs.stdenv.hostPlatform.system}.hyprlock inputs.hyprsysteminfo.packages.${pkgs.stdenv.hostPlatform.system}.hyprsysteminfo - qemu - (writeShellScriptBin "qemu-system-x86_64-uefi" '' - qemu-system-x86_64 \ - -bios ${OVMF.fd}/FV/OVMF.fd \ - "$@" - '') (writeShellScriptBin "regretevator" "xdg-open roblox://placeId=4972273297") (writeShellScriptBin "kaijuparadise" "xdg-open roblox://placeId=6456351776") (writeShellScriptBin "sewh" "xdg-open roblox://placeId=16991287194") diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index 5694fd7..5a21bab 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -60,9 +60,6 @@ in ./slop/brave.nix ]; - # gcc. shit breaks. wtf - environment.sessionVariables.LD_LIBRARY_PATH = "${pkgs.gcc15}/lib"; - services.vscode-server.enable = true; services.openssh.settings = lib.mkDefault { diff --git a/modules/nixos/bootloader.nix b/modules/nixos/bootloader.nix index 6f83864..69b9073 100644 --- a/modules/nixos/bootloader.nix +++ b/modules/nixos/bootloader.nix @@ -25,13 +25,11 @@ ]; boot.loader = { - efi = { - # canTouchEfiVariables = true; - }; grub = { efiSupport = true; device = "nodev"; - efiInstallAsRemovable = true; + # efiSysMountPoint = "/boot"; + # efiInstallAsRemovable = true; # will kill pc if triplebooting w*ndows, nixos and cachyos useOSProber = true; gfxmodeEfi = "1920x1080"; diff --git a/modules/nixos/main-user.nix b/modules/nixos/main-user.nix index 0ba13b9..6727ab8 100644 --- a/modules/nixos/main-user.nix +++ b/modules/nixos/main-user.nix @@ -28,7 +28,7 @@ initialPassword = "password"; description = "${config.main-user.realName}"; shell = pkgs.zsh; - extraGroups = [ "networkmanager" "gamemode" "wheel" "input" "video" "libvirtd" "power" ]; + extraGroups = [ "networkmanager" "gamemode" "wheel" "input" "video" "power" ]; packages = config.main-user.packages; }; }; diff --git a/modules/nixos/nixpkgs.nix b/modules/nixos/nixpkgs.nix index 73446e5..03ee445 100644 --- a/modules/nixos/nixpkgs.nix +++ b/modules/nixos/nixpkgs.nix @@ -6,6 +6,13 @@ nixpkgs.config.replaceStdenv = args: args.pkgs.stdenv; nixpkgs.config.packageOverrides = pkgs: { vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; + equibop = pkgs.equibop.overrideAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkgs.makeWrapper ]; + postFixup = (old.postFixup or "") + '' + wrapProgram $out/bin/equibop \ + --prefix LD_LIBRARY_PATH : "${pkgs.lib.makeLibraryPath [ (pkgs.lib.getLib pkgs.stdenv.cc.cc) ]}" + ''; + }); }; nix.settings.experimental-features = [ "nix-command" "flakes" ];