diff --git a/configs/common.nix b/configs/common.nix index b1152ed..7a63318 100755 --- a/configs/common.nix +++ b/configs/common.nix @@ -87,6 +87,7 @@ in { lsd lsof man-pages + man-pages-posix nethogs nil nix-du diff --git a/configs/plasma.nix b/configs/plasma.nix index 33a8744..90d96f9 100755 --- a/configs/plasma.nix +++ b/configs/plasma.nix @@ -6,32 +6,36 @@ kdeconnect.enable = true; }; - environment.systemPackages = with pkgs; [ - libsForQt5.kalk - libsForQt5.plasma-browser-integration - ]; + # environment.systemPackages = with pkgs; [ + # libsForQt5.kalk + # libsForQt5.plasma-browser-integration + # ]; - environment.plasma5.excludePackages = with pkgs.libsForQt5; [ + environment.plasma6.excludePackages = with pkgs.kdePackages; [ # plasma-browser-integration konsole oxygen ]; - environment.etc."chromium/native-messaging-hosts/org.kde.plasma.browser_integration.json".source = "${pkgs.plasma-browser-integration}/etc/chromium/native-messaging-hosts/org.kde.plasma.browser_integration.json"; + # environment.etc."chromium/native-messaging-hosts/org.kde.plasma.browser_integration.json".source = "${pkgs.plasma-browser-integration}/etc/chromium/native-messaging-hosts/org.kde.plasma.browser_integration.json"; services = { - xserver = { + desktopManager.plasma6.enable = true; + displayManager.sddm = { enable = true; - excludePackages = [ pkgs.xterm ]; - - displayManager.sddm.enable = true; - desktopManager.plasma5.enable = true; - - layout = "us"; - - # Enable touchpad support. - libinput.enable = true; - updateDbusEnvironment = true; + wayland.enable = true; }; + + # xserver = { + # enable = true; + # excludePackages = [ pkgs.xterm ]; + + + # layout = "us"; + + # # Enable touchpad support. + # libinput.enable = true; + # updateDbusEnvironment = true; + # }; }; } diff --git a/configs/user.nix b/configs/user.nix index 7657447..b674292 100755 --- a/configs/user.nix +++ b/configs/user.nix @@ -49,7 +49,7 @@ in { home = { stateVersion = "23.11"; packages = with unstable.pkgs; [ - atop + # atop btop broot dfc @@ -69,6 +69,8 @@ in { tealdeer unrar yt-dlp + + nix-output-monitor ]; sessionPath = [ "$HOME/.npm-packages" "$HOME/.bin" ]; file = { diff --git a/machine/framework.nix b/machine/framework.nix index b8c553f..6517d3c 100755 --- a/machine/framework.nix +++ b/machine/framework.nix @@ -16,6 +16,7 @@ in ../configs/games.nix ../configs/libvirt.nix ../configs/plasma.nix + # ../configs/pantheon.nix ../configs/user-gui.nix ../configs/user.nix /home/alex/Workspace/fw-fanctrl-nix/service.nix @@ -98,7 +99,7 @@ in configJsonPath = "/home/alex/nixos-config/config.json"; }; - xserver.displayManager.autoLogin = { + displayManager.autoLogin = { enable = true; user = "alex"; }; @@ -192,5 +193,5 @@ in server = "192.168.0.168:24800"; }; - system.stateVersion = "23.11"; + system.stateVersion = "24.05"; }