From 52e17cd48a65d0846ce7a1633272ed1ebde3a71f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Mon, 11 Mar 2024 10:49:17 +0100 Subject: [PATCH] stuff --- flake.lock | 48 ++++++++++++++--------------- home/desktops/hyprland/default.nix | 44 +++++++++++++++++--------- home/desktops/hyprland/keybinds.nix | 2 +- home/packages/default.nix | 1 + hosts/MONSTER/nvidia.nix | 4 +-- 5 files changed, 58 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index 74030ce..d2fd340 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1708967105, - "narHash": "sha256-rUr9G1h9mkj/YAogNypZLOQtmtDawJKf4S4wXlEIFbA=", + "lastModified": 1709223815, + "narHash": "sha256-rJVzCcmaz8nBBLaUR2fzjq5fWwgey5BDT0Sb06Ltgi8=", "owner": "Aylur", "repo": "ags", - "rev": "2e80d4e4f46f35d6529213c0a0e07f61b335cbe6", + "rev": "83656429d02028a57273e257816ebb286d7a648d", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1708806879, - "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=", + "lastModified": 1709204054, + "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", "owner": "nix-community", "repo": "home-manager", - "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a", + "rev": "2f3367769a93b226c467551315e9e270c3f78b15", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1708558280, - "narHash": "sha256-w1ns8evB6N9VTrAojcdXLWenROtd77g3vyClrqeFdG8=", + "lastModified": 1708988456, + "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=", "owner": "nix-community", "repo": "home-manager", - "rev": "0b69d574162cfa6eb7919d5614a48d0185550891", + "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca", "type": "github" }, "original": { @@ -202,11 +202,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1708968051, - "narHash": "sha256-EkRf32ZKV2QAyDDaD98jc+EGxCQR5b+uGwpuNkH1Z+o=", + "lastModified": 1709243510, + "narHash": "sha256-e47KWaUGQc+JLUABYdG0eCeqY1fFf1xGvakpKcdOP9c=", "owner": "hyprwm", "repo": "hyprland", - "rev": "f7a34534873bf499fc1a04a5fa25ada03c4ee415", + "rev": "f590505daf90dfb4059289a906863b59663e70a6", "type": "github" }, "original": { @@ -273,11 +273,11 @@ ] }, "locked": { - "lastModified": 1708231718, - "narHash": "sha256-IZdieFWvhBkxoOFMDejqLUYqD94WN6k0YSpw0DFy+4g=", + "lastModified": 1709001452, + "narHash": "sha256-FnZ54wkil54hKvr1irdKic1TE27lHQI9dKQmOJRrtlU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0e6857fa1d632637488666c08e7b02c08e3178f8", + "rev": "6c06334f0843c7300d1678726bb607ce526f6b36", "type": "github" }, "original": { @@ -320,11 +320,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1708807242, - "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", + "lastModified": 1709150264, + "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", + "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08", "type": "github" }, "original": { @@ -346,11 +346,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1708614940, - "narHash": "sha256-36muWApzetaV4WAEeqKsWxW4k2l0u3E841RI4sHPiz0=", + "lastModified": 1709277403, + "narHash": "sha256-xEpCiFOeu9Th0NUPUbsBncDKnXQd+A4XZd6r/FJ6dQw=", "owner": "nix-community", "repo": "nixvim", - "rev": "060a05138ca1a46fc0a0f79ef27f080cac57a59e", + "rev": "8c0bdb17e980b2ca64860e309ce601dd92ce0c51", "type": "github" }, "original": { @@ -361,11 +361,11 @@ }, "nur": { "locked": { - "lastModified": 1708965861, - "narHash": "sha256-5r+S5cqd6dqQCkkuW8GNSWNcd82zpZAcA+XjTg6zCSc=", + "lastModified": 1709278039, + "narHash": "sha256-+NW+df4TSznF0QFumSH0be17W1e0ONWILqw/IYKpFDs=", "owner": "nix-community", "repo": "NUR", - "rev": "053ea69d454c1f9a72f0b0250dc98f42e5a02ea1", + "rev": "975323e2a56dde3ed8879469091a830ca8b2f3cd", "type": "github" }, "original": { diff --git a/home/desktops/hyprland/default.nix b/home/desktops/hyprland/default.nix index 5d7aab9..5ec0d92 100644 --- a/home/desktops/hyprland/default.nix +++ b/home/desktops/hyprland/default.nix @@ -10,6 +10,10 @@ wayland.windowManager.hyprland = { enable = true; + systemd = { + enable = true; + variables = ["--all"]; + }; settings = { env = [ "LIBVA_DRIVER_NAME,nvidia" @@ -20,18 +24,11 @@ "__GL_GSYNC_ALLOWED,0" "__GL_VRR_ALLOWED,0" "NIXOS_OZONE_WL,1" - # Fixes black screen on Jellyfin - # https://github.com/jellyfin/jellyfin-media-player/issues/165#issuecomment-1569842393 - "QT_QPA_PLATFORM,xcb" - # Potentially (?) fixes dialogs randomly closing again in IntelliJ - # https://github.com/hyprwm/Hyprland/issues/1947 - "_JAVA_AWT_WM_NOREPARENTING,1" # Gnome file manager fix "GIO_EXTRA_MODULES,${pkgs.gnome.gvfs}/lib/gio/modules" ]; exec-once = [ - "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY XAUTHORITY" - "dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY XAUTHORITY" + "systemctl --user start hyprland-session.target" "gnome-keyring-daemon --start --components=secrets" "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1" ]; @@ -55,7 +52,7 @@ "SUPER,SUPER_L,exec,pkill anyrun || anyrun" ]; monitor = [ - "DP-1,highrr,0x0,1,bitdepth,10" + "DP-1,highrr,0x0,1,bitdepth,8" "DP-1,addreserved,250,0,0,0" ]; workspace = [ @@ -89,6 +86,9 @@ "noborder,class:^(gcr-prompter)$" "rounding 10,class:^(gcr-prompter)$" "animation slide,class:^(gcr-prompter)$" + # Flameshot fixes + "float,class:^(flameshot)$" + "animation fade,class:^(flameshot)$" ]; xwayland.force_zero_scaling = true; misc = { @@ -134,7 +134,20 @@ enable = true; indicator = true; }; - services.flameshot.enable = true; + services.flameshot = { + enable = true; + package = pkgs.flameshot.overrideAttrs (final: prev: { + cmakeFlags = ["-DUSE_WAYLAND_CLIPBOARD=1" "-DUSE_WAYLAND_GRIM=true"]; + nativeBuildInputs = prev.nativeBuildInputs ++ [pkgs.libsForQt5.kguiaddons]; + }); + settings = { + General = { + uiColor = "#99d1db"; + showDesktopNotification = false; + disabledTrayIcon = true; + }; + }; + }; programs.ags = { enable = true; configDir = ./ags; @@ -177,13 +190,16 @@ # fonts noto-fonts # essentials - xwaylandvideobridge hyprpicker grim slurp wl-clipboard polkit_gnome xdg-desktop-portal-gtk + # qt/kde packages + qt6.qtwayland + qt5.qtwayland + kdePackages.breeze-icons # gnome packages evince gnome.gvfs @@ -213,8 +229,8 @@ name = "adw-gtk3-dark"; package = pkgs.adw-gtk3; }; - gtk3.extraCss = builtins.readFile ./gtk.css; - gtk4.extraCss = builtins.readFile ./gtk.css; + #gtk3.extraCss = builtins.readFile ./gtk.css; + #gtk4.extraCss = builtins.readFile ./gtk.css; iconTheme = { name = "Tela"; package = pkgs.tela-icon-theme; @@ -222,7 +238,7 @@ }; qt = { enable = true; - platformTheme = "gtk"; + platformTheme = "qtct"; }; programs.fish.loginShellInit = diff --git a/home/desktops/hyprland/keybinds.nix b/home/desktops/hyprland/keybinds.nix index 0b15272..33d5097 100644 --- a/home/desktops/hyprland/keybinds.nix +++ b/home/desktops/hyprland/keybinds.nix @@ -4,7 +4,7 @@ "SUPER,TAB,exec,ags -t overview" "SUPER,C,togglespecialworkspace,calc" "SUPER_SHIFT,C,exec,hyprpicker | wl-copy" - "SUPER_SHIFT,V,exec,slurp | grim -g - - | wl-copy" + "SUPER_SHIFT,V,exec,XDG_CURRENT_DESKTOP=sway flameshot gui --clipboard" "SUPER,P,togglefloating," "SUPER,P,pin," "SUPER,D,fullscreen,1" diff --git a/home/packages/default.nix b/home/packages/default.nix index dbae400..8287a51 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -40,6 +40,7 @@ scribus audacity pinta + kdePackages.kdenlive # friture TODO: broken (blender.override { cudaSupport = true; diff --git a/hosts/MONSTER/nvidia.nix b/hosts/MONSTER/nvidia.nix index d6b2cac..b379fed 100644 --- a/hosts/MONSTER/nvidia.nix +++ b/hosts/MONSTER/nvidia.nix @@ -18,7 +18,6 @@ boot.kernelModules = ["nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm"]; boot.initrd.kernelModules = ["nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm"]; - boot.extraModulePackages = [config.boot.kernelPackages.nvidia_x11_beta]; hardware.nvidia = { modesetting.enable = true; @@ -28,7 +27,6 @@ nvidiaSettings = false; # no idea if this actually does anything... nvidiaPersistenced = false; - package = config.boot.kernelPackages.nvidiaPackages.beta; }; environment = { @@ -37,8 +35,10 @@ LIBVA_DRIVER_NAME = "nvidia"; }; systemPackages = with pkgs; [ + glxinfo nvtop-nvidia libva-utils + vulkan-tools ]; }; }