diff --git a/modules/hyprland/hyprland.conf b/modules/hyprland/hyprland.conf index e2a95b0..078c0e7 100644 --- a/modules/hyprland/hyprland.conf +++ b/modules/hyprland/hyprland.conf @@ -71,8 +71,7 @@ misc { } render { - direct_scanout = true - new_render_scheduling = true + #direct_scanout = true } binds { @@ -176,7 +175,6 @@ 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 @@ -288,7 +286,3 @@ 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] diff --git a/modules/user/general.nix b/modules/user/general.nix index 12f4d12..a93ac88 100644 --- a/modules/user/general.nix +++ b/modules/user/general.nix @@ -112,6 +112,7 @@ home.packages = with pkgs; [ kwrite + krita gimp vlc mpv @@ -129,8 +130,11 @@ ripgrep fd qbittorrent + signal-desktop anki-bin kid3 + wireshark + mumble freetube jujutsu @@ -138,6 +142,8 @@ xdg-utils light + kicad + unrar # used by ark libnotify # test with it a lot diff --git a/systems/lenovo/default.nix b/systems/lenovo/default.nix index 58e1011..53ddce0 100755 --- a/systems/lenovo/default.nix +++ b/systems/lenovo/default.nix @@ -1,6 +1,7 @@ { pkgs, ... }: { imports = [ ./hardware.nix + ./mullvad.nix ./hyprland ]; system.stateVersion = "23.11"; diff --git a/systems/lenovo/mullvad.nix b/systems/lenovo/mullvad.nix new file mode 100644 index 0000000..f2e2622 --- /dev/null +++ b/systems/lenovo/mullvad.nix @@ -0,0 +1,4 @@ +{ pkgs, config, ... }: { + services.mullvad-vpn.enable = true; + home-manager.users.${config.main-user}.home.packages = [ pkgs.mullvad-vpn ]; +} diff --git a/systems/msi/default.nix b/systems/msi/default.nix index d2c4695..1a3d5b3 100644 --- a/systems/msi/default.nix +++ b/systems/msi/default.nix @@ -17,10 +17,6 @@ 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 new file mode 100644 index 0000000..a67656f --- /dev/null +++ b/systems/msi/osu.nix @@ -0,0 +1,73 @@ +{ 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 + ''; +}