diff --git a/flake.lock b/flake.lock index 3488395..e040384 100644 --- a/flake.lock +++ b/flake.lock @@ -648,11 +648,11 @@ }, "nixpkgs-mesa-git": { "locked": { - "lastModified": 1741955369, - "narHash": "sha256-J09mVW9X+e1tbHLJcs3qFtGR4jmzc+i9+qjZIeKNGTk=", + "lastModified": 1742289590, + "narHash": "sha256-q8/3YGv7LLReXOiiAH2S39YWeiM2fi0jlLA0hqdlacY=", "owner": "kropatz", "repo": "nixpkgs", - "rev": "7e984e8442aac2371318f18951edc00f2c675aa7", + "rev": "ea362816984b10d5e3714cce63525888db07dda8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 81b8ed3..f9b61ef 100644 --- a/flake.nix +++ b/flake.nix @@ -75,7 +75,6 @@ modifications unstable-packages stable-packages - gimp3 mesa-git nur.overlays.default ]; diff --git a/home-manager/hyprland/hyprland-settings.nix b/home-manager/hyprland/hyprland-settings.nix index 2269987..45b2baf 100644 --- a/home-manager/hyprland/hyprland-settings.nix +++ b/home-manager/hyprland/hyprland-settings.nix @@ -228,6 +228,11 @@ in { "$mainMod, right, movefocus, r" "$mainMod, up, movefocus, u" "$mainMod, down, movefocus, d" + "$mainMod SHIFT, left, resizeactive, -30 0" + "$mainMod SHIFT, right, resizeactive, 30 0" + "$mainMod SHIFT, up, resizeactive, 0 -30" + "$mainMod SHIFT, down, resizeactive, 0 30" + # Switch workspaces with mainMod + [0-9] "$mainMod, 1, workspace, 1" diff --git a/modules/graphical/games.nix b/modules/graphical/games.nix index cf46741..f3641ef 100644 --- a/modules/graphical/games.nix +++ b/modules/graphical/games.nix @@ -1,6 +1,16 @@ { config, lib, pkgs, ... }: with lib; -let cfg = config.custom.graphical.games; +let + cfg = config.custom.graphical.games; + #proton-cachy = pkgs.proton-ge-bin.overrideAttrs (old: rec { + # pname = "proton-cachyos-bin"; + # version = "cachyos-9.0-20250102-slr"; + # src = pkgs.fetchzip { + # url = + # "https://github.com/CachyOS/proton-cachyos/releases/download/${version}/proton-${version}-x86_64_v3.tar.xz"; + # hash = "sha256-aWpTUAm9FBuZI2KwEvhSnLB7Mfp5nYgUwvvLF47FIfM="; + # }; + #}); in { options.custom.graphical.games = { enable = mkEnableOption "Enables games"; diff --git a/overlays.nix b/overlays.nix index e9298da..741d031 100644 --- a/overlays.nix +++ b/overlays.nix @@ -78,13 +78,6 @@ in { }; }; - gimp3 = final: _prev: { - gimp3 = import inputs.nixpkgs-gimp3 { - system = final.system; - config.allowUnfree = true; - }; - }; - mesa-git = final: _prev: { mesa-git = import inputs.nixpkgs-mesa-git { system = final.system; diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index 8969e83..c7a894f 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -108,7 +108,7 @@ environment.systemPackages = with pkgs; [ libimobiledevice ifuse # optional, to mount using 'ifuse' - gimp3.gimp + mesa-git.gimp ]; nixpkgs.config.permittedInsecurePackages = [