further improvements
This commit is contained in:
parent
55f7c8296f
commit
223ee9efd2
|
@ -1,9 +1,4 @@
|
|||
{ options
|
||||
, config
|
||||
, lib
|
||||
, pkgs
|
||||
, ...
|
||||
}:
|
||||
{ options, config, lib, pkgs, ... }:
|
||||
with lib;
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
|
@ -16,7 +11,11 @@ in
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
neofetch
|
||||
|
||||
fd
|
||||
tree
|
||||
ripgrep
|
||||
];
|
||||
|
||||
wyrdgard = {
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
{ options, config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
with lib.wyrdgard;
|
||||
|
||||
let cfg = config.wyrdgard.submodules.games;
|
||||
let
|
||||
cfg = config.wyrdgard.submodules.games;
|
||||
in
|
||||
{
|
||||
options.wyrdgard.submodules.games = with types; {
|
||||
|
@ -11,6 +10,10 @@ in
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
prismlauncher
|
||||
];
|
||||
|
||||
wyrdgard = {
|
||||
apps = {
|
||||
steam = enabled;
|
||||
|
|
|
@ -10,5 +10,15 @@ in
|
|||
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;
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -26,11 +26,10 @@ in
|
|||
|
||||
fonts.packages = with pkgs;
|
||||
[
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-cjk-serif
|
||||
noto-fonts-emoji
|
||||
(nerdfonts.override { fonts = [ "CodeNewRoman" ]; })
|
||||
(nerdfonts.override {fonts = ["Jetbrains Mono" "CodeNewRoman" "NerdFontsSymbolsOnly"];})
|
||||
font-awesome
|
||||
powerline-fonts
|
||||
powerline-symbols
|
||||
]
|
||||
++ cfg.fonts;
|
||||
};
|
||||
|
|
|
@ -17,6 +17,14 @@ in
|
|||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
|
||||
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";
|
||||
};
|
||||
|
||||
|
|
|
@ -1,10 +1,7 @@
|
|||
{ options
|
||||
, config
|
||||
, lib
|
||||
, ...
|
||||
}:
|
||||
{ options , config , lib , ... }:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.system.xkb;
|
||||
in
|
||||
{
|
||||
|
@ -16,6 +13,7 @@ in
|
|||
console.useXkbConfig = true;
|
||||
services.xserver = {
|
||||
xkb.layout = "us";
|
||||
variant = "";
|
||||
xkbOptions = "caps:escape";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -5,8 +5,6 @@ with lib.wyrdgard;
|
|||
imports = [ ./hardware.nix ];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
fish
|
||||
|
||||
fd
|
||||
tree
|
||||
ripgrep
|
||||
|
@ -28,14 +26,9 @@ with lib.wyrdgard;
|
|||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
};
|
||||
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
videoDrivers = [ "nvidia" ];
|
||||
displayManager.sddm.enable = true;
|
||||
desktopManager.plasma5.enable = true;
|
||||
layout = "us";
|
||||
xkbVariant = "";
|
||||
};
|
||||
environment.pathsToLink = ["/libexec"];
|
||||
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
|
||||
wyrdgard = {
|
||||
archetypes = {
|
||||
|
@ -53,7 +46,7 @@ with lib.wyrdgard;
|
|||
};
|
||||
|
||||
# Configure Home-Manager options from NixOS.
|
||||
snowfallorg.user.cholli.home.config = {
|
||||
snowfallorg.user.cholli.home.config = {
|
||||
programs.kitty = {
|
||||
theme = "Tokyo Night";
|
||||
shellIntegration.enableFishIntegration = true;
|
||||
|
|
Loading…
Reference in a new issue