From 6e5c998c2e9d9da892f89dae5b1a49c010c7eb61 Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Tue, 19 Sep 2023 17:39:50 +0300 Subject: [PATCH] some stuff Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com> --- hosts/titan/configuration.nix | 15 +++++++++++++-- hosts/titan/hardware/nvidia.nix | 4 ++++ users/ultra/home.nix | 5 +++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/hosts/titan/configuration.nix b/hosts/titan/configuration.nix index c1ca371..90f491a 100644 --- a/hosts/titan/configuration.nix +++ b/hosts/titan/configuration.nix @@ -163,6 +163,7 @@ in { virt-manager flutter nixd + sddm-kcm ]; variables = { NIX_AUTO_RUN = "!"; @@ -266,7 +267,17 @@ in { sddm = { enable = true; + settings = { + General = { + DisplayServer = "wayland"; + GreeterEnbironment = "QT_WAYLAND_SHELL_INTEGRATION=layer-shell"; + }; + Wayland = { + CompositerCommand = "kwin_wayland --drm --no-lockscreen --no-global-shortcuts"; + }; + }; }; + startx.enable = true; }; desktopManager.plasma5.enable = true; @@ -300,9 +311,9 @@ in { anonymousUploadEnable = false; # Anyone uploading files wouldn't be so secure, would it? anonymousMkdirEnable = false; # Neither would them creating directories. writeEnable = false; - - }; + + snowflake-proxy.enable = true; }; diff --git a/hosts/titan/hardware/nvidia.nix b/hosts/titan/hardware/nvidia.nix index 8bce86e..b203110 100644 --- a/hosts/titan/hardware/nvidia.nix +++ b/hosts/titan/hardware/nvidia.nix @@ -16,4 +16,8 @@ inputs: { config, pkgs, lib, ... }: { nvidiaSettings = true; }; }; + boot = { + initrd.kernelModules = [ "nvidia" ]; + extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ]; + }; } \ No newline at end of file diff --git a/users/ultra/home.nix b/users/ultra/home.nix index c37613d..895a520 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -174,7 +174,7 @@ in { language-server = with pkgs; { cpp.command = "${clang-tools}/bin/clangd"; c.command = "${clang-tools}/bin/clangd"; - nix.command = "${nil}/bin/nil"; + nix.command = "${nixd}/bin/nixd"; }; language = [ { @@ -235,6 +235,7 @@ in { jnoortheen.nix-ide # Nix stuff # eamodio.gitlens # Giga git, but with some paid stuff kahole.magit # Giga git + bmalehorn.vscode-fish # Fish in vscode ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ { name = "hungry-delete"; @@ -245,7 +246,7 @@ in { ]; userSettings = { nix = { - serverPath = "nil"; + serverPath = "nixd"; enableLanguageServer = true; }; editor = {