From fcbe6a3a66fd74026ee185779456e3e800ec8cc4 Mon Sep 17 00:00:00 2001 From: macronova Date: Sat, 15 Jun 2024 17:37:25 -0700 Subject: [PATCH] Try plasma manager --- common/default.nix | 3 +- common/users.nix | 26 ++++++- flake.lock | 145 +++++++++++++++++++++++++++++--------- flake.nix | 3 +- linux/blitzar/gui.nix | 8 +-- linux/nebula/jellyfin.nix | 8 ++- linux/protostar/gui.nix | 31 ++++---- 7 files changed, 165 insertions(+), 59 deletions(-) diff --git a/common/default.nix b/common/default.nix index f31187a..dd0cf76 100644 --- a/common/default.nix +++ b/common/default.nix @@ -4,9 +4,10 @@ imports = with inputs; [ home-manager.nixosModules.default sops-nix.nixosModules.default - ] ++ [ ./constants.nix ./secrets.nix ./users.nix ]; + + home-manager.sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ]; } diff --git a/common/users.nix b/common/users.nix index 1d60093..66846c4 100644 --- a/common/users.nix +++ b/common/users.nix @@ -21,6 +21,7 @@ in home-manager = { useGlobalPkgs = true; + useUserPackages = true; users.${usr} = { config, osConfig, pkgs, ... }: { home = { @@ -32,7 +33,16 @@ in nixpkgs-fmt rclone sops - ]; + ] ++ (if config.programs.plasma.enable then [ + sweet-ambar-blue + yorha-sound-theme + ] ++ (with kdePackages; [ + qtmultimedia + qtstyleplugin-kvantum + qtwebchannel + qtwebengine + qtwebsockets + ]) else [ ]); stateVersion = osConfig.system.stateVersion; }; programs = { @@ -71,6 +81,20 @@ in theme = "base16_transparent"; }; }; + plasma = { + configFile = { + "kscreenlockerrc"."Daemon"."Autolock" = false; + "kscreenlockerrc"."Greeter"."WallpaperPlugin" = "org.kde.potd"; + }; + spectacle.shortcuts.captureRectangularRegion = "Meta+Shift+S"; + workspace = { + colorScheme = "SweetAmbarBlue"; + cursor.theme = "Sweet-cursors"; + iconTheme = "Sweet-Rainbow"; + lookAndFeel = "Sweet-Ambar-Blue"; + theme = "Sweet-Ambar-Blue"; + }; + }; ripgrep.enable = true; starship = { enable = true; diff --git a/flake.lock b/flake.lock index e5683c2..55e468b 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "candy-icons": { "flake": false, "locked": { - "lastModified": 1717103572, - "narHash": "sha256-LdPoPUxE2v7u6oE8ZrjJWbwGkm1JlmjGKbYDAoU1UGk=", + "lastModified": 1718151542, + "narHash": "sha256-/mirQfX35xDwwCLbXuQ9zkEL+IRQfk3W9DwnyNXw/DY=", "ref": "refs/heads/master", - "rev": "ddafbbcae3f0c88ae6f139eaa2f0a7ca278f9395", - "revCount": 1182, + "rev": "d6b9e40654abe3f6dda910ed0dee4368af77c479", + "revCount": 1188, "type": "git", "url": "https://github.com/EliverLara/candy-icons" }, @@ -37,11 +37,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1718008439, - "narHash": "sha256-nlh/2uD5p2SAdkn6Zuey20yaR5FFWvhL3poapDGNE4Y=", + "lastModified": 1718242063, + "narHash": "sha256-n3AWItJ4a94GT0cray/eUV7tt3mulQ52L+lWJN9d1E8=", "owner": "nix-community", "repo": "disko", - "rev": "c1cfbfad7cb45f0c177b35b59ba67d1b5fc7ca82", + "rev": "832a9f2c81ff3485404bd63952eadc17bf7ccef2", "type": "github" }, "original": { @@ -86,11 +86,11 @@ }, "hardware": { "locked": { - "lastModified": 1717995329, - "narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=", + "lastModified": 1718459188, + "narHash": "sha256-umwY+ivE98n/6EwEtobOlqf1t9VddhPIIZ6rVmFXlHg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "58b52b0dd191af70f538c707c66c682331cfdffc", + "rev": "0cd562157274df3783840bdcb0ce6d9c4cf4aa29", "type": "github" }, "original": { @@ -104,11 +104,32 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1717931644, - "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=", + "lastModified": 1718243258, + "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf", + "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "plasma-manager", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1714377222, + "narHash": "sha256-UsDsjWCKlWn8vbXi8Zza9Hkq3xyk8fpvFNo2VM5S74E=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "2af7c78b7bb9cf18406a193eba13ef9f99388f49", "type": "github" }, "original": { @@ -123,11 +144,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1718081048, - "narHash": "sha256-dwKvamucNK8gB6RTTfnBeBbBgjARQgHQph8PdHZoL3s=", + "lastModified": 1718431241, + "narHash": "sha256-vOsklVeiGCvf9LBOz0sjHMNvohgUw8/Oe/8MpdFnF+Y=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f27db3a9a8c21a65c1ef50cacca3ef2bfff04cb9", + "rev": "f02a01aab60c68b7898043c2e7f5bc97c93fb07b", "type": "github" }, "original": { @@ -166,23 +187,24 @@ "sweet-ambar-blue": "sweet-ambar-blue", "sweet-ambar-blue-dark": "sweet-ambar-blue-dark", "sweet-folders": "sweet-folders", + "sweet-kde": "sweet-kde", "wallpaper-engine-plasma5-plugin": "wallpaper-engine-plasma5-plugin", "wallpaper-engine-plasma6-plugin": "wallpaper-engine-plasma6-plugin", "yorha-grub-theme": "yorha-grub-theme", "yorha-sound-theme": "yorha-sound-theme" }, "locked": { - "lastModified": 1718089908, - "narHash": "sha256-iHW4QQvY8Bl5lUfPa3w6N2U8RFxc1O7bM26msjg3WFQ=", + "lastModified": 1718498122, + "narHash": "sha256-fmVBah/MAo05EwqRKDiONci95PG8EiRy8PzqNmSS0Dg=", "ref": "refs/heads/main", - "rev": "12ce7dd148f6ee4ab5297b55563e1dee5470eb38", - "revCount": 15, + "rev": "7329a57c2278692ad661d19b3af09631ee011168", + "revCount": 17, "type": "git", - "url": "file:///home/macronova/Desktop/nix-custom" + "url": "https://forgejo.invariantspace.com/macronova/nix-custom" }, "original": { "type": "git", - "url": "file:///home/macronova/Desktop/nix-custom" + "url": "https://forgejo.invariantspace.com/macronova/nix-custom" } }, "nix-github-actions": { @@ -209,11 +231,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717868076, - "narHash": "sha256-c83Y9t815Wa34khrux81j8K8ET94ESmCuwORSKm2bQY=", + "lastModified": 1718149104, + "narHash": "sha256-Ds1QpobBX2yoUDx9ZruqVGJ/uQPgcXoYuobBguyKEh8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9", + "rev": "e913ae340076bbb73d9f4d3d065c2bca7caafb16", "type": "github" }, "original": { @@ -303,11 +325,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1717786204, - "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "lastModified": 1718318537, + "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", + "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", "type": "github" }, "original": { @@ -319,11 +341,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1717786204, - "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "lastModified": 1718318537, + "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", + "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", "type": "github" }, "original": { @@ -334,6 +356,22 @@ } }, "nixpkgs_7": { + "locked": { + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1717774105, "narHash": "sha256-HV97wqUQv9wvptiHCb3Y0/YH0lJ60uZ8FYfEOIzYEqI=", @@ -349,6 +387,25 @@ "type": "github" } }, + "plasma-manager": { + "inputs": { + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1718494124, + "narHash": "sha256-Xs4HYhSTIepqRtttIHFSfuQoIiqBL7fJaKk1266aJGE=", + "owner": "pjones", + "repo": "plasma-manager", + "rev": "e2f2036ae74f9a25e0274b517ef204c52b5d928e", + "type": "github" + }, + "original": { + "owner": "pjones", + "repo": "plasma-manager", + "type": "github" + } + }, "root": { "inputs": { "disko": "disko", @@ -358,20 +415,21 @@ "mailserver": "mailserver", "nix-custom": "nix-custom", "nixpkgs": "nixpkgs_6", + "plasma-manager": "plasma-manager", "sops-nix": "sops-nix" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1718058322, - "narHash": "sha256-d5jLlAwVi4NzT9yc5UrPiOpDxTRhu8GGh0IIfeFcdrM=", + "lastModified": 1718137936, + "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d071c74a7de1e26d211b69b6fbae37ae2e31a87f", + "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6", "type": "github" }, "original": { @@ -430,6 +488,23 @@ "url": "https://github.com/EliverLara/Sweet-folders" } }, + "sweet-kde": { + "flake": false, + "locked": { + "lastModified": 1712792363, + "narHash": "sha256-Pp/cRLDWsOV9fFQa8KC/a52Pu3bHZmFGoklbHh5g5BI=", + "ref": "plasma6", + "rev": "f3b13a7d55223ddd7aa66000ee8967a085ad6909", + "revCount": 31, + "type": "git", + "url": "https://github.com/EliverLara/Sweet-kde" + }, + "original": { + "ref": "plasma6", + "type": "git", + "url": "https://github.com/EliverLara/Sweet-kde" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index f724970..5b73ce4 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,8 @@ jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nix-custom.url = "/home/macronova/Desktop/nix-custom"; + nix-custom.url = "git+https://forgejo.invariantspace.com/macronova/nix-custom"; + plasma-manager.url = "github:pjones/plasma-manager"; sops-nix.url = "github:Mic92/sops-nix"; }; diff --git a/linux/blitzar/gui.nix b/linux/blitzar/gui.nix index b3db818..7d9629b 100644 --- a/linux/blitzar/gui.nix +++ b/linux/blitzar/gui.nix @@ -18,22 +18,15 @@ let usr = config.constants.userName; in { qbittorrent razergenie ryujinx - sweet - sweet-ambar-blue telegram-desktop thunderbird wallpaper-engine-plasma6-plugin winetricks wineWowPackages.stagingFull - yorha-sound-theme ] ++ (with kdePackages; [ kdepim-addons merkuro # polonium - qtmultimedia - qtwebchannel - qtwebengine - qtwebsockets ]); programs = { firefox.enable = true; @@ -55,6 +48,7 @@ let usr = config.constants.userName; in { }; mpv.enable = true; obs-studio.enable = true; + plasma.enable = true; zathura = { enable = true; options = { diff --git a/linux/nebula/jellyfin.nix b/linux/nebula/jellyfin.nix index 311f8ca..dd9f192 100644 --- a/linux/nebula/jellyfin.nix +++ b/linux/nebula/jellyfin.nix @@ -11,9 +11,13 @@ in services = { aria2 = { enable = true; - extraArguments = "--rpc-listen-all"; - rpcListenPort = ports.aria2; rpcSecretFile = config.sops.secrets.aria2.path; + settings = { + check-integrity = true; + max-concurrent-downloads = 16; + rpc-listen-all = true; + rpc-listen-port = ports.aria2; + }; }; jellyfin = { enable = true; diff --git a/linux/protostar/gui.nix b/linux/protostar/gui.nix index 757a691..e483978 100644 --- a/linux/protostar/gui.nix +++ b/linux/protostar/gui.nix @@ -5,18 +5,25 @@ let jovianPkgs = pkgs.extend inputs.jovian.overlays.default; in { - home-manager.users.${usr}.home.packages = with jovianPkgs; [ - lutris - (retroarch.override { - cores = with libretro; [ - pcsx2 - ppsspp - ]; - }) - ryujinx - winetricks - wineWowPackages.stagingFull - ]; + home-manager.users.${usr} = { + + home.packages = with jovianPkgs; [ + lutris + (retroarch.override { + cores = with libretro; [ + pcsx2 + ppsspp + ]; + }) + ryujinx + winetricks + wineWowPackages.stagingFull + ]; + programs = { + firefox.enable = true; + plasma.enable = true; + }; + }; i18n.supportedLocales = [ "C.UTF-8/UTF-8" "en_US.UTF-8/UTF-8"