Squashed commit of the following:
commit5374ae3e46
Author: Evie Litherland-Smith <evie@xenia.me.uk> Date: Mon Jun 17 08:25:18 2024 +0100 Fix sddm crash/restart (hopefully) by removing x11-user Re-enable kdeconnect commitae08b23335
Author: Evie Litherland-Smith <evie@xenia.me.uk> Date: Sun Jun 16 20:47:03 2024 +0100 Disable/remove more options not needed for plasma6 commita44d79e6a0
Author: Evie Litherland-Smith <evie@xenia.me.uk> Date: Sun Jun 16 19:28:56 2024 +0100 Disable extra services/programs covered by KDE
This commit is contained in:
parent
571e761551
commit
62ca892b30
|
@ -81,7 +81,6 @@
|
|||
];
|
||||
localBinInPath = true;
|
||||
};
|
||||
console.keyMap = "uk";
|
||||
programs = {
|
||||
command-not-found.enable = false;
|
||||
ssh.startAgent = true;
|
||||
|
@ -106,22 +105,10 @@
|
|||
};
|
||||
virtualisation.podman.enable = true;
|
||||
time.timeZone = "Europe/London";
|
||||
i18n = let
|
||||
locale = "en_GB.UTF-8";
|
||||
in {
|
||||
# Select internationalisation properties.
|
||||
defaultLocale = locale;
|
||||
extraLocaleSettings = {
|
||||
LC_ADDRESS = locale;
|
||||
LC_IDENTIFICATION = locale;
|
||||
LC_MEASUREMENT = locale;
|
||||
LC_MONETARY = locale;
|
||||
LC_NAME = locale;
|
||||
LC_NUMERIC = locale;
|
||||
LC_PAPER = locale;
|
||||
LC_TELEPHONE = locale;
|
||||
LC_TIME = locale;
|
||||
};
|
||||
i18n.defaultLocale = "en_GB.UTF-8";
|
||||
console = {
|
||||
font = iosevkaCustom.names.iosevka-custom-nerdfont;
|
||||
useXkbConfig = true;
|
||||
};
|
||||
fonts = {
|
||||
packages = with pkgs;
|
||||
|
|
|
@ -7,121 +7,47 @@
|
|||
imports = [./default.nix];
|
||||
nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland";
|
||||
system.autoUpgrade.operation = "boot";
|
||||
hardware = {
|
||||
pulseaudio.enable = true;
|
||||
bluetooth.enable = true;
|
||||
};
|
||||
environment = {
|
||||
sessionVariables = {
|
||||
NIXOS_OZONE_WL = "1";
|
||||
GRIM_DEFAULT_DIR = "$HOME/Pictures/Grim";
|
||||
};
|
||||
plasma6 =
|
||||
lib.mkIf config.services.desktopManager.plasma6.enable
|
||||
{excludePackages = with pkgs.kdePackages; [plasma-browser-integration];};
|
||||
systemPackages = with pkgs; [
|
||||
wtype
|
||||
wl-clipboard
|
||||
xdg-utils
|
||||
libnotify
|
||||
libcamera
|
||||
glib
|
||||
gsettings-desktop-schemas
|
||||
hunspell
|
||||
hunspellDicts.en_GB-large
|
||||
pamixer
|
||||
pavucontrol
|
||||
playerctl
|
||||
brightnessctl
|
||||
];
|
||||
};
|
||||
security = {
|
||||
polkit.enable = true;
|
||||
rtkit.enable = true;
|
||||
pam = {
|
||||
services.swaylock = {};
|
||||
loginLimits = [
|
||||
{
|
||||
domain = "@users";
|
||||
item = "rtprio";
|
||||
type = "-";
|
||||
value = 1;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
sound.enable = false;
|
||||
hardware.bluetooth.enable = true;
|
||||
programs = {
|
||||
dconf.enable = true;
|
||||
light.enable = true;
|
||||
noisetorch.enable = true;
|
||||
kdeconnect.enable = true;
|
||||
file-roller.enable = true;
|
||||
thunar = {
|
||||
enable = true;
|
||||
plugins = with pkgs.xfce; [thunar-archive-plugin thunar-volman];
|
||||
};
|
||||
sway = {
|
||||
enable = true;
|
||||
package =
|
||||
pkgs.swayfx.overrideAttrs
|
||||
(old: {passthru.providedSessions = ["sway"];});
|
||||
wrapperFeatures.gtk = true;
|
||||
};
|
||||
gamescope = {
|
||||
enable = true;
|
||||
capSysNice = true;
|
||||
};
|
||||
xwayland.enable = true;
|
||||
};
|
||||
gtk.iconCache.enable = true;
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme = "gnome";
|
||||
style = "adwaita";
|
||||
};
|
||||
services = {
|
||||
flatpak.enable = true;
|
||||
blueman.enable = true;
|
||||
gvfs = {
|
||||
enable = true;
|
||||
package = lib.mkForce pkgs.gnome3.gvfs;
|
||||
};
|
||||
accounts-daemon.enable = true;
|
||||
dbus.packages = with pkgs; [gcr];
|
||||
greetd = {
|
||||
enable = true;
|
||||
vt = 7;
|
||||
settings = {
|
||||
default_session.command = ''
|
||||
${pkgs.greetd.tuigreet}/bin/tuigreet --time\
|
||||
--remember\
|
||||
--remember-session\
|
||||
--user-menu\
|
||||
--asterisks\
|
||||
--window-padding 10
|
||||
'';
|
||||
};
|
||||
};
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa = {
|
||||
enable = true;
|
||||
support32Bit = true;
|
||||
};
|
||||
audio.enable = true;
|
||||
jack.enable = true;
|
||||
pulse.enable = true;
|
||||
wireplumber.enable = true;
|
||||
};
|
||||
tumbler.enable = true;
|
||||
udisks2.enable = true;
|
||||
printing.enable = true;
|
||||
xserver = {
|
||||
enable = false;
|
||||
enable = true;
|
||||
xkb = {
|
||||
layout = "gb";
|
||||
variant = "";
|
||||
options = "ctrl:nocaps";
|
||||
};
|
||||
};
|
||||
};
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
config.common.default = "*"; # TODO change for xdg-desktop-portal > 1.17 changes
|
||||
extraPortals = [pkgs.xdg-desktop-portal-gtk];
|
||||
displayManager.sddm = {
|
||||
enable = true;
|
||||
wayland.enable = true;
|
||||
};
|
||||
desktopManager.plasma6 = {
|
||||
enable = true;
|
||||
enableQt5Integration = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue