Refresh flake inputs and expand fractal desktop configuration
- Add CreamInstaller with an NVIDIA WebKit workaround - Enable Minecraft Plymouth theme and Docker on fractal - Add development, terminal, gaming, and launcher utilities - Expand firewall ports and enable automatic generation cleanup
This commit is contained in:
parent
9560d542ca
commit
39ac00a2b5
12 changed files with 306 additions and 85 deletions
|
|
@ -62,6 +62,7 @@
|
|||
vscodium-fhs # vscode editor
|
||||
opencode-desktop
|
||||
prismlauncher
|
||||
xivlauncher
|
||||
];
|
||||
|
||||
};
|
||||
|
|
|
|||
21
modules/features/media/cream-installer.nix
Normal file
21
modules/features/media/cream-installer.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ inputs, ... }:
|
||||
|
||||
{
|
||||
flake.nixosModules.cream-installer =
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
creamlinux = import inputs.creamlinux-installer { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
environment.systemPackages = [
|
||||
(creamlinux.overrideAttrs (old: {
|
||||
# Upstream's WebKit workaround is required on NVIDIA GPUs.
|
||||
preFixup = (old.preFixup or "") + lib.optionalString
|
||||
(builtins.elem "nvidia" config.services.xserver.videoDrivers)
|
||||
''
|
||||
gappsWrapperArgs+=(--set WEBKIT_DISABLE_DMABUF_RENDERER 1)
|
||||
'';
|
||||
}))
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -12,7 +12,10 @@
|
|||
# for home manager functionality
|
||||
imports = [ inputs.home-manager.nixosModules.home-manager ];
|
||||
|
||||
environment.systemPackages = with pkgs; [ btop ];
|
||||
environment.systemPackages = with pkgs; [
|
||||
btop
|
||||
weechat
|
||||
];
|
||||
|
||||
# home manager options
|
||||
home-manager.users.${user-parts.user.username} = {
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
gcc
|
||||
gnumake
|
||||
python3
|
||||
uv
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
environment.systemPackages = with pkgs; [
|
||||
fish # primary shell
|
||||
bash # backup shell
|
||||
alacritty
|
||||
];
|
||||
|
||||
# system level fish declaration
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
|
||||
# for home manager functionality
|
||||
imports = [ inputs.home-manager.nixosModules.home-manager ];
|
||||
environment.systemPackages = [ pkgs.git-filter-repo ];
|
||||
|
||||
# system level git declaration
|
||||
programs.git.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,18 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
flake.nixosModules.nixd =
|
||||
{ pkgs, user-parts, ... }:
|
||||
{
|
||||
imports = [ inputs.home-manager.nixosModules.home-manager ];
|
||||
environment.systemPackages = with pkgs; [ nixd ];
|
||||
};
|
||||
{ pkgs, user-parts, ... }:
|
||||
{
|
||||
imports = [ inputs.home-manager.nixosModules.home-manager ];
|
||||
environment.systemPackages = with pkgs; [
|
||||
nixd
|
||||
fnm
|
||||
codex
|
||||
bubblewrap
|
||||
];
|
||||
programs.nix-ld = {
|
||||
enable = true;
|
||||
libraries = with pkgs; [ icu ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
];
|
||||
};
|
||||
# kernel and boot settings for plymouth
|
||||
initrd.verbose = false;
|
||||
# initrd.verbose = false;
|
||||
consoleLogLevel = 3;
|
||||
kernelParams = [
|
||||
# grub kernel parameters, set to prevent excessive output on boot
|
||||
|
|
@ -66,6 +66,8 @@
|
|||
|
||||
programs.nh = {
|
||||
enable = true;
|
||||
clean.enable = true;
|
||||
clean.extraArgs = "--keep 5 --keep-since 3d";
|
||||
flake = "/etc/nixos";
|
||||
};
|
||||
|
||||
|
|
@ -138,6 +140,10 @@
|
|||
# tools
|
||||
nix-output-monitor # displays more info on nix commands
|
||||
steam-run # emulates fhs environment
|
||||
iproute2 # ip and ss, used by HellForge's Linux launcher
|
||||
util-linux # unshare, used by HellForge's Linux launcher
|
||||
procps # pgrep, used by HellForge's Linux launcher
|
||||
socat # Steam port bridge for HellForge's Linux launcher
|
||||
tldr # simpler manual pages
|
||||
bc # basic calculator
|
||||
|
||||
|
|
@ -167,7 +173,7 @@
|
|||
pciutils # pci utilities
|
||||
moreutils # more utilities
|
||||
busybox # even more utilities
|
||||
|
||||
icu
|
||||
];
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
fractal-configuration
|
||||
fractal-hardware
|
||||
inputs.double-minegrub-menu.inputs.minegrub-world-sel-theme.nixosModules.default
|
||||
inputs.minecraft-plymouth-theme.nixosModules.default
|
||||
double-minegrub-menu
|
||||
|
||||
# selected features for this desktop
|
||||
|
|
@ -21,6 +22,7 @@
|
|||
terminal-emulator
|
||||
desktop
|
||||
gaming
|
||||
cream-installer
|
||||
multimedia
|
||||
];
|
||||
};
|
||||
|
|
@ -38,9 +40,21 @@
|
|||
networking.firewall.allowedTCPPorts = [
|
||||
22
|
||||
80
|
||||
443
|
||||
8443
|
||||
5100
|
||||
25565
|
||||
3923
|
||||
];
|
||||
networking.firewall.allowedUDPPorts = [ 25565 ];
|
||||
networking.firewall.allowedUDPPorts = [
|
||||
25565
|
||||
5100
|
||||
443
|
||||
8443
|
||||
];
|
||||
|
||||
virtualisation.docker.enable = true;
|
||||
users.users.porta.extraGroups = [ "docker" ];
|
||||
boot = {
|
||||
loader = {
|
||||
grub = {
|
||||
|
|
@ -57,10 +71,13 @@
|
|||
efi.canTouchEfiVariables = true;
|
||||
timeout = lib.mkDefault 5;
|
||||
};
|
||||
initrd.systemd.enable = true;
|
||||
# initrd.systemd.enable = true;
|
||||
plymouth.plymouth-minecraft-theme.enable = true;
|
||||
};
|
||||
# Minegrub supplies its own GRUB theme; don't layer Stylix's GRUB theme over it.
|
||||
stylix.targets.grub.enable = false;
|
||||
# The local Minecraft theme supplies Plymouth's theme and assets.
|
||||
stylix.targets.plymouth.enable = false;
|
||||
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue