summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix2
-rw-r--r--hosts/toaster/network/default.nix7
-rw-r--r--modules/fonts.nix2
-rw-r--r--modules/plasma.nix39
4 files changed, 47 insertions, 3 deletions
diff --git a/flake.nix b/flake.nix
index 61b4411..ddde63b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -119,9 +119,9 @@
./modules/binary-caches.nix
./modules/devtools.nix
./modules/emacs.nix
- ./modules/gnome.nix
./modules/gnupg.nix
./modules/mail
+ ./modules/plasma.nix
./modules/radio.nix
./modules/science.nix
./modules/tlp.nix
diff --git a/hosts/toaster/network/default.nix b/hosts/toaster/network/default.nix
index 6d96c3c..bd42a43 100644
--- a/hosts/toaster/network/default.nix
+++ b/hosts/toaster/network/default.nix
@@ -7,13 +7,16 @@
];
# Networkmanager shouldn't interfere with systemd managed interfaces
- networking.networkmanager.unmanaged =
+ networking.networkmanager = {
+ enable = true;
+ unmanaged =
let
systemd_netdevs = lib.attrsets.attrValues (
lib.attrsets.mapAttrs (_name: value: value.netdevConfig.Name) config.systemd.network.netdevs
);
in
- systemd_netdevs;
+ systemd_netdevs;
+ };
systemd.network = {
enable = true;
diff --git a/modules/fonts.nix b/modules/fonts.nix
index 32ae853..e8c54bc 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -19,6 +19,8 @@
liberation_ttf
noto-fonts
noto-fonts-cjk-sans
+ noto-fonts-color-emoji
+ noto-fonts-monochrome-emoji
noto-fonts-emoji
noto-fonts-extra
proggyfonts
diff --git a/modules/plasma.nix b/modules/plasma.nix
new file mode 100644
index 0000000..c3d2731
--- /dev/null
+++ b/modules/plasma.nix
@@ -0,0 +1,39 @@
+{ pkgs, ... }:
+{
+ imports = [
+ ./desktop-software.nix
+ ./fonts.nix
+ ];
+
+ environment.systemPackages = with pkgs.kdePackages; [
+ kmail
+ okular
+ ];
+
+ programs.kde-pim = {
+ enable = true;
+ kmail = true;
+ kontact = true;
+ merkuro = true;
+ };
+
+ # Enable sound.
+ security.rtkit.enable = true;
+ services.pipewire = {
+ enable = true;
+ alsa.enable = true;
+ pulse.enable = true;
+ };
+
+ programs.zsh.vteIntegration = true;
+ programs.bash.vteIntegration = true;
+
+ hardware.bluetooth.enable = true;
+
+ services.displayManager.sddm = {
+ enable = true;
+ wayland.enable = true;
+ };
+
+ services.desktopManager.plasma6.enable = true;
+}