From dd2c06dba5d7164a969a22e7c382505678024b19 Mon Sep 17 00:00:00 2001 From: baduhai Date: Thu, 19 Jan 2023 17:23:28 -0300 Subject: [PATCH] Changed so many things I don't even remember --- flake.nix | 4 +-- hosts/common/console.nix | 22 +++++++++++++ hosts/desktops/common/services.nix | 46 ++++++++++++++++++--------- hosts/desktops/io.nix | 2 +- hosts/servers/alexandria/services.nix | 2 ++ users/desktops/common/programs.nix | 2 +- 6 files changed, 59 insertions(+), 19 deletions(-) create mode 100644 hosts/common/console.nix diff --git a/flake.nix b/flake.nix index 1a2f426..18805e0 100644 --- a/flake.nix +++ b/flake.nix @@ -30,9 +30,9 @@ specialArgs = { inherit inputs; }; modules = [ ./hosts/desktops/io.nix - kmonad.nixosModules.default agenix.nixosModule - home-manager.nixosModules.home-manager + kmonad.nixosModules.default + home-manager.nixosModules.default { nixpkgs.overlays = [ nur.overlay agenix.overlay ]; } ]; }; diff --git a/hosts/common/console.nix b/hosts/common/console.nix new file mode 100644 index 0000000..36f6fba --- /dev/null +++ b/hosts/common/console.nix @@ -0,0 +1,22 @@ +{ specialArgs, inputs, config, pkgs, lib, ... }: + +{ + console.colors = [ + "002b36" + "dc322f" + "859900" + "b58900" + "268bd2" + "d33682" + "2aa198" + "eee8d5" + "002b36" + "cb4b16" + "586e75" + "657b83" + "839496" + "6c71c4" + "93a1a1" + "fdf6e3" + ]; +} diff --git a/hosts/desktops/common/services.nix b/hosts/desktops/common/services.nix index 9a6ad62..c2de6b5 100644 --- a/hosts/desktops/common/services.nix +++ b/hosts/desktops/common/services.nix @@ -12,7 +12,8 @@ wireplumber.enable = true; }; xserver = { - enable = true; + enable = false; + autorun = false; layout = "us"; xkbVariant = "altgr-intl"; excludePackages = ( with pkgs; [ xterm ]); @@ -20,21 +21,36 @@ enable = true; excludePackages = ( with pkgs.plasma5Packages; [ elisa oxygen khelpcenter ]); }; - displayManager = { - defaultSession = "plasmawayland"; - sddm = { - enable = true; - autoNumlock = true; - settings = { - Theme = { - CursorTheme = "breeze_cursors"; - }; - X11 = { - UserAuthFile = ".local/share/sddm/Xauthority"; - }; - }; - }; +# displayManager = { +# defaultSession = "plasmawayland"; +# sddm = { +# enable = true; +# autoNumlock = true; +# settings = { +# Theme = { +# CursorTheme = "breeze_cursors"; +# }; +# X11 = { +# UserAuthFile = ".local/share/sddm/Xauthority"; +# }; +# }; +# }; +# }; + }; + greetd = { + enable = true; + settings = { + default_session.command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --asterisks --time --greeting \"Welcome to Nix\" --cmd ${pkgs.plasma-workspace}/bin/startplasma-wayland"; +# initial_session = { +# command = "${pkgs.plasma-workspace}/bin/startplasma-wayland"; +# user = "user"; +# }; }; }; }; + + environment.etc."greetd/environments".text = '' + startplasma-wayland + fish + ''; } diff --git a/hosts/desktops/io.nix b/hosts/desktops/io.nix index 556f994..d39a788 100644 --- a/hosts/desktops/io.nix +++ b/hosts/desktops/io.nix @@ -1,7 +1,7 @@ { specialArgs, inputs, config, pkgs, lib, ... }: { - imports = [ + imports = [ # Host-common imports ../common # Desktop-common imports diff --git a/hosts/servers/alexandria/services.nix b/hosts/servers/alexandria/services.nix index b5066e9..e74234b 100644 --- a/hosts/servers/alexandria/services.nix +++ b/hosts/servers/alexandria/services.nix @@ -66,6 +66,8 @@ motd = "Bem-vindo a Alexandria"; difficulty = "hard"; gamemode = "survival"; + online-mode = "false"; + spawn-protection = "0"; }; dataDir = "/data/minecraft"; }; diff --git a/users/desktops/common/programs.nix b/users/desktops/common/programs.nix index 4a3354a..9bd6697 100644 --- a/users/desktops/common/programs.nix +++ b/users/desktops/common/programs.nix @@ -47,7 +47,7 @@ local SOLID_RIGHT_ARROW = utf8.char(0xe0b0) return { font_size = 10, - color_scheme = 'Twilight (base16)', + color_scheme = 'Atelier Cave (base16)', hide_tab_bar_if_only_one_tab = true, font = wezterm.font_with_fallback ({ "Hack Nerd Font",