From 7d64f9a3ba0099544010f340ed1a82718ed8e3d8 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Tue, 24 Sep 2024 13:36:57 -0500 Subject: [PATCH] add kde module, remove cosmic defs. --- flake.lock | 149 +---------------------------- flake.nix | 10 +- nixos/hosts/telchar/default.nix | 8 +- nixos/modules/nixos/de/default.nix | 1 + nixos/modules/nixos/de/kde.nix | 43 +++++++++ 5 files changed, 49 insertions(+), 162 deletions(-) create mode 100644 nixos/modules/nixos/de/kde.nix diff --git a/flake.lock b/flake.lock index 6216564..4cf63d3 100644 --- a/flake.lock +++ b/flake.lock @@ -77,45 +77,7 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "nixos-cosmic", - "nix-update", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -398,29 +360,6 @@ "type": "github" } }, - "nix-update": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1726651036, - "narHash": "sha256-6kR4UEBZvbQNoR3l8/It5ZTCC+mB14jzj7MNnFoQJwE=", - "owner": "Mic92", - "repo": "nix-update", - "rev": "7dd0e4467c571ebb7e53d9e3d40c49f75473efdf", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "nix-update", - "type": "github" - } - }, "nix-vscode-extensions": { "inputs": { "flake-compat": "flake-compat", @@ -443,30 +382,6 @@ "type": "github" } }, - "nixos-cosmic": { - "inputs": { - "flake-compat": "flake-compat_2", - "nix-update": "nix-update", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable", - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1727138676, - "narHash": "sha256-py+c+r8dP3BmiGv44OIEHRZx6EFncpRJGlYzfVNINa8=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "ffd6b5ce3de69631f4eae17e13ba17650b126471", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1726650330, @@ -528,22 +443,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1726838390, - "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1725762081, "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", @@ -720,7 +619,6 @@ "nix-index-database": "nix-index-database", "nix-inspect": "nix-inspect", "nix-vscode-extensions": "nix-vscode-extensions", - "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", @@ -747,27 +645,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726972233, - "narHash": "sha256-FlL/bNESOtDQoczRhmPfReNAmLqVg+dAX4HectPOOf0=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "36d73192555e569d27579f6c486fea3ab768823c", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "slimlock": { "inputs": { "nixpkgs": [ @@ -797,7 +674,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1726524647, @@ -875,7 +752,7 @@ }, "talhelper": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs-unstable" ] @@ -916,28 +793,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nix-update", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719887753, - "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "vscode-server": { "inputs": { "flake-utils": "flake-utils_4", diff --git a/flake.nix b/flake.nix index 1c133b2..6e0f004 100644 --- a/flake.nix +++ b/flake.nix @@ -86,17 +86,10 @@ url = "github:ajgon/krewfile?ref=feat/indexes"; inputs.nixpkgs.follows = "nixpkgs"; }; - - # NixOS Cosmic - nixos-cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; outputs = - { self, nixpkgs, sops-nix, home-manager, nix-vscode-extensions, impermanence, disko, talhelper, lix-module, vscode-server, krewfile, nixos-cosmic, ... } @ inputs: + { self, nixpkgs, sops-nix, home-manager, nix-vscode-extensions, impermanence, disko, talhelper, lix-module, vscode-server, krewfile, ... } @ inputs: let forAllSystems = nixpkgs.lib.genAttrs [ "aarch64-linux" @@ -173,7 +166,6 @@ system = "x86_64-linux"; hardwareModules = [ inputs.nixos-hardware.nixosModules.framework-16-7040-amd - # nixos-cosmic.nixosModules.default ./nixos/profiles/hw-framework-16-7840hs.nix disko.nixosModules.disko (import ./nixos/profiles/disko-telchar.nix) diff --git a/nixos/hosts/telchar/default.nix b/nixos/hosts/telchar/default.nix index ad004bc..0effc27 100644 --- a/nixos/hosts/telchar/default.nix +++ b/nixos/hosts/telchar/default.nix @@ -23,12 +23,6 @@ hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - - # KDE - services.displayManager.sddm.enable = true; - services.displayManager.sddm.wayland.enable = true; - services.desktopManager.plasma6.enable = true; - # Enable Flatpak support services.flatpak.enable = true; @@ -39,6 +33,8 @@ # Desktop Environment # Gnome # de.gnome.enable = true; + # KDE + de.kde.enable = true; # System config system = { diff --git a/nixos/modules/nixos/de/default.nix b/nixos/modules/nixos/de/default.nix index d543173..5c99408 100644 --- a/nixos/modules/nixos/de/default.nix +++ b/nixos/modules/nixos/de/default.nix @@ -1,5 +1,6 @@ { imports = [ ./gnome.nix + ./kde.nix ]; } diff --git a/nixos/modules/nixos/de/kde.nix b/nixos/modules/nixos/de/kde.nix new file mode 100644 index 0000000..a7955c6 --- /dev/null +++ b/nixos/modules/nixos/de/kde.nix @@ -0,0 +1,43 @@ +{ lib, config, pkgs, ... }: +with lib; +let + cfg = config.mySystem.de.kde; +in +{ + options = { + mySystem.de.kde = { + enable = mkEnableOption "KDE" // { default = false; }; + }; + }; + + config = mkIf cfg.enable { + # Ref: https://wiki.nixos.org/wiki/KDE + + # KDE + services = { + displayManager = { + sddm = { + enable = true; + wayland = { + enable = true; + }; + }; + }; + desktopManager.plasma6.enable = true; + }; + + # extra pkgs and extensions + environment = { + systemPackages = with pkgs; [ + wl-clipboard # ls ~/Downloads | wl-copy or wl-paste > clipboard.txt + playerctl # gsconnect play/pause command + ]; + }; + + # enable kdeconnect + # this method also opens the firewall ports required when enable = true + programs.kdeconnect = { + enable = true; + }; + }; +}