diff --git a/flake.lock b/flake.lock index 3d15c1f..b9d200d 100644 --- a/flake.lock +++ b/flake.lock @@ -151,11 +151,11 @@ ] }, "locked": { - "lastModified": 1757650187, - "narHash": "sha256-OrythrqccPKtuVt0mj26rr83Qo3Ljb4ZmwLdPGjzjMU=", + "lastModified": 1758786164, + "narHash": "sha256-o1WyZI2T7yPywiY06Swt8AZH/ewKU1nLqDw8fw1fwPc=", "owner": "nix-community", "repo": "home-manager", - "rev": "9eab59f3e71ea3a725e4817d8dcf0da0824ad19d", + "rev": "232454052008027c8e925979d13a951e92729781", "type": "github" }, "original": { @@ -317,11 +317,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { diff --git a/home/common/programs/hyprland/rofi.nix b/home/common/programs/hyprland/rofi.nix index 69c94a1..c366280 100644 --- a/home/common/programs/hyprland/rofi.nix +++ b/home/common/programs/hyprland/rofi.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { home.packages = with pkgs; [ - rofi-wayland + rofi (callPackage ../../../../pkgs/rofi-launchers/package.nix { }) ]; } diff --git a/home/desktop/default.nix b/home/desktop/default.nix index e2ed2da..cb25ef7 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -28,6 +28,7 @@ home.sessionVariables = { LIBVA_DRIVER_NAME = "nvidia"; + GDM_BACKEND = "nvidia-drm"; __GLX_VENDOR_LIBRARY_NAME = "nvidia"; }; @@ -54,14 +55,6 @@ }; - programs.hyprpanel.settings.bar.layouts = { - "0" = { - right = [ - "battery" - ]; - }; - }; - programs.kitty.settings.font_size = 16; home = { diff --git a/hosts/common/features/wine.nix b/hosts/common/features/wine.nix new file mode 100644 index 0000000..83039f5 --- /dev/null +++ b/hosts/common/features/wine.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + pkgs, + ... +}: + +{ + environment.systemPackages = with pkgs; [ + wineWowPackages.waylandFull + winetricks + ]; +} diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index ec4f6e3..c7aab75 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -18,6 +18,7 @@ ../common/features/bluetooth.nix ../common/features/ledger.nix ../common/features/android-studio.nix + ../common/features/wine.nix ../common/features/home ]; diff --git a/pkgs/rofi-launchers/package.nix b/pkgs/rofi-launchers/package.nix index e2ff134..6c73777 100644 --- a/pkgs/rofi-launchers/package.nix +++ b/pkgs/rofi-launchers/package.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, - rofi-wayland, + rofi, }: stdenvNoCC.mkDerivation { @@ -15,14 +15,14 @@ stdenvNoCC.mkDerivation { hash = "sha256-ZSosFsi/M5Gqb9gsUqS7hu89uOu9078Dus4Y+WCphZc="; }; - buildInputs = [ rofi-wayland ]; + buildInputs = [ rofi ]; postPatch = '' files=$(find files/scripts -type l) for file in $files; do substituteInPlace $file \ --replace-fail '$HOME/.config/rofi' "$out/share" \ - --replace-fail "rofi " "${lib.getExe rofi-wayland} " + --replace-fail "rofi " "${lib.getExe rofi} " done files=$(find files/launchers -type f -name "*.rasi")