Commit all of my system changes to make my life easier later.

This commit is contained in:
Whovian NTSN 2024-12-31 19:54:16 -05:00
parent 65d67bd891
commit 9c0002aefc
6 changed files with 64 additions and 70 deletions

32
system/common/fonts.nix Normal file
View file

@ -0,0 +1,32 @@
{
lib,
config,
pkgs,
...
}:
{
fonts = {
enableDefaultPackages = false;
packages = [] ++ lib.optionals (!config.wsl.enable or false) [
### fonts.enableDefaultPackages as of nixpkgs 7fd4e5f7c309
pkgs.dejavu_fonts
pkgs.freefont_ttf
pkgs.gyre-fonts
# TrueType substitutes for standard PostScript fonts
pkgs.liberation_ttf
pkgs.unifont
pkgs.noto-fonts-color-emoji
### fonts.enableDefaultPackages as of nixpkgs 7fd4e5f7c309
pkgs.corefonts
pkgs.comic-mono
pkgs.inconsolata
pkgs.monocraft
pkgs.noto-fonts
pkgs.noto-fonts-cjk-sans
pkgs.unifont_upper
];
fontconfig.cache32Bit = true;
};
}

View file

@ -42,7 +42,7 @@
xserver = {
enable = true;
# Enable the X11 windowing system.
videoDrivers = [ "intel" ];
videoDrivers = [ "modesetting" ];
desktopManager = {
xterm.enable = false;
xfce.enable = false;

View file

@ -1,6 +1,6 @@
{ lib, pkgs, config, modulesPath, ... }: {
nix = {
package = pkgs.nixFlakes;
# package = pkgs.nixVersions.stable;
settings = {
experimental-features = [ "nix-command" "flakes" ];
};

View file

@ -8,9 +8,6 @@
# Use PipeWire
security.rtkit.enable = true;
# dconf
programs.dconf.enable = true;
services = {
# Use PipeWire
pipewire = {
@ -31,30 +28,9 @@
desktopManager.cinnamon.enable = true;
};
# dconf
programs.dconf.enable = true;
# Fonts
fonts = {
enableDefaultPackages = false;
packages = [
# fonts.enableDefaultPackages
pkgs.dejavu_fonts
pkgs.freefont_ttf
pkgs.gyre-fonts
# TrueType substitutes for standard PostScript fonts
pkgs.liberation_ttf
pkgs.unifont
pkgs.noto-fonts-color-emoji
# fonts.enableDefaultPackages
pkgs.unifont_upper
pkgs.noto-fonts
pkgs.noto-fonts-cjk-sans
pkgs.corefonts
];
fontconfig.cache32Bit = true;
};
# KDE6
# Enable the KDE Desktop Environment.
xdg.icons.enable = true;
environment = {
sessionVariables.NIXOS_OZONE_WL = "1";

View file

@ -9,62 +9,43 @@
security.rtkit.enable = true;
services = {
# Use PipeWire
# Use PipeWire
pipewire = {
enable = true;
alsa.enable = true;
pulse.enable = true;
jack.enable = true;
};
# Enable the X11 windowing system.
# Enable the X11 windowing system.
xserver = {
enable = true;
xkb.layout = "us";
};
# Enable the KDE Desktop Environment.
# Enable the KDE Desktop Environment.
displayManager.sddm.enable = true;
desktopManager.plasma6.enable = true;
};
# Fonts
fonts.enableDefaultPackages = false;
fonts.packages = [
# fonts.enableDefaultPackages
pkgs.dejavu_fonts
pkgs.freefont_ttf
pkgs.gyre-fonts # TrueType substitutes for standard PostScript fonts
pkgs.liberation_ttf
pkgs.unifont
pkgs.noto-fonts-color-emoji
# fonts.enableDefaultPackages
pkgs.comic-mono
pkgs.corefonts
pkgs.inconsolata
pkgs.monocraft
pkgs.noto-fonts
pkgs.noto-fonts-cjk-sans
pkgs.unifont_upper
];
fonts.fontconfig.cache32Bit = true;
# dconf
programs.dconf.enable = true;
# KDE6
# Enable the KDE Desktop Environment.
xdg.icons.enable = true;
environment.sessionVariables.NIXOS_OZONE_WL = "1";
environment.systemPackages = [
pkgs.kdePackages.sddm-kcm
pkgs.kdePackages.audiocd-kio
pkgs.kdePackages.skanpage
pkgs.kdePackages.isoimagewriter
pkgs.kdePackages.krdc # RDP
# pkgs.kdePackages.neochat # Matrix
pkgs.kdePackages.breeze-icons
pkgs.kdePackages.discover # "KDE and Plasma resources management GUI"
pkgs.kdePackages.partitionmanager # Partition Manager
pkgs.exfatprogs
pkgs.sublime4
rom-properties.packages.x86_64-linux.rp_kde6
# (rom-properties.packages.x86_64-linux.rp_kde6.overrideAttrs (oldAttrs: { patches = oldAttrs.patches ++ [ ../files/rp_larger_icons.diff ]; }))
];
environment = {
sessionVariables.NIXOS_OZONE_WL = "1";
systemPackages = [
pkgs.kdePackages.sddm-kcm
pkgs.kdePackages.audiocd-kio
pkgs.kdePackages.skanpage
pkgs.kdePackages.isoimagewriter
pkgs.kdePackages.krdc # RDP
# pkgs.kdePackages.neochat # Matrix
pkgs.kdePackages.breeze-icons
pkgs.kdePackages.discover # "KDE and Plasma resources management GUI"
pkgs.kdePackages.partitionmanager # Partition Manager
pkgs.exfatprogs
pkgs.sublime4
rom-properties.packages.x86_64-linux.rp_kde6
# (rom-properties.packages.x86_64-linux.rp_kde6.overrideAttrs (oldAttrs: { patches = oldAttrs.patches ++ [ ../files/rp_larger_icons.diff ]; }))
];
};
}

View file

@ -1,7 +1,10 @@
{
lib,
aaru,
agenix,
config,
home-manager,
ihaveahax-nur,
ninfs,
nixpkgs,
pkgs,
@ -9,11 +12,12 @@
xil,
...
}:
# let inherit (import ./system/1_common/sshKeys.nix) mySSHKeys; in
{
imports = [
./common/nix_lix.nix
./common/users.nix
./common/fonts.nix
];
# Optionally, use home-manager.extraSpecialArgs to pass arguments
@ -24,6 +28,7 @@
inherit aaru;
inherit agenix;
# inherit nixpkgs;
inherit ihaveahax-nur;
inherit ninfs;
inherit rom-properties;
inherit xil;