about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsefidel <contact@sefidel.net>2022-02-01 23:11:30 +0900
committersefidel <contact@sefidel.net>2022-02-01 23:11:30 +0900
commit898f61e563bf49e3a4e151f62c557bcc6c35f5b8 (patch)
tree17656afef251ff75e103a97394eae4991f41bb52
parent2a35f4eff0fcbc5d7094246f848adb9b4f301454 (diff)
downloadnixrc-898f61e563bf49e3a4e151f62c557bcc6c35f5b8.tar.gz
nixrc-898f61e563bf49e3a4e151f62c557bcc6c35f5b8.zip
nixos/alpha: use nixpkgs greetd
-rw-r--r--nixos/alpha/configuration.nix2
-rw-r--r--nixos/default.nix2
-rw-r--r--nixos/overlays/tuigreet.nix17
3 files changed, 2 insertions, 19 deletions
diff --git a/nixos/alpha/configuration.nix b/nixos/alpha/configuration.nix
index ea62449..f75b254 100644
--- a/nixos/alpha/configuration.nix
+++ b/nixos/alpha/configuration.nix
@@ -111,7 +111,7 @@
   services.greetd = {
     enable = true;
 
-    settings.default_session.command = "${pkgs.tuigreet}/bin/tuigreet -t -c sway";
+    settings.default_session.command = "${pkgs.greetd.tuigreet}/bin/tuigreet -t -c sway";
   };
 
   # https://github.com/apognu/tuigreet/issues/17
diff --git a/nixos/default.nix b/nixos/default.nix
index d1937d4..3ae6f33 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -5,7 +5,7 @@
     name = "alpha";
     nixpkgs = unstable-small;
     # TODO: fix-156974 - https://github.com/NixOS/nixpkgs/pull/156974
-    overlays = with inputs; [ chaotic-nixpkgs.overlay (import ./overlays/tuigreet.nix) (import ./overlays/fix-156974.nix) ];
+    overlays = with inputs; [ chaotic-nixpkgs.overlay (import ./overlays/fix-156974.nix) ];
     extraModules = [
       inputs.sops-nix.nixosModules.sops
       ./modules/security.nix
diff --git a/nixos/overlays/tuigreet.nix b/nixos/overlays/tuigreet.nix
deleted file mode 100644
index e4d053b..0000000
--- a/nixos/overlays/tuigreet.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-final: prev: {
-  # TODO: remove on next release (0.8+)
-  tuigreet = prev.greetd.tuigreet.overrideAttrs (old: rec {
-    src = prev.fetchFromGitHub {
-      owner = "apognu";
-      repo = "tuigreet";
-      rev = "64a41c33999b37b06e8799810b742b12ec4a30ad";
-      sha256 = "sha256-XPxw5wdquFNRTmbszIsjsv43sjZvuKHEQ+dogZ/Z/38=";
-    };
-
-    cargoDeps = old.cargoDeps.overrideAttrs (_: {
-      inherit src;
-
-      outputHash = "sha256-f8WnHXbmHnvqvCRYNSI1jabkMgaYaHd9lFlqKEkd/9o=";
-    });
-  });
-}