diff --git a/home-manager/i3.nix b/home-manager/i3.nix index 7a1ce4a..032be6c 100644 --- a/home-manager/i3.nix +++ b/home-manager/i3.nix @@ -3,31 +3,23 @@ let cfg = osConfig.custom.graphical.i3; in { config = lib.mkIf cfg.enable { home.file.".config/i3" = { - enable = true; recursive = true; source = ../.config/i3; - target = ".config/i3"; }; home.file.".config/picom" = { - enable = true; recursive = true; source = ../.config/picom; - target = ".config/picom"; }; home.file.".config/wallpapers" = { - enable = true; recursive = true; source = ../.config/wallpapers; - target = ".config/wallpapers"; }; home.file.".config/polybar" = { - enable = true; recursive = true; source = ../.config/polybar; - target = ".config/polybar"; }; services.polybar = { enable = true; diff --git a/home-manager/nvim.nix b/home-manager/nvim.nix index e64606f..f1ba06f 100644 --- a/home-manager/nvim.nix +++ b/home-manager/nvim.nix @@ -14,7 +14,7 @@ ripgrep fd cmake - nodePackages.pyright + pyright nodePackages.eslint ccls nodejs_22 diff --git a/modules/graphical/plasma.nix b/modules/graphical/plasma.nix index 52414b6..fcb578a 100644 --- a/modules/graphical/plasma.nix +++ b/modules/graphical/plasma.nix @@ -11,20 +11,26 @@ in { enable = true; xkb.layout = config.mainUser.layout; xkb.variant = config.mainUser.variant; - displayManager = { - sddm.enable = true; - }; + #displayManager.sddm.settings.Wayland.SessionDir = "${pkgs.plasma5Packages.plasma-workspace}/share/wayland-sessions"; - #displayManager.sddm.wayland.enable = true; }; #services.xserver.desktopManager.plasma5.enable = true; - services.desktopManager.plasma6.enable = true; - environment.plasma6.excludePackages = with pkgs.kdePackages; [ ocean-sound-theme spectacle kwallet dolphin ]; + services.displayManager.sddm.enable = true; + #services.displayManager.sddm.wayland.enable = true; + services.desktopManager.plasma6 = { + enable = true; + }; + environment.plasma6.excludePackages = with pkgs.kdePackages; [ + ocean-sound-theme + spectacle + kwallet + dolphin + ]; environment.sessionVariables = { - # __GL_YIELD = "usleep"; + # __GL_YIELD = "usleep"; MOZ_ENABLE_WAYLAND = "1"; #NIXOS_OZONE_WL = "1"; }; diff --git a/modules/graphical/sddm.nix b/modules/graphical/sddm.nix index 54904bc..74431cc 100644 --- a/modules/graphical/sddm.nix +++ b/modules/graphical/sddm.nix @@ -15,6 +15,7 @@ in { displayManager = { sddm.enable = true; sddm.theme = "${pkgs.sddm-astronaut}"; + #sddm.theme = "breeze"; }; }; }; diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index 8ca0e60..a95d4ea 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -85,13 +85,13 @@ # waitPID=$! # ''; #} - { - manage = "desktop"; - name = "plasma5"; - start = '' - env ${pkgs.plasma-workspace}/bin/startplasma-x11 - ''; - } + #{ + # manage = "desktop"; + # name = "plasma5"; + # start = '' + # env ${pkgs.plasma-workspace}/bin/startplasma-x11 + # ''; + #} ]; # fix index diff --git a/systems/vm/configuration.nix b/systems/vm/configuration.nix index 19a379e..909740c 100644 --- a/systems/vm/configuration.nix +++ b/systems/vm/configuration.nix @@ -16,7 +16,11 @@ ld.enable = true; settings.enable = true; }; - graphical = { i3.enable = true; }; + graphical = { + i3.enable = true; + plasma.enable = true; + sddm.enable = true; + }; }; networking.networkmanager.enable = true; diff --git a/systems/vm/vm-common.nix b/systems/vm/vm-common.nix index 236d003..f87d6c2 100644 --- a/systems/vm/vm-common.nix +++ b/systems/vm/vm-common.nix @@ -2,7 +2,7 @@ services.xserver = { enable = true; displayManager = { - autoLogin.enable = true; + autoLogin.enable = false; autoLogin.user = "vm"; };