diff --git a/system-config/configuration/container-nathan/default.nix b/system-config/configuration/container-nathan/default.nix index 4b4c518..de06106 100644 --- a/system-config/configuration/container-nathan/default.nix +++ b/system-config/configuration/container-nathan/default.nix @@ -4,8 +4,6 @@ imports = [ - inputs.sops-nix.nixosModules.sops - inputs.home-manager.nixosModules.default ]; @@ -17,7 +15,7 @@ }; displayManager = { enable = true; - defaultSession = "hyprland"; + #defaultSession = "hyprland"; autoLogin = { enable = true; user = "nathan"; @@ -59,7 +57,7 @@ services.displayManager.sddm.settings.AutoLogin = { User = "nathan"; - Session = "hyprland"; + #Session = "hyprland"; Relogin = true; }; @@ -73,9 +71,9 @@ users.users."nathan" = { isNormalUser = true; - #initialPassword = "7567"; + initialPassword = "7567"; - hashedPasswordFile = config.sops.secrets."nathan/pass".path; + #hashedPasswordFile = config.sops.secrets."nathan/pass".path; extraGroups = [ "wheel" @@ -91,7 +89,7 @@ experimental-features = [ "nix-command" "flakes" ]; }; }; - +/* sops = { age.keyFile = "/home/nathan/.config/sops/age/keys.txt"; defaultSopsFile = ./secrets.yaml; @@ -103,7 +101,7 @@ }; }; }; - +*/ programs.fuse.userAllowOther = true; home-manager = { diff --git a/system-config/services/default.nix b/system-config/services/default.nix index 299682c..fe47acd 100644 --- a/system-config/services/default.nix +++ b/system-config/services/default.nix @@ -8,5 +8,6 @@ ./minecraft ./sddm ./novnc + ./kdePlasma6 ]; } diff --git a/system-config/services/kdePlasma6/default.nix b/system-config/services/kdePlasma6/default.nix new file mode 100644 index 0000000..447c744 --- /dev/null +++ b/system-config/services/kdePlasma6/default.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, ... }: { + + options.sysconfig.opts.kdePlasma6.enable = lib.options.mkOption { + type = lib.types.bool; + default = false; + }; + + config = lib.mkIf config.sysconfig.opts.kdePlasma6.enable { + + services.desktopManager.plasma6.enable = true; + + sysconfig.opts.sddm.enable = lib.mkDefault true; + + environment.systemPackages = with pkgs; [ + kdePackages.discover # Optional: Install if you use Flatpak or fwupd firmware update sevice + kdePackages.kcalc # Calculator + kdePackages.kcharselect # Tool to select and copy special characters from all installed fonts + kdePackages.kcolorchooser # A small utility to select a color + kdePackages.kolourpaint # Easy-to-use paint program + kdePackages.ksystemlog # KDE SystemLog Application + kdePackages.sddm-kcm # Configuration module for SDDM + kdiff3 # Compares and merges 2 or 3 files or directories + kdePackages.isoimagewriter # Optional: Program to write hybrid ISO files onto USB disks + kdePackages.partitionmanager # Optional Manage the disk devices, partitions and file systems on your computer + hardinfo2 # System information and benchmarks for Linux systems + haruna # Open source video player built with Qt/QML and libmpv + wayland-utils # Wayland utilities + wl-clipboard # Command-line copy/paste utilities for Wayland + ]; + }; +}