Johan Rong 1 miesiąc temu
rodzic
commit
2725726b78

+ 4 - 0
flake.nix

@@ -16,6 +16,10 @@
       url = "github:AvengeMedia/dank-greeter";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    mangowm = {
+      url = "github:mangowm/mango";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =

+ 2 - 3
hosts/ideapad/nixos/default.nix

@@ -20,9 +20,8 @@ in
     ../../../nixos/modules/hardware/bluetooth
     ../../../nixos/modules/hardware/biometric/elan-fingerprint.nix
 
-    ../../../nixos/modules/desktop/hyprland
-    #../../../nixos/modules/greeter/dank-greeter/hyprland.nix
-    ../../../nixos/modules/greeter/tuigreet
+    ../../../nixos/modules/desktop/mango
+    ../../../nixos/modules/greeter/tuigreet/mango
   ];
 
   boot.kernelParams = [

+ 1 - 2
hosts/nixstation/nixos/default.nix

@@ -21,8 +21,7 @@ in
     ../../../nixos/modules/hardware/bluetooth
 
     ../../../nixos/modules/desktop/hyprland
-    #../../../nixos/modules/greeter/dank-greeter/hyprland.nix
-    ../../../nixos/modules/greeter/tuigreet
+    ../../../nixos/modules/greeter/tuigreet/hyprland
   ];
   
   boot.kernelParams = [

+ 7 - 0
nixos/modules/desktop/mango/default.nix

@@ -0,0 +1,7 @@
+{inputs, ...}: {
+  imports = [
+    inputs.mangowm.nixosModules.mango
+  ];
+
+  programs.mango.enable = true;
+}

+ 0 - 1
nixos/modules/greeter/tuigreet/default.nix → nixos/modules/greeter/tuigreet/common.nix

@@ -1,6 +1,5 @@
 { config, pkgs, ... }:
 
-
 let
   users = import ./../../../../config/users.nix;
 in

+ 13 - 0
nixos/modules/greeter/tuigreet/hyprland.nix

@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./common.nix
+  ];
+
+  services.greetd = {
+    settings.default_session = {
+      command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd start-hyprland"
+    };
+  };
+}

+ 13 - 0
nixos/modules/greeter/tuigreet/mango.nix

@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./common.nix
+  ];
+
+  services.greetd = {
+    settings.default_session = {
+      command = "${pkgs.greetd.tuigreet}/bin/tuigreet --cmd mango";
+    };
+  };
+}