From 9c0002aefc4408c1dea98ea80e6b25383a26886f Mon Sep 17 00:00:00 2001 From: Whovian9369 Date: Tue, 31 Dec 2024 19:54:16 -0500 Subject: [PATCH] Commit all of my system changes to make my life easier later. --- system/common/fonts.nix | 32 +++++++++++++++++ system/nixps/gui.nix | 2 +- system/nixps/packages.nix | 2 +- system/piplup/gui-cinnamon.nix | 28 ++------------- system/piplup/gui-kde6.nix | 63 ++++++++++++---------------------- system/shared_imports.nix | 7 +++- 6 files changed, 64 insertions(+), 70 deletions(-) create mode 100644 system/common/fonts.nix diff --git a/system/common/fonts.nix b/system/common/fonts.nix new file mode 100644 index 0000000..cbc7b3a --- /dev/null +++ b/system/common/fonts.nix @@ -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; + }; +} diff --git a/system/nixps/gui.nix b/system/nixps/gui.nix index 8698f24..3b3a3d2 100644 --- a/system/nixps/gui.nix +++ b/system/nixps/gui.nix @@ -42,7 +42,7 @@ xserver = { enable = true; # Enable the X11 windowing system. - videoDrivers = [ "intel" ]; + videoDrivers = [ "modesetting" ]; desktopManager = { xterm.enable = false; xfce.enable = false; diff --git a/system/nixps/packages.nix b/system/nixps/packages.nix index 117bd3d..e7fdb2e 100644 --- a/system/nixps/packages.nix +++ b/system/nixps/packages.nix @@ -1,6 +1,6 @@ { lib, pkgs, config, modulesPath, ... }: { nix = { - package = pkgs.nixFlakes; + # package = pkgs.nixVersions.stable; settings = { experimental-features = [ "nix-command" "flakes" ]; }; diff --git a/system/piplup/gui-cinnamon.nix b/system/piplup/gui-cinnamon.nix index 47babbe..e0114fb 100644 --- a/system/piplup/gui-cinnamon.nix +++ b/system/piplup/gui-cinnamon.nix @@ -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"; diff --git a/system/piplup/gui-kde6.nix b/system/piplup/gui-kde6.nix index c57ecfe..d902bba 100644 --- a/system/piplup/gui-kde6.nix +++ b/system/piplup/gui-kde6.nix @@ -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 ]; })) + ]; + }; } diff --git a/system/shared_imports.nix b/system/shared_imports.nix index 2334dc8..b68bde6 100644 --- a/system/shared_imports.nix +++ b/system/shared_imports.nix @@ -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;