diff --git a/common.nix b/common.nix index ca3ece8..9e8aa52 100644 --- a/common.nix +++ b/common.nix @@ -20,7 +20,7 @@ "https://nix-community.cachix.org" "https://cache.nixos.org/" "https://devenv.cachix.org" - "ssh://nix-ssh@hel1.banditlair.com" + # "ssh://nix-ssh@hel1.banditlair.com" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" diff --git a/flake.nix b/flake.nix index 2f5d443..1c87b02 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,8 @@ "steam-unwrapped" "keymapp" "mongodb-compass" + "nvidia-x11" + "nvidia-settings" ]; overlays = extraOverlays ++ (pkgs.lib.attrValues self.overlays); }; diff --git a/hosts/stellaris/default.nix b/hosts/stellaris/default.nix index dac15a1..ed34734 100644 --- a/hosts/stellaris/default.nix +++ b/hosts/stellaris/default.nix @@ -60,9 +60,9 @@ services.network-manager-applet.enable = true; services.blueman-applet.enable = true; wayland.windowManager.hyprland.settings = { - monitor = [ - "eDP-1, 1920x1080, 0x720, 1.5" - "DP-1, 1920x1080, 0x0, 1.5" + env = [ + "LIBVA_DRIVER_NAME,nvidia" + "__GLX_VENDOR_LIBRARY_NAME,nvidia" ]; workspace = [ diff --git a/hosts/stellaris/hardware-configuration.nix b/hosts/stellaris/hardware-configuration.nix index e09f656..a1781d7 100644 --- a/hosts/stellaris/hardware-configuration.nix +++ b/hosts/stellaris/hardware-configuration.nix @@ -11,6 +11,7 @@ (modulesPath + "/installer/scan/not-detected.nix") ]; + boot.kernelPackages = pkgs.linuxPackages_zen; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" @@ -79,5 +80,13 @@ open = true; nvidiaSettings = true; package = config.boot.kernelPackages.nvidiaPackages.stable; + prime = { + offload = { + enable = true; + enableOffloadCmd = true; + }; + amdgpuBusId = "PCI:6:0:0"; + nvidiaBusId = "PCI:1:0:0"; + }; }; } diff --git a/modules/editor/emacs/emacs.nix b/modules/editor/emacs/emacs.nix index 577c141..667124c 100644 --- a/modules/editor/emacs/emacs.nix +++ b/modules/editor/emacs/emacs.nix @@ -81,7 +81,7 @@ in activation = { installDoomEmacs = '' if [ ! -d "${config.home-manager.users.${config.user.name}.xdg.configHome}/emacs" ]; then - git clone --depth=1 --single-branch https://github.com/doomemacs/doomemacs "${ + ${pkgs.git}/bin/git clone --depth=1 --single-branch https://github.com/doomemacs/doomemacs "${ config.home-manager.users.${config.user.name}.xdg.configHome }/emacs" fi