diff --git a/common/default.nix b/common/default.nix index 5e0fc23..093c83e 100644 --- a/common/default.nix +++ b/common/default.nix @@ -153,7 +153,7 @@ in # Enable the KDE Desktop Environment. services.displayManager.sddm.enable = true; - services.desktopManager.plasma6.enable = true; + services.xserver.desktopManager.plasma5.enable = true; # dconf required for several Gnome applications programs.dconf.enable = true; diff --git a/common/packages.nix b/common/packages.nix index b5a352a..e1316c4 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -9,48 +9,90 @@ # take overlays from flake nixpkgs.overlays = lib.attrValues config.inputInjection.flake-inputs.self.overlays; # List packages installed in system profile. - environment.systemPackages = with pkgs; [ - wget - vim - vimPlugins.vim-nix - vimPlugins.pathogen - tmux - htop - zsh - btrfs-progs - git - python3 - man-pages - dnsutils - netcat-openbsd - ntfs3g - file - multipath-tools - strace - ltrace - valgrind - testdisk - rsync - pv - exfat - iotop - cifs-utils - dstat - lsof - macchanger - borgbackup + environment.systemPackages = + with pkgs; + [ + wget + vim + vimPlugins.vim-nix + vimPlugins.pathogen + tmux + htop + zsh + btrfs-progs + git + python3 + man-pages + dnsutils + netcat-openbsd + ntfs3g + file + multipath-tools + strace + ltrace + valgrind + testdisk + rsync + pv + exfat + iotop + cifs-utils + dstat + lsof + macchanger + borgbackup - # for debugging WLAN failures: - ethtool - trace-cmd + # for debugging WLAN failures: + ethtool + trace-cmd - # NetworkManager stuff - networkmanager-openconnect - networkmanager-vpnc - networkmanager-openvpn - # TODO: is this still necessary? - kdePackages.akonadi-mime # for KOrganizer - # for some Flatpak packkages - accountsservice - ]; + # NetworkManager stuff + networkmanager-openconnect + networkmanager-vpnc + networkmanager-openvpn + plasma5Packages.kdeGear.akonadi-mime # for KOrganizer + ] + ++ ( + with plasma5Packages; + with kdeGear; + [ + #akonadi + #akonadi-calendar + #akonadi-contacts + #akonadi-import-wizard + #akonadi-mime + #akonadi-notes + #akonadi-search + #akonadiconsole + #akregator + #kaddressbook + #kalarm + #kalarmcal + #kcalutils + #kcontacts + #kdav + #kdepim-addons + + #kdepim-runtime + #kidentitymanagement + #kldap + #kmail + #kmailtransport + #kmbox + #kmime + #kontact + #kontactinterface + #korganizer + #kpimtextedit + #libkdepim + #libksieve + #mailcommon + #messagelib + #pimcommon + #pim-sieve-editor + + # for some Flatpak packkages + accountsservice + ] + ); } diff --git a/flake.lock b/flake.lock index 2e485c2..0ab72e6 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1719827385, - "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "391ca6e950c2525b4f853cbe29922452c14eda82", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719895800, - "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", + "lastModified": 1719681865, + "narHash": "sha256-Lp+l1IsREVbz8WM35OJYZz8sAH0XOjrZWUXVB5bJ2qg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6e253f12b1009053eff5344be5e835f604bb64cd", + "rev": "a59f00f5ac65b19382617ba00f360f8bc07ed3ac", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1719506693, + "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1719838683, - "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=", + "lastModified": 1719426051, + "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69", + "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1719949581, - "narHash": "sha256-5oTHaCzhztZL0we4NxD9ZbHoRtxxS+psl+8VVVDNN+A=", + "lastModified": 1719771190, + "narHash": "sha256-W2EApTej3kQYP+nn8BbCoSOQs+5Kvn+0LJzlT+GkB2E=", "owner": "nix-community", "repo": "NUR", - "rev": "ef879b77a1fbbe7170ab555852e18fa531c23a60", + "rev": "2ef1c7312fd083f118fee1bfeef40f4de36b14ca", "type": "github" }, "original": { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 924357f..2d30e03 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -122,7 +122,7 @@ let ]; pythonTools = with python3Packages; [ - python3 # to shadow old macOS python + python3 # to shadow old macOS python notebook ipython pip @@ -193,8 +193,9 @@ let ]; kdeTools = - [ okteta ] - ++ (with kdePackages; [ + with plasma5Packages; + with kdeGear; + [ okular gwenview yakuake @@ -211,13 +212,16 @@ let qdirstat ark kwalletmanager - #ktouch # TODO: unbreak + ktouch kcharselect konversation + okteta krdc skanlite akonadiconsole tokodon # mastodon client + ] + ++ (with kdeFrameworks; [ networkmanager-qt kcrash breeze-gtk diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 8facb4d..feb58c5 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -46,6 +46,7 @@ in }; }; + boot.loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true;