From 98ddbb3e68355b830eefaf80f4f8183c7424e8fa Mon Sep 17 00:00:00 2001 From: Ghostfox Date: Sat, 25 Apr 2026 17:28:02 +0200 Subject: [PATCH] Complete switch to KDE organization stuff --- flake.lock | 84 ++++++++++++------- flake.nix | 7 ++ modules/base/sleep.nix | 2 +- modules/desktop/home/calendars.nix | 9 +- .../desktop/home/zen-browser/settings.json | 3 +- modules/desktop/plasma/default.nix | 11 ++- modules/desktop/plasma/home/default.nix | 12 --- systems/mocha/configuration.nix | 1 + 8 files changed, 70 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index 2b596fd..6592922 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1776420287, - "narHash": "sha256-0P2QyDM8R1FFww//TNDLTRVnVkQxVdbEVQiVuyD1SqY=", + "lastModified": 1777024856, + "narHash": "sha256-OQ+yIcRMXo4UaHyX+W5DCgBvJ5dZo/3kFGWPJiuR6x8=", "owner": "catppuccin", "repo": "nix", - "rev": "bdf0285dc7978ebd78b76054631d7ef05680895e", + "rev": "f41cc1cf13647e482b7317396f749840ef715e16", "type": "github" }, "original": { @@ -26,11 +26,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1776484970, - "narHash": "sha256-nx7CgawAdPzBHjve8pFv1K4nmlVpEF2wAe8ApkDcJwU=", + "lastModified": 1777089773, + "narHash": "sha256-ZIlNuebeWTncyl7mcV9VbceSLAaZki+UeXLPQG959xI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "d02b22b3511f25943c6e938b673626764b74b5b2", + "rev": "402ba229617a12d918c2a887a4c83a9a24f9a36c", "type": "gitlab" }, "original": { @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1776454077, - "narHash": "sha256-7zSUFWsU0+jlD7WB3YAxQ84Z/iJurA5hKPm8EfEyGJk=", + "lastModified": 1777086106, + "narHash": "sha256-hlNpIN18pw3xo34Lsrp6vAMUPn0aB/zFBqL0QXI1Pmk=", "owner": "nix-community", "repo": "home-manager", - "rev": "565e5349208fe7d0831ef959103c9bafbeac0681", + "rev": "5826802354a74af18540aef0b01bc1320f82cc17", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1768214250, - "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", + "lastModified": 1776882296, + "narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=", "owner": "feel-co", "repo": "ndg", - "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", + "rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1775490113, - "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=", + "lastModified": 1776983936, + "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7", + "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "lastModified": 1776877367, + "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", "type": "github" }, "original": { @@ -194,11 +194,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1776539146, - "narHash": "sha256-zuaO3Gi+HUf4Udv6wiCsK29SKh/Q6kwacpTn8gIwyZY=", + "lastModified": 1777062815, + "narHash": "sha256-RWwgP/R2nIcyOTPYJdApqvj/dVc4+n/4kOCNlRnfb7U=", "owner": "NotAShelf", "repo": "nvf", - "rev": "2809f4d43071e124f316ecf6dd0c68302f1078af", + "rev": "41394699260ffc533a688d0ca5b8888bd5e64233", "type": "github" }, "original": { @@ -207,6 +207,29 @@ "type": "github" } }, + "plasma-manager": { + "inputs": { + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1775856943, + "narHash": "sha256-b7Mp7P+q2Md5AGt4rjHfMcBykzMumFTen10ST++AuTU=", + "owner": "nix-community", + "repo": "plasma-manager", + "rev": "a524a6160e6df89f7673ba293cf7d78b559eb1a5", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "plasma-manager", + "type": "github" + } + }, "root": { "inputs": { "catppuccin": "catppuccin", @@ -215,6 +238,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nvf": "nvf", + "plasma-manager": "plasma-manager", "sops-nix": "sops-nix", "zen-browser": "zen-browser" } @@ -226,11 +250,11 @@ ] }, "locked": { - "lastModified": 1776119890, - "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=", + "lastModified": 1776771786, + "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", + "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598", "type": "github" }, "original": { @@ -264,11 +288,11 @@ ] }, "locked": { - "lastModified": 1776538405, - "narHash": "sha256-qjo8xO4p/Kn4OrtVwkW8XPH0xaHq5QLu6MMhSf+gJ/w=", + "lastModified": 1777084302, + "narHash": "sha256-qHE5XpgtRedzND5xzaqzbSOw4amse0aA4/BaVI4ONcU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "179a2e63531541cb009208c913d7ddf7046ea2b6", + "rev": "f6bab88f8566ddc13fb5e5500bd6c720b61d5321", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d2b5126..2b22131 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,13 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + plasma-manager = { + url = "github:nix-community/plasma-manager"; + inputs = { + nixpkgs.follows = "nixpkgs"; + home-manager.follows = "home-manager"; + }; + }; catppuccin.url = "github:catppuccin/nix"; firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; diff --git a/modules/base/sleep.nix b/modules/base/sleep.nix index 3773077..4d8a896 100644 --- a/modules/base/sleep.nix +++ b/modules/base/sleep.nix @@ -3,7 +3,7 @@ # AllowSuspend = "no"; AllowHybridSleep = "no"; AllowSuspendThenHibernate = "no"; - HibernationMode = "shutdown"; + # HibernationMode = "shutdown"; }; boot.kernelParams = [ diff --git a/modules/desktop/home/calendars.nix b/modules/desktop/home/calendars.nix index 4613760..76f36be 100644 --- a/modules/desktop/home/calendars.nix +++ b/modules/desktop/home/calendars.nix @@ -1,12 +1,5 @@ { - # Thunderbird - programs.thunderbird = { - enable = true; - profiles.default = { - # name = "Default"; - isDefault = true; - }; - }; + accounts.calendar.basePath = ".local/share/calendar"; # Main calendar accounts.calendar.accounts.Main = { diff --git a/modules/desktop/home/zen-browser/settings.json b/modules/desktop/home/zen-browser/settings.json index a3ca0f9..6b85487 100644 --- a/modules/desktop/home/zen-browser/settings.json +++ b/modules/desktop/home/zen-browser/settings.json @@ -213,8 +213,6 @@ "toolkit.telemetry.reportingpolicy.firstRun": false, "zen.ui.migration.compact-mode-button-added": true, "zen.ui.migration.version": 6, - "zen.updates.last-build-id": "20260315063056", - "zen.updates.last-version": "1.19.3b", "zen.urlbar.behavior": "normal", "zen.urlbar.suggestions-learner": "{\"Browser:Screenshot\":-3,\"cmd_close\":-1,\"Browser:ReloadSkipCache\":-3,\"zen:extension-{446900e4-71c2-419f-a6a7-df9c091e268b}\":-1,\"Tools:Addons\":-1,\"cmd_zenNewEmptySplit\":-3,\"Tools:PrivateBrowsing\":-1,\"cmd_find\":-1,\"Browser:Reload\":-1,\"Browser:NextTab\":-1,\"cmd_zenNewNavigatorUnsynced\":-1}", "zen.view.compact.enable-at-startup": true, @@ -225,5 +223,6 @@ "zen.workspaces.continue-where-left-off": true, "zen.workspaces.hide-default-container-indicator": false, "zen.workspaces.separate-essentials": false, + "zen.updates.show-update-notification": false, "toolkit.legacyUserProfileCustomizations.stylesheets": true } \ No newline at end of file diff --git a/modules/desktop/plasma/default.nix b/modules/desktop/plasma/default.nix index 3fc97f0..955ee4a 100644 --- a/modules/desktop/plasma/default.nix +++ b/modules/desktop/plasma/default.nix @@ -1,8 +1,7 @@ -{ inports, pkgs, ... }: +{ inputs, pkgs, ... }: { environment.plasma6.excludePackages = with pkgs.kdePackages; [ elisa - kwrite kate okular ]; @@ -17,11 +16,11 @@ programs.kde-pim = { enable = true; kmail = true; - kontact = true; + # kontact = true; merkuro = true; }; - environment.systemPackages = with pkgs.kdePackages; [ - korganizer - ]; + # environment.systemPackages = with pkgs.kdePackages; [ + # korganizer + # ]; } \ No newline at end of file diff --git a/modules/desktop/plasma/home/default.nix b/modules/desktop/plasma/home/default.nix index 49cd406..60216b5 100644 --- a/modules/desktop/plasma/home/default.nix +++ b/modules/desktop/plasma/home/default.nix @@ -3,16 +3,4 @@ # enable = true; # immutableByDefault = true; # }; - - packages.pimsync.enable = true; - services.pimsync.enable = true; - - # Main calendar - accounts.calendar.accounts.Main.pimsync.enable = true; - - # Zadania - accounts.calendar.accounts.Zadania.pimsync.enable = true; - - # Lekarze - accounts.calendar.accounts.Lekarze.pimsync.enable = true; } \ No newline at end of file diff --git a/systems/mocha/configuration.nix b/systems/mocha/configuration.nix index 2c16a31..ae13ff6 100644 --- a/systems/mocha/configuration.nix +++ b/systems/mocha/configuration.nix @@ -9,6 +9,7 @@ [ # Include the results of the hardware scan. ../../modules/base ../../modules/desktop + ../../modules/desktop/plasma ../../modules/development ../../modules/gaming ../../modules/school