diff --git a/flake.nix b/flake.nix index 4b5dffc..ff64de9 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,16 @@ pkgs = nixpkgs.legacyPackages.x86_64-linux; modules = [ hyprland.homeManagerModules.default - { wayland.windowManager.hyprland.enable = true; } + { + wayland.windowManager.hyprland = { + enable = true; + xwayland = { + enable = true; + hidpi = false; + }; + nvidiaPatches = true; + }; + } ./nix/v4zha/home-manager/home.nix ]; }; diff --git a/nix/v4zha/home-manager/home.nix b/nix/v4zha/home-manager/home.nix index 5366c68..2b229f3 100644 --- a/nix/v4zha/home-manager/home.nix +++ b/nix/v4zha/home-manager/home.nix @@ -44,7 +44,7 @@ rnix-lsp ]; programs.neovim.plugins = [ - (pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [p.bash p.c p.cpp p.cmake p.comment p.css p.cuda p.dockerfile p.fish p.gitignore p.go p.html p.haskell p.javascript p.json p.lua p.latex p.make p.markdown p.markdown_inline p.nix p.regex p.rust p.scss p.svelte p.toml p.tsx p.typescript p.vim p.yaml p.yuck p.zig])) + (pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.bash p.c p.cpp p.cmake p.comment p.css p.cuda p.dockerfile p.fish p.gitignore p.go p.html p.haskell p.javascript p.json p.lua p.latex p.make p.markdown p.markdown_inline p.nix p.regex p.rust p.scss p.svelte p.toml p.tsx p.typescript p.vim p.yaml p.yuck p.zig ])) ]; services.mpris-proxy.enable = true; home.stateVersion = "23.11"; diff --git a/nix/v4zha/system/configuration.nix b/nix/v4zha/system/configuration.nix index fefea6c..c1f6099 100644 --- a/nix/v4zha/system/configuration.nix +++ b/nix/v4zha/system/configuration.nix @@ -25,12 +25,14 @@ nixpkgs.config.allowUnfree = true; nix.settings.experimental-features = [ "nix-command" "flakes" ]; - # Binary Cache for Haskell.nix nix.settings.trusted-public-keys = [ + # Binary Cache for Haskell.nix + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ]; nix.settings.substituters = [ "https://cache.iog.io" + "https://hyprland.cachix.org" ]; # Docker support @@ -45,6 +47,16 @@ #keyMap = "us"; useXkbConfig = true; }; +# Xdg service +xdg = { + portal = { + enable = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-wlr + xdg-desktop-portal-gtk + ]; + }; +}; services = { # Enable the X11 windowing system. @@ -75,6 +87,7 @@ alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; + wireplumber.enable = true; }; # Bluetooth hardware.bluetooth.enable = true; diff --git a/nix/v4zha/system/packages.nix b/nix/v4zha/system/packages.nix index 3a830fb..b5a9423 100644 --- a/nix/v4zha/system/packages.nix +++ b/nix/v4zha/system/packages.nix @@ -29,5 +29,6 @@ fish.enable = true; }; + environment.sessionVariables.NIXOS_OZONE_WL = "1"; }