From 3a5e679398b0903aa8347ef863a2a36f6e9a507c Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Sat, 26 Aug 2023 14:24:40 -0400
Subject: [PATCH] refactor: delete some stuff
---
nixos/overlays/list.nix | 5 ++-
nixos/overlays/pkgs/lavanda-sddm.nix | 30 ++++++++++++++++
nixos/overlays/pkgs/utterly-sddm.nix | 51 ----------------------------
nixos/overlays/tutanota-desktop.nix | 16 ---------
4 files changed, 34 insertions(+), 68 deletions(-)
create mode 100644 nixos/overlays/pkgs/lavanda-sddm.nix
delete mode 100644 nixos/overlays/pkgs/utterly-sddm.nix
delete mode 100644 nixos/overlays/tutanota-desktop.nix
diff --git a/nixos/overlays/list.nix b/nixos/overlays/list.nix
index a16eef0b..31768d4e 100644
--- a/nixos/overlays/list.nix
+++ b/nixos/overlays/list.nix
@@ -4,7 +4,6 @@
nixpkgs.overlays = [
(import ./swayosd.nix)
(import ./blueberry.nix)
- (import ./tutanota-desktop.nix)
(final: prev: {
input-emulator = final.callPackage ./pkgs/input-emulator.nix {};
@@ -18,6 +17,10 @@
dracula-plymouth = final.callPackage ./pkgs/dracula-plymouth.nix {};
})
+ (final: prev: {
+ lavanda-sddm = final.callPackage ./pkgs/lavanda-sddm.nix {};
+ })
+
(final: prev: {
coloryou = final.callPackage ./pkgs/coloryou/default.nix {};
})
diff --git a/nixos/overlays/pkgs/lavanda-sddm.nix b/nixos/overlays/pkgs/lavanda-sddm.nix
new file mode 100644
index 00000000..59b0f371
--- /dev/null
+++ b/nixos/overlays/pkgs/lavanda-sddm.nix
@@ -0,0 +1,30 @@
+### test package
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkgs
+}:
+
+stdenv.mkDerivation {
+ name = "lavanda-kde";
+ version = "unstable-2022-08-24";
+
+ src = fetchFromGitHub {
+ repo = "Lavanda-kde";
+ owner = "vinceliuice";
+ rev = "f247e5c0078df64fdee2c74d27baf479f025001e";
+ hash = "sha256-hLP4Ye3lRKSCk9I+PguAWhlHUDvIqRlRazXyOccPerQ=";
+ };
+
+ dontConfigure = true;
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/share/sddm/themes/
+ mv ./sddm/* $out/share/sddm/themes/
+
+ runHook postInstall
+ '';
+}
diff --git a/nixos/overlays/pkgs/utterly-sddm.nix b/nixos/overlays/pkgs/utterly-sddm.nix
deleted file mode 100644
index a5d85be4..00000000
--- a/nixos/overlays/pkgs/utterly-sddm.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-### test package
-{ lib
-, stdenv
-, fetchFromGitHub
-, pkgs
-}:
-
-let
-
-wallpaper = fetchFromGitHub {
- repo = "wallpaper";
- owner = "dracula";
- rev = "3bd5b95d4ae08d2adfb2931e090bb657fd9a6a4f";
- hash = "sha256-3p7PCMZHIytkOH3BBUMqaYBFcrSef3YHthyJY6KDArg=";
- };
-
-in
-
-stdenv.mkDerivation {
- name = "utterly-sddm";
- version = "unstable-2022-11-06";
-
- src = fetchFromGitHub {
- repo = "Utterly-Sweet-Plasma";
- owner = "HimDek";
- rev = "4bb007e865d559de8dd43bbffb93778ea136f957";
- hash = "sha256-oEyf6FI5XSjXPZjzBiGypwZY89ulhwAwk9QIJ3pMw/M=";
- };
-
- dontConfigure = true;
- dontBuild = true;
-
- installPhase = ''
- runHook preInstall
-
- rm ./sddm/background.jpg
- cp ${wallpaper}/first-collection/nixos.png ./sddm/background.jpg
-
- mkdir -p $out/share/sddm/themes/Utterly-Sweet
- mv ./sddm/* $out/share/sddm/themes/Utterly-Sweet
-
- runHook postInstall
- '';
-
- meta = with lib; {
- description = "A dark theme for SDDM";
- homepage = "https://github.com/dracula/gtk";
- maintainers = with maintainers; [ matt1432 ];
- platforms = platforms.all;
- };
-}
diff --git a/nixos/overlays/tutanota-desktop.nix b/nixos/overlays/tutanota-desktop.nix
deleted file mode 100644
index 946b8db9..00000000
--- a/nixos/overlays/tutanota-desktop.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-final: prev: {
- tutanota-desktop = prev.tutanota-desktop.overrideAttrs (oldAttrs: rec {
-
- pname = "tutanota-desktop";
- version = "3.116.8";
-
- src = prev.fetchurl {
- url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz";
- name = "tutanota-desktop-${version}.tar.gz";
- sha256 = "sha256-HY0LdiHz8G/v8/zEglRtoDyPFMhMj1Zrc0zpQNJpWr0=";
- };
-
- patches = [];
- });
-}
-