further improvements

This commit is contained in:
christoph.hollizeck 2024-03-26 19:20:50 +01:00
parent 55f7c8296f
commit 223ee9efd2
7 changed files with 41 additions and 31 deletions

View file

@ -1,9 +1,4 @@
{ options { options, config, lib, pkgs, ... }:
, config
, lib
, pkgs
, ...
}:
with lib; with lib;
with lib.wyrdgard; with lib.wyrdgard;
let let
@ -16,7 +11,11 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ environment.systemPackages = [
neofetch
fd
tree
ripgrep
]; ];
wyrdgard = { wyrdgard = {

View file

@ -1,9 +1,8 @@
{ options, config, lib, pkgs, ... }: { options, config, lib, pkgs, ... }:
with lib; with lib;
with lib.wyrdgard; with lib.wyrdgard;
let
let cfg = config.wyrdgard.submodules.games; cfg = config.wyrdgard.submodules.games;
in in
{ {
options.wyrdgard.submodules.games = with types; { options.wyrdgard.submodules.games = with types; {
@ -11,6 +10,10 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [
prismlauncher
];
wyrdgard = { wyrdgard = {
apps = { apps = {
steam = enabled; steam = enabled;

View file

@ -10,5 +10,15 @@ in
enable = mkBoolOpt false "Whether to enable a graphical interface"; enable = mkBoolOpt false "Whether to enable a graphical interface";
}; };
config = mkIf cfg.enable {
services.xserver = {
enable = true;
displayManager.sddm = {
enable = true;
wayland.enable = true;
};
desktopManager.plasma5.enable = true;
};
};
} }

View file

@ -26,11 +26,10 @@ in
fonts.packages = with pkgs; fonts.packages = with pkgs;
[ [
noto-fonts (nerdfonts.override {fonts = ["Jetbrains Mono" "CodeNewRoman" "NerdFontsSymbolsOnly"];})
noto-fonts-cjk-sans font-awesome
noto-fonts-cjk-serif powerline-fonts
noto-fonts-emoji powerline-symbols
(nerdfonts.override { fonts = [ "CodeNewRoman" ]; })
] ]
++ cfg.fonts; ++ cfg.fonts;
}; };

View file

@ -17,6 +17,14 @@ in
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = { i18n.extraLocaleSettings = {
LC_ADDRESS = "de_DE.UTF-8";
LC_IDENTIFICATION = "de_DE.UTF-8";
LC_MEASUREMENT = "de_DE.UTF-8";
LC_MONETARY = "de_DE.UTF-8";
LC_NAME = "de_DE.UTF-8";
LC_NUMERIC = "de_DE.UTF-8";
LC_PAPER = "de_DE.UTF-8";
LC_TELEPHONE = "de_DE.UTF-8";
LC_TIME = "de_DE.UTF-8"; LC_TIME = "de_DE.UTF-8";
}; };

View file

@ -1,10 +1,7 @@
{ options { options , config , lib , ... }:
, config
, lib
, ...
}:
with lib; with lib;
with lib.wyrdgard; let with lib.wyrdgard;
let
cfg = config.wyrdgard.system.xkb; cfg = config.wyrdgard.system.xkb;
in in
{ {
@ -16,6 +13,7 @@ in
console.useXkbConfig = true; console.useXkbConfig = true;
services.xserver = { services.xserver = {
xkb.layout = "us"; xkb.layout = "us";
variant = "";
xkbOptions = "caps:escape"; xkbOptions = "caps:escape";
}; };
}; };

View file

@ -5,8 +5,6 @@ with lib.wyrdgard;
imports = [ ./hardware.nix ]; imports = [ ./hardware.nix ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
fish
fd fd
tree tree
ripgrep ripgrep
@ -28,14 +26,9 @@ with lib.wyrdgard;
package = config.boot.kernelPackages.nvidiaPackages.beta; package = config.boot.kernelPackages.nvidiaPackages.beta;
}; };
services.xserver = { environment.pathsToLink = ["/libexec"];
enable = true;
videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
displayManager.sddm.enable = true;
desktopManager.plasma5.enable = true;
layout = "us";
xkbVariant = "";
};
wyrdgard = { wyrdgard = {
archetypes = { archetypes = {