From 72b99a4f8e6b16f8341957be387c4730444900ba Mon Sep 17 00:00:00 2001 From: Maciej Jur Date: Sat, 29 Jun 2024 14:11:09 +0200 Subject: [PATCH] nixos: use unstable channel --- haskell/.ghci | 2 -- nixos/msi/configuration.nix | 8 ++++++-- nixos/msi/home.nix | 7 +------ nixos/msi/nvidia.nix | 5 ++--- plasma-workspace/env/startup.sh | 3 --- 5 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 haskell/.ghci delete mode 100755 plasma-workspace/env/startup.sh diff --git a/haskell/.ghci b/haskell/.ghci deleted file mode 100644 index f29838c..0000000 --- a/haskell/.ghci +++ /dev/null @@ -1,2 +0,0 @@ -:set prompt "\ESC[34m\STXλ> \ESC[0m\STX" -:set -pgmL markdown-unlit diff --git a/nixos/msi/configuration.nix b/nixos/msi/configuration.nix index 11c9b1f..3b7acab 100644 --- a/nixos/msi/configuration.nix +++ b/nixos/msi/configuration.nix @@ -76,8 +76,11 @@ in services = { xserver.enable = true; desktopManager.plasma6.enable = true; - displayManager.sddm.enable = true; - displayManager.sddm.wayland.enable = true; + displayManager.sddm = { + enable = true; + theme = "breeze"; + wayland.enable = true; + }; }; # Enable CUPS to print documents. @@ -123,6 +126,7 @@ in gamescopeSession.enable = true; }; gamemode.enable = true; + kdeconnect.enable = true; }; users.users.kamov = { diff --git a/nixos/msi/home.nix b/nixos/msi/home.nix index ba7e20c..71612d7 100644 --- a/nixos/msi/home.nix +++ b/nixos/msi/home.nix @@ -1,7 +1,5 @@ { pkgs, ... }: -let - unstable = import {}; -in + { imports = [ ./gaming.nix @@ -75,7 +73,6 @@ in neovim = { enable = true; - package = unstable.neovim-unwrapped; defaultEditor = true; extraPackages = with pkgs; [ lua-language-server @@ -85,8 +82,6 @@ in }; }; - services.kdeconnect.enable = true; - # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards diff --git a/nixos/msi/nvidia.nix b/nixos/msi/nvidia.nix index 050fe9c..80c814c 100644 --- a/nixos/msi/nvidia.nix +++ b/nixos/msi/nvidia.nix @@ -5,10 +5,9 @@ nixpkgs.config.allowUnfree = true; # Enable OpenGL - hardware.opengl = { + hardware.graphics = { enable = true; - driSupport = true; - driSupport32Bit = true; + enable32Bit = true; }; # Load nvidia driver for Xorg and Wayland diff --git a/plasma-workspace/env/startup.sh b/plasma-workspace/env/startup.sh deleted file mode 100755 index 5f2ac42..0000000 --- a/plasma-workspace/env/startup.sh +++ /dev/null @@ -1,3 +0,0 @@ -# enable Qt dialogs in GTK applications -export GTK_USE_PORTAL=1 -