From 19ef7745c56d7bd66e250668bd0ea59026ca5cad Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Thu, 24 Jul 2025 19:14:11 -0700 Subject: [PATCH 1/6] add locktab bind --- modules/hyprland/hyprland.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/hyprland/hyprland.conf b/modules/hyprland/hyprland.conf index 078c0e7..c285d1d 100644 --- a/modules/hyprland/hyprland.conf +++ b/modules/hyprland/hyprland.conf @@ -175,6 +175,7 @@ bind = $mod, s, hy3:makegroup, v bind = $mod, z, hy3:makegroup, tab bind = $mod, a, hy3:changefocus, raise bind = $mod+SHIFT, a, hy3:changefocus, lower +bind = $mod, x, hy3:locktab bind = $mod, e, hy3:expand, expand bind = $mod+SHIFT, e, hy3:expand, base bind = $mod, r, hy3:changegroup, opposite From 43b2004ed5f42b7be7f7ba831bc5d9747d32a24d Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Thu, 24 Jul 2025 19:15:13 -0700 Subject: [PATCH 2/6] remove gaps when maximized in hl conf --- modules/hyprland/hyprland.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/hyprland/hyprland.conf b/modules/hyprland/hyprland.conf index c285d1d..3a534ed 100644 --- a/modules/hyprland/hyprland.conf +++ b/modules/hyprland/hyprland.conf @@ -287,3 +287,7 @@ bind = $mod+CONTROL, 7, hy3:focustab, index, 07 bind = $mod+CONTROL, 8, hy3:focustab, index, 08 bind = $mod+CONTROL, 9, hy3:focustab, index, 09 bind = $mod+CONTROL, 0, hy3:focustab, index, 10 + +workspace = f[1], gapsout:0, gapsin:0 +windowrule = bordersize 0, floating:0, onworkspace:f[1] +windowrule = rounding 0, floating:0, onworkspace:f[1] From c115bb6fc58d54204d98541ad9bf851394d9d6ee Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Thu, 24 Jul 2025 19:17:56 -0700 Subject: [PATCH 3/6] move msi specific packages to msi --- modules/user/general.nix | 5 --- systems/msi/default.nix | 4 +++ systems/msi/osu.nix | 73 ---------------------------------------- 3 files changed, 4 insertions(+), 78 deletions(-) delete mode 100644 systems/msi/osu.nix diff --git a/modules/user/general.nix b/modules/user/general.nix index a93ac88..6b4a133 100644 --- a/modules/user/general.nix +++ b/modules/user/general.nix @@ -112,7 +112,6 @@ home.packages = with pkgs; [ kwrite - krita gimp vlc mpv @@ -130,10 +129,8 @@ ripgrep fd qbittorrent - signal-desktop anki-bin kid3 - wireshark mumble freetube jujutsu @@ -142,8 +139,6 @@ xdg-utils light - kicad - unrar # used by ark libnotify # test with it a lot diff --git a/systems/msi/default.nix b/systems/msi/default.nix index 1a3d5b3..d2c4695 100644 --- a/systems/msi/default.nix +++ b/systems/msi/default.nix @@ -17,6 +17,10 @@ home-manager.users.${config.main-user} = { home.packages = with pkgs; [ osu-lazer-bin + kicad + wireshark + krita + signal-desktop ]; services.blueman-applet.enable = true; diff --git a/systems/msi/osu.nix b/systems/msi/osu.nix deleted file mode 100644 index a67656f..0000000 --- a/systems/msi/osu.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchzip -, appimageTools -}: - -let - pname = "osu-lazer-bin"; - version = "2024.221.0"; - - src = { - aarch64-darwin = fetchzip { - url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-U7i3rO7NVbBdOFMYpGrjI7LC//TEon3vdAHzjKeGsuk="; - stripRoot = false; - }; - x86_64-darwin = fetchzip { - url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-HEx1ZxxXnsHUD8Cqzld3RQoPZOfiXEmInlUMZVdDt6E="; - stripRoot = false; - }; - x86_64-linux = fetchurl { - url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-UY1HSOpcir9ybcxDuicklArynOFWkDtKqJe/LGeQOEM="; - }; - }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); - - meta = { - description = "Rhythm is just a *click* away (AppImage version for score submission and multiplayer, and binary distribution for Darwin systems)"; - homepage = "https://osu.ppy.sh"; - license = with lib.licenses; [ - mit - cc-by-nc-40 - unfreeRedistributable # osu-framework contains libbass.so in repository - ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ delan gepbird spacefault stepbrobd ]; - mainProgram = "osu!"; - platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; - }; - - passthru.updateScript = ./update-bin.sh; -in -if stdenv.isDarwin -then stdenv.mkDerivation { - inherit pname version src meta passthru; - - installPhase = '' - runHook preInstall - APP_DIR="$out/Applications" - mkdir -p "$APP_DIR" - cp -r . "$APP_DIR" - runHook postInstall - ''; -} -else appimageTools.wrapType2 { - inherit pname version src meta passthru; - - extraPkgs = pkgs: with pkgs; [ icu ]; - - extraInstallCommands = - let - contents = appimageTools.extract { inherit pname version src; }; - in - '' - mv -v $out/bin/${pname}-${version} $out/bin/osu\! - install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications - for i in 16 32 48 64 96 128 256 512 1024; do - install -D ${contents}/osu\!.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png - done - ''; -} From 9f4efbf2573ad45240af401d8240318c0023e639 Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Thu, 24 Jul 2025 19:18:54 -0700 Subject: [PATCH 4/6] remove mumble --- modules/user/general.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/user/general.nix b/modules/user/general.nix index 6b4a133..12f4d12 100644 --- a/modules/user/general.nix +++ b/modules/user/general.nix @@ -131,7 +131,6 @@ qbittorrent anki-bin kid3 - mumble freetube jujutsu From 8986d05ca2b9c9583c50a71b3e9e9ef5fded33bf Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Thu, 24 Jul 2025 19:19:16 -0700 Subject: [PATCH 5/6] enable DS and new renderer --- modules/hyprland/hyprland.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/hyprland/hyprland.conf b/modules/hyprland/hyprland.conf index 3a534ed..e2a95b0 100644 --- a/modules/hyprland/hyprland.conf +++ b/modules/hyprland/hyprland.conf @@ -71,7 +71,8 @@ misc { } render { - #direct_scanout = true + direct_scanout = true + new_render_scheduling = true } binds { From 6885da46e3fcee1cb3322c51bced4ad2ae86909d Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Thu, 24 Jul 2025 19:20:46 -0700 Subject: [PATCH 6/6] lenovo: remove mullvad --- systems/lenovo/default.nix | 1 - systems/lenovo/mullvad.nix | 4 ---- 2 files changed, 5 deletions(-) delete mode 100644 systems/lenovo/mullvad.nix diff --git a/systems/lenovo/default.nix b/systems/lenovo/default.nix index 53ddce0..58e1011 100755 --- a/systems/lenovo/default.nix +++ b/systems/lenovo/default.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { imports = [ ./hardware.nix - ./mullvad.nix ./hyprland ]; system.stateVersion = "23.11"; diff --git a/systems/lenovo/mullvad.nix b/systems/lenovo/mullvad.nix deleted file mode 100644 index f2e2622..0000000 --- a/systems/lenovo/mullvad.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, config, ... }: { - services.mullvad-vpn.enable = true; - home-manager.users.${config.main-user}.home.packages = [ pkgs.mullvad-vpn ]; -}