diff --git a/system/default.nix b/system/default.nix index 2f7f9328..67aadaf7 100644 --- a/system/default.nix +++ b/system/default.nix @@ -208,6 +208,7 @@ with mylib.networking; { supportedLocales = ["${en}/UTF-8" "${de}/UTF-8"]; }; + # console = lib.mkIf headless { console = { earlySetup = true; useXkbConfig = true; @@ -301,6 +302,7 @@ with mylib.networking; { wireguard-tools man-pages man-pages-posix + kmscon # needed in addition to services.kmscon for kmscon-launch-gui # Android android-tools @@ -388,21 +390,6 @@ with mylib.networking; { wacom.enable = true; }; - # greetd = { - # enable = !headless; - # restart = false; - # useTextGreeter = true; - # - # settings = { - # terminal.vt = 1; - # - # default_session = { - # command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd $SHELL"; - # user = "greeter"; - # }; - # }; - # }; - # Enable touchpad support (enabled default in most desktopManager). libinput.enable = !headless; diff --git a/system/nixinator/default.nix b/system/nixinator/default.nix index 0837bcfc..2a62fa71 100644 --- a/system/nixinator/default.nix +++ b/system/nixinator/default.nix @@ -154,24 +154,37 @@ boot = { # kernelPackages = pkgs.linuxPackages_zen; - kernelPackages = pkgs.linuxPackages_latest; + # kernelPackages = pkgs.linuxPackages_latest; # Why do I need to know if something fails during boot??? # consoleLogLevel = 3; # initrd.verbose = false; # initrd.systemd.enable = true; - # kernelParams = [ - # "quiet" - # "splash" - # "intremap=on" - # "boot.shell_on_fail" - # "udev.log_priority=3" - # "rd.systemd.show_status=auto" - # ]; + kernelParams = [ + # Doesn't work, there is only a single framebuffer, + # so the smallest monitor determines the size + # "video=DP-1:3440x1440" + # "video=DP-2:1920x1080" + + # "quiet" + # "splash" + # "intremap=on" + # "boot.shell_on_fail" + # "udev.log_priority=3" + # "rd.systemd.show_status=auto" + ]; # plymouth = { # enable = false; # font = "${pkgs.monolisa}/share/fonts/truetype/MonoLisa-AltPars-Straight.ttf"; # logo = "${pkgs.nixos-icons}/share/icons/hicolor/128x128/apps/nix-snowflake.png"; + # + # theme = "colorful_sliced"; + # themePackages = with pkgs; [ + # # By default we would install all themes + # (adi1090x-plymouth-themes.override { + # selected_themes = ["colorful_sliced"]; + # }) + # ]; # }; }; @@ -196,6 +209,73 @@ enable = true; }; + greetd = { + enable = false; + restart = false; + useTextGreeter = true; + + settings = { + terminal.vt = 1; + + default_session = { + # command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd $SHELL"; + command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd niri-session"; + user = "greeter"; + }; + }; + }; + + kmscon = { + enable = false; + hwRender = true; + useXkbConfig = true; + # autologinUser = username; + + fonts = [ + { + name = "MonoLisa Alt Script"; + package = pkgs.monolisa; + } + ]; + + # NOTE: Do NOT use multline strings here! + # This will create a linebreak in the systemd service and break login! + extraOptions = ""; + + extraConfig = let + color = config.home-manager.users.${username}.homemodules.color; + in '' + # term=xterm-256color + font-size=14 + mode=3440x1440 + palette=custom + + palette-black=0,0,0 + pallette-white=255,255,255 + + palette-red=${color.rgbS.red} + palette-light-red=${color.rgbS.red} + + palette-green=${color.rgbS.green} + palette-light-green=${color.rgbS.green} + + palette-yellow=${color.rgbS.yellow} + palette-light-yellow=${color.rgbS.yellow} + + palette-blue=${color.rgbS.blue} + palette-light-blue=${color.rgbS.blue} + + palette-magenta=${color.rgbS.pink} + palette-light-magenta=${color.rgbS.pink} + + palette-cyan=${color.rgbS.teal} + palette-light-cyan=${color.rgbS.teal} + + palette-foreground=${color.rgbS.text} + palette-background=0,0,0 + ''; + }; + openssh = { ports = [5432]; settings = { diff --git a/system/nixinator/hardware-configuration.nix b/system/nixinator/hardware-configuration.nix index a2207183..c380ecce 100644 --- a/system/nixinator/hardware-configuration.nix +++ b/system/nixinator/hardware-configuration.nix @@ -148,7 +148,7 @@ package = config.boot.kernelPackages.nvidiaPackages.stable; # package = config.boot.kernelPackages.nvidiaPackages.beta; - open = false; + open = true; nvidiaSettings = false; # Those are for x-server modesetting.enable = true; # Required for wayland };