This commit is contained in:
Simon Gardling 2025-06-25 19:18:22 -07:00
parent e269c50306
commit b370184767
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
6 changed files with 9 additions and 35 deletions

View File

@ -11,7 +11,6 @@
{ {
imports = [ imports = [
./declarative-nm.nix ./declarative-nm.nix
./distrobox.nix
# ./vm.nix # ./vm.nix
./steam.nix ./steam.nix
./networking.nix ./networking.nix
@ -23,7 +22,7 @@
]; ];
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = true;
swapDevices = [ ]; swapDevices = [ ];
@ -42,10 +41,10 @@
# extract all my secureboot keys # extract all my secureboot keys
# TODO! proper secrets management # TODO! proper secrets management
"secureboot-keys".text = '' "secureboot-keys".text = ''
#!/bin/sh #!/usr/bin/env sh
rm -fr ${config.boot.lanzaboote.pkiBundle} || true rm -fr ${config.boot.lanzaboote.pkiBundle} || true
mkdir -p ${config.boot.lanzaboote.pkiBundle} mkdir -p ${config.boot.lanzaboote.pkiBundle}
${pkgs.gnutar}/bin/tar xf ${./secrets/secureboot.tar} -C ${config.boot.lanzaboote.pkiBundle} ${lib.getExe pkgs.gnutar} xf ${./secrets/secureboot.tar} -C ${config.boot.lanzaboote.pkiBundle}
chown -R root:wheel ${config.boot.lanzaboote.pkiBundle} chown -R root:wheel ${config.boot.lanzaboote.pkiBundle}
chmod -R 500 ${config.boot.lanzaboote.pkiBundle} chmod -R 500 ${config.boot.lanzaboote.pkiBundle}
''; '';
@ -85,6 +84,7 @@
"thunderbolt" "thunderbolt"
"nvme" "nvme"
"usbhid" "usbhid"
"amdgpu"
]; ];
}; };
@ -145,8 +145,6 @@
]; ];
}; };
# age.identityPaths = [ "/home/${username}/.ssh/id_ed25519" ];
# Select internationalisation properties. # Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
@ -231,12 +229,12 @@
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
then then
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION exec ${lib.getExe pkgs.fish} $LOGIN_OPTION
fi fi
''; '';
}; };
system.stateVersion = "24.11"; system.stateVersion = "25.11";
nixpkgs.hostPlatform = "x86_64-linux"; nixpkgs.hostPlatform = "x86_64-linux";
documentation.enable = true; documentation.enable = true;

View File

@ -1,11 +0,0 @@
{ pkgs, ... }:
{
virtualisation.podman = {
enable = true;
};
environment.systemPackages = [
pkgs.distrobox
pkgs.podman-compose
];
}

View File

@ -5,7 +5,6 @@
... ...
}: }:
{ {
nixpkgs.config.allowUnfreePredicate = nixpkgs.config.allowUnfreePredicate =
pkg: pkg:
builtins.elem (lib.getName pkg) [ builtins.elem (lib.getName pkg) [
@ -17,7 +16,6 @@
programs.steam = { programs.steam = {
enable = true; enable = true;
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
extraCompatPackages = with pkgs; [ proton-ge-bin ]; extraCompatPackages = with pkgs; [ proton-ge-bin ];
}; };

View File

@ -31,21 +31,12 @@
enable = true; enable = true;
settings = { settings = {
default_session = { default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd niri-session"; command = "${lib.getExe pkgs.greetd.tuigreet} --time --cmd niri-session";
user = username; user = username;
}; };
}; };
}; };
programs.gamescope = {
enable = true;
capSysNice = true;
};
programs.steam = {
gamescopeSession.enable = true;
};
system.activationScripts = { system.activationScripts = {
# FIX: https://github.com/NixOS/nix/issues/2982 # FIX: https://github.com/NixOS/nix/issues/2982
"profile-channel-dummy".text = '' "profile-channel-dummy".text = ''

View File

@ -58,7 +58,8 @@
# }; # };
programs.steam = { programs.steam = {
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play remotePlay.openFirewall = true;
localNetworkGameTransfers.openFirewall = true;
}; };
# LACT (Linux AMDGPU Configuration Tool): https://github.com/ilya-zlobintsev/LACT # LACT (Linux AMDGPU Configuration Tool): https://github.com/ilya-zlobintsev/LACT

View File

@ -127,8 +127,6 @@ in
# for benchmaking stuff # for benchmaking stuff
hyperfine hyperfine
just
pfetch-rs pfetch-rs
waypipe waypipe
@ -181,7 +179,6 @@ in
# terminal image viewer # terminal image viewer
timg timg
lsof
tcpdump tcpdump