diff --git a/J0162.nix b/J0162.nix index c320b8e1..b799d372 100644 --- a/J0162.nix +++ b/J0162.nix @@ -4,11 +4,12 @@ ./hardware/audio.nix ./hardware/bluetooth.nix ./locales/en_GB.nix - ./desktop/hyprland.nix + ./desktop/plasma.nix + ./services/syncthing/J0162.nix ]; networking.hostName = "J0162"; # Define your hostname. - services.xserver.displayManager.defaultSession = "hyprland"; + services.xserver.displayManager.defaultSession = "plasma"; users.users.elitherl = { isNormalUser = true; diff --git a/common.nix b/common.nix index f9a2b538..b5f6a170 100644 --- a/common.nix +++ b/common.nix @@ -34,7 +34,6 @@ in { networking.networkmanager.enable = true; services.power-profiles-daemon.enable = true; virtualisation.podman.enable = true; - fonts.fontconfig.enable = true; programs = { ssh.startAgent = true; fish.enable = true; diff --git a/desktop/plasma.nix b/desktop/plasma.nix index 44c2ab56..7fbbc72e 100644 --- a/desktop/plasma.nix +++ b/desktop/plasma.nix @@ -1,15 +1,12 @@ -{pkgs, ...}: let - delta = pkgs.callPackage ../home/desktop/pkgs/delta-icon-theme {}; -in { - imports = [./xserver.nix ./xrdp.nix]; +{pkgs, ...}: { + imports = [./sddm.nix]; services.xserver.desktopManager.plasma5.enable = true; - services.xrdp.defaultWindowManager = "startplasma-x11"; programs.kdeconnect.enable = true; - environment.systemPackages = [ - pkgs.libsForQt5.lightly - pkgs.libsForQt5.kwindowsystem - pkgs.libsForQt5.ktorrent - pkgs.libsForQt5.krdc - delta.delta-icon-theme + environment.systemPackages = with pkgs; [ + sweet + libsForQt5.lightly + libsForQt5.kwindowsystem + libsForQt5.ktorrent + libsForQt5.krdc ]; } diff --git a/home/J0162/elitherl.nix b/home/J0162/elitherl.nix index 15583264..6b82b10c 100644 --- a/home/J0162/elitherl.nix +++ b/home/J0162/elitherl.nix @@ -1,5 +1,9 @@ -{pkgs, ...}: { - imports = [../work.nix ../desktop/hyprland.nix]; +{ + pkgs, + config, + ... +}: { + imports = [../work.nix ../desktop/picom.nix]; home.username = "elitherl"; home.homeDirectory = "/home/elitherl"; home.stateVersion = "22.11"; @@ -13,30 +17,4 @@ --delete-during --delete-excluded\ $HOME/.config/nvim/ freia:.config/nvim ''; - - xdg.configFile."hypr/hyprpaper.conf".source = ./hypr/hyprpaper.conf; - wayland.windowManager.hyprland.extraConfig = builtins.readFile ./hypr/hyprland.conf; - programs.waybar = { - settings = { - main = { - "include" = [ - "~/.config/waybar/modules.json" - "~/.config/waybar/layout.json" - ]; - "modules-left" = ["wlr/workspaces"]; - "modules-center" = ["clock"]; - "modules-right" = [ - "cpu" - "memory" - "temperature" - "pulseaudio" - "network" - "backlight" - "battery" - "tray" - ]; - "wlr/workspaces" = {"format-icons" = {"5" = "󰒍";};}; - }; - }; - }; } diff --git a/home/desktop/picom.nix b/home/desktop/picom.nix index d52cd3ab..341f392a 100644 --- a/home/desktop/picom.nix +++ b/home/desktop/picom.nix @@ -5,14 +5,11 @@ shadow = true; fade = true; activeOpacity = 1.0; - inactiveOpacity = 0.8; + inactiveOpacity = 1.0; + menuOpacity = 0.8; settings = { blur = { - # requires: https://github.com/ibhagwan/picom - # method = "dual_kawase"; - method = "gaussian"; - size = 20; - deviation = 15; + method = "dual_kawase"; strength = 7; background = false; background-frame = false; diff --git a/home/gui/chromium.nix b/home/gui/chromium.nix index 2864780e..e5b82a09 100644 --- a/home/gui/chromium.nix +++ b/home/gui/chromium.nix @@ -7,9 +7,5 @@ {id = "nngceckbapebfimnlniiiahkandclblb";} # Bitwarden {id = "dphilobhebphkdjbpfohgikllaljmgbn";} # Simplelogin ]; - commandLineArgs = [ - "--enable-features=UseOzonePlatform" - "--ozone-platform=wayland" - ]; }; }