diff --git a/flake.lock b/flake.lock index a0deb35..c6f11cf 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1774235677, - "narHash": "sha256-0ryNYmzDAeRlrzPTAgmzGH/Cgc8iv/LBN6jWGUANvIk=", + "lastModified": 1778427648, + "narHash": "sha256-pt9KaDGsMyYWB9JeHs4XGHs870f1lOZe3vx9LpVIhUE=", "owner": "Homebrew", "repo": "brew", - "rev": "894a3d23ac0c8aaf561b9874b528b9cb2e839201", + "rev": "6f293daa9f9f5832e13b497976335e90509886d7", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "5.1.1", + "ref": "5.1.11", "repo": "brew", "type": "github" } @@ -22,11 +22,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1775077333, - "narHash": "sha256-OXcxobt7lBkh1B8AjwreU+24myhtKpqeLfAeIyNLFY8=", + "lastModified": 1779506708, + "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", "owner": "nix-community", "repo": "home-manager", - "rev": "49ca96b2714c5931e17401eff87f3edd42d2b0f2", + "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", "type": "github" }, "original": { @@ -59,11 +59,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1775399032, - "narHash": "sha256-+XlQ98j/SiUU4mt60Sdr80r+VaSFbytWCQbDKVpbJlM=", + "lastModified": 1780406524, + "narHash": "sha256-iK9no4rW7MZMBdfjrrgbU+rzCgl5n2VoHJj/bb1GVho=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "6224c3ef30ddffb5a08f9e6183ed0c71a0cb626b", + "rev": "f881b5768475bc60da14e7ca20c56f3509b80f1b", "type": "github" }, "original": { @@ -75,11 +75,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1775403617, - "narHash": "sha256-HWlnXvX/P5ynsdPHiuDCoCxGp8ZOQYXoKLVioZBfJtE=", + "lastModified": 1780407978, + "narHash": "sha256-hgOsqpzD6qsKlLOAxKyNCbCPxVuYLsmWcfxOxbxTwYA=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "322375479e22d7f97efe4f0598ad20bf33553dc2", + "rev": "132ca82e883600ec9e1f9b9d73f87db040c07605", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "import-tree": { "locked": { - "lastModified": 1773693634, - "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=", + "lastModified": 1778781969, + "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=", "owner": "vic", "repo": "import-tree", - "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1", + "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274", "type": "github" }, "original": { @@ -145,11 +145,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1774720267, - "narHash": "sha256-YYftFe8jyfpQI649yfr0E+dqEXE2jznZNcYvy/lKV1U=", + "lastModified": 1778851564, + "narHash": "sha256-p8wzcnpB2Iys+QzAKM9/Eyw/pUyqCO3sw/NCnDH4dTE=", "owner": "zhaofengli", "repo": "nix-homebrew", - "rev": "a7760a3a83f7609f742861afb5732210fdc437ed", + "rev": "b3a87b4793205cc111f3c61e25e018ffac3b8039", "type": "github" }, "original": { @@ -160,11 +160,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775002709, - "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=", + "lastModified": 1779796641, + "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e", + "rev": "25f538306313eae3927264466c70d7001dcea1df", "type": "github" }, "original": { @@ -176,11 +176,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1774748309, - "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "333c4e0545a6da976206c74db8773a1645b5870a", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -191,11 +191,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1780243769, + "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", "type": "github" }, "original": { diff --git a/hosts/nixos/home/partials/gnome/dconf.nix b/hosts/nixos/home/partials/gnome/dconf.nix index 8c2e2c5..db6bd82 100644 --- a/hosts/nixos/home/partials/gnome/dconf.nix +++ b/hosts/nixos/home/partials/gnome/dconf.nix @@ -6,7 +6,6 @@ with lib.hm.gvariant; { home.packages = with pkgs; [ - papirus-icon-theme gnomeExtensions.paperwm gnomeExtensions.app-hider gnomeExtensions.dash-to-panel @@ -49,17 +48,10 @@ with lib.hm.gvariant; }; "org/gnome/desktop/interface" = { - icon-theme = "Papirus"; accent-color = "teal"; color-scheme = "prefer-dark"; }; - "org/gnome/desktop/background" = { - picture-options = "zoom"; - picture-uri = "file://" + ./walls.jpg; - picture-uri-dark = "file://" + ./walls.jpg; - }; - "org/gnome/shell/extensions/dash-to-panel" = { prefs-opened = false; diff --git a/hosts/nixos/system/os.nix b/hosts/nixos/system/os.nix index 73db16a..0b9b681 100755 --- a/hosts/nixos/system/os.nix +++ b/hosts/nixos/system/os.nix @@ -25,7 +25,7 @@ os.virtualisation.podman.enable = true; # Shells configurations - os.shells.gnome.enable = true; + os.shells.kde.enable = true; # Terminal programs.ssh.enableAskPassword = false; # No-window git push fix diff --git a/modules/system/nixos/shells/gnome.nix b/modules/system/nixos/shells/gnome.nix index 12b2a6a..b8a2604 100644 --- a/modules/system/nixos/shells/gnome.nix +++ b/modules/system/nixos/shells/gnome.nix @@ -36,6 +36,7 @@ in ++ [ loupe papers + refine simple-scan ]; }; diff --git a/modules/system/nixos/shells/kde.nix b/modules/system/nixos/shells/kde.nix new file mode 100644 index 0000000..de5cb26 --- /dev/null +++ b/modules/system/nixos/shells/kde.nix @@ -0,0 +1,38 @@ +{ + lib, + pkgs, + config, + ... +}: +with lib; +let + cfg = config.os.shells.kde; +in +{ + options.os.shells.kde = { + enable = mkEnableOption "System gnome shell service"; + }; + config = mkIf cfg.enable { + + services.displayManager.plasma-login-manager.enable = true; + services.desktopManager.plasma6.enable = true; + + environment = { + + plasma6.excludePackages = with pkgs; [ + aurorae + plasma-browser-integration + kwin-x11 + (lib.getBin qttools) # Expose qdbus in PATH + elisa + gwenview + ktexteditor # provides elevated actions for kate + khelpcenter + baloo-widgets # baloo information in Dolphin + spectacle + krdp + ]; + }; + + }; +}