From a7af799ca6cf2dae1149167f40f2717b52f998bd Mon Sep 17 00:00:00 2001 From: Liam Malone Date: Sun, 17 Mar 2024 16:05:49 +0000 Subject: [PATCH] . --- hosts/default/.#arc-dark.nix | 1 - hosts/default/sddm-theme.nix | 24 ------------------------ modules/themes/sddm-theme.nix | 15 ++++++++++++--- 3 files changed, 12 insertions(+), 28 deletions(-) delete mode 120000 hosts/default/.#arc-dark.nix delete mode 100644 hosts/default/sddm-theme.nix diff --git a/hosts/default/.#arc-dark.nix b/hosts/default/.#arc-dark.nix deleted file mode 120000 index 54449f8..0000000 --- a/hosts/default/.#arc-dark.nix +++ /dev/null @@ -1 +0,0 @@ -liamm@nixos-laptop.2093:1710687812 \ No newline at end of file diff --git a/hosts/default/sddm-theme.nix b/hosts/default/sddm-theme.nix deleted file mode 100644 index 66a9672..0000000 --- a/hosts/default/sddm-theme.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs }: - -let - imgLink = "https://github.com/Liam-Malone/nixos/modules/backgrounds/desert.jpg"; - image = pkgs.fetchurl { - url = imgLink; - sha256 = ""; - }; -in -pkgs.stdenv.mkDerivation { - name = "sddm-theme"; - src = pkgs.fetchFromGitHub { - owner = "nautilor"; - repo = "nord-sddm"; - rev = "ad72c3c7048c8aabe85bab41cbeab5f3c4502250"; - sha256 = "02idn5hggbqc0j01vhxij5nh748sgva123103d5ir0nl676rl782"; - }; - installPhase = '' - mkdir -p $out - cp -R ./* $out - rm Background.jpg - cp -r ${image} $out/Background.jpg - ''; -} diff --git a/modules/themes/sddm-theme.nix b/modules/themes/sddm-theme.nix index 229a006..66a9672 100644 --- a/modules/themes/sddm-theme.nix +++ b/modules/themes/sddm-theme.nix @@ -1,5 +1,12 @@ { pkgs }: +let + imgLink = "https://github.com/Liam-Malone/nixos/modules/backgrounds/desert.jpg"; + image = pkgs.fetchurl { + url = imgLink; + sha256 = ""; + }; +in pkgs.stdenv.mkDerivation { name = "sddm-theme"; src = pkgs.fetchFromGitHub { @@ -9,7 +16,9 @@ pkgs.stdenv.mkDerivation { sha256 = "02idn5hggbqc0j01vhxij5nh748sgva123103d5ir0nl676rl782"; }; installPhase = '' - mkdir -p $out - cp -R ./* $out - ''; + mkdir -p $out + cp -R ./* $out + rm Background.jpg + cp -r ${image} $out/Background.jpg + ''; }