talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: talexander:b179bee277c0f50201a49828c948bd93480940a7
Branches Tags
talexander:main
talexander:nix
talexander:upstream_amd_debug_tools
talexander:install_files_mixin
talexander:starship
talexander:pixelbook
..
compare: talexander:96ea6c4232ce3f159d40ba1c467d1a36e62f9a7c
Branches Tags
talexander:nix
talexander:upstream_amd_debug_tools
talexander:main
talexander:install_files_mixin
talexander:starship
talexander:pixelbook

No commits in common. "b179bee277c0f50201a49828c948bd93480940a7" and "96ea6c4232ce3f159d40ba1c467d1a36e62f9a7c" have entirely different histories.
b179bee277 ... 96ea6c4232

7 changed files with 124 additions and 96 deletions
Show Stats Expand all files Collapse all files

18
nix/configuration/flake.lock generated
View File

@ -39,11 +39,11 @@
]
},
"locked": {
"lastModified": 1756733629,
"narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=",
"lastModified": 1750903843,
"narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=",
"owner": "nix-community",
"repo": "disko",
"rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1",
"rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae",
"type": "github"
},
"original": {
@ -190,11 +190,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1756787288,
"narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
"lastModified": 1751271578,
"narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
"rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
"type": "github"
},
"original": {
@ -238,11 +238,11 @@
},
"nixpkgs-unoptimized": {
"locked": {
"lastModified": 1756787288,
"narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
"lastModified": 1751271578,
"narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
"rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
"type": "github"
},
"original": {

2
nix/configuration/hosts/odo/screen_brightness.nix
View File

@ -9,6 +9,6 @@
imports = [ ];
systemd.tmpfiles.rules = [
"w- /sys/class/backlight/amdgpu_bl1/brightness - - - - 21845"
"w- /sys/class/backlight/amdgpu_bl1/brightness - - - - 85"
];
}

82
nix/configuration/roles/amd_s2idle/cysystemd.nix
View File

@ -1,48 +1,76 @@
# unpackPhase
# patchPhase
# configurePhase
# buildPhase
# checkPhase
# installPhase
# fixupPhase
# installCheckPhase
# distPhase
{
lib,
stdenv,
pkgs,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
cython,
sqlite,
makeWrapper,
lib,
python3,
systemd,
# setuptools,
# cython,
pkg-config,
setuptools,
# python3Packages,
...
}:
let
version = "1.6.3";
in
buildPythonPackage {
python3.pkgs.buildPythonPackage {
pname = "cysystemd";
inherit version;
version = version;
pyproject = true;
src = fetchFromGitHub {
owner = "mosquito";
repo = "cysystemd";
tag = version;
hash = "sha256-xumrQgoKfFeKdRQUIYXXiXEcNd76i4wo/EIDm8BN7oU=";
};
disabled = pythonOlder "3.6";
# format = "pyproject";
build-system = [
setuptools
cython
python3.pkgs.setuptools
python3.pkgs.cython
];
nativeBuildInputs = [
buildInputs = [ systemd ];
nativeBuildInputs = with python3.pkgs; [
# setuptools
# setuptools-git-versioning
# setuptools-git
# pyudev
# pkgs.systemd
pkg-config
];
propagatedBuildInputs = with python3.pkgs; [
# pyudev
# pandas
# jinja2
# tabulate
# seaborn
# cysystemd
# jinja2
# matplotlib
# seaborn
];
src = pkgs.fetchgit {
url = "https://github.com/mosquito/cysystemd.git";
tag = version;
sha256 = "sha256-xumrQgoKfFeKdRQUIYXXiXEcNd76i4wo/EIDm8BN7oU=";
# leaveDotGit = true;
};
buildInputs = [ pkgs.systemd ];
# postPatch = ''
# substituteInPlace pyproject.toml \
# --replace-fail ', "setuptools-git-versioning>=2.0,<3"' ""
# '';
pythonImportsCheck = [ "cysystemd" ];
meta = {
meta = with lib; {
description = "systemd wrapper on Cython";
homepage = "https://github.com/mosquito/cysystemd";
license = lib.licenses.asl20;
platforms = lib.platforms.linux;
license = licenses.asl20;
platforms = platforms.linux;
};
}

30
nix/configuration/roles/amd_s2idle/default.nix
View File

@ -21,7 +21,7 @@
lib.mkMerge [
{
environment.systemPackages = with pkgs; [
amd-debug-tools
amd_s2idle
];
nixpkgs.overlays = [
(
@ -30,16 +30,28 @@
innerPackage = (final.callPackage ./package.nix { });
in
{
amd-debug-tools = innerPackage;
amd_s2idle = innerPackage;
# amd_s2idle = final.buildEnv {
# name = innerPackage.name;
# paths = [
# innerPackage
# ];
# nativeBuildInputs = [ final.makeWrapper ];
# postBuild = ''
# wrapProgram $out/bin/amd_s2idle --prefix PATH : ${
# lib.makeBinPath [
# (final.python3.withPackages (python-pkgs: [
# python-pkgs.distro # For https://gitlab.freedesktop.org/drm/amd/-/blob/master/scripts/amd_s2idle.py
# python-pkgs.pyudev # For https://gitlab.freedesktop.org/drm/amd/-/blob/master/scripts/amd_s2idle.py
# python-pkgs.systemd # For https://gitlab.freedesktop.org/drm/amd/-/blob/master/scripts/amd_s2idle.py
# python-pkgs.packaging # For https://gitlab.freedesktop.org/drm/amd/-/blob/master/scripts/amd_s2idle.py
# ]))
# ]
# }
# '';
# };
}
)
(final: prev: {
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
(python-final: python-prev: {
cysystemd = (python-final.callPackage ./cysystemd.nix { });
})
];
})
];
}
]

46
nix/configuration/roles/amd_s2idle/package.nix
View File

@ -1,28 +1,44 @@
# unpackPhase
# patchPhase
# configurePhase
# buildPhase
# checkPhase
# installPhase
# fixupPhase
# installCheckPhase
# distPhase
{
stdenv,
pkgs,
sqlite,
makeWrapper,
lib,
fetchgit,
python3Packages,
python3,
callPackage,
# python3Packages,
acpica-tools,
ethtool,
libdisplay-info,
...
}:
let
version = "0.2.7";
in
python3Packages.buildPythonApplication {
python3.pkgs.buildPythonApplication {
pname = "amd-debug-tools";
inherit version;
version = version;
pyproject = true;
build-system = with python3Packages; [
# name = "amd-debug-tools";
# format = "pyproject";
nativeBuildInputs = with python3.pkgs; [
setuptools
setuptools-git-versioning
setuptools-git
pyudev
];
dependencies = with python3Packages; [
cysystemd
propagatedBuildInputs = with python3.pkgs; [
(callPackage ./cysystemd.nix { })
jinja2
matplotlib
pandas
@ -33,26 +49,22 @@ python3Packages.buildPythonApplication {
ethtool
libdisplay-info
];
src = fetchgit {
src = pkgs.fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/superm1/amd-debug-tools.git";
tag = version;
hash = "sha256-6X9cUKN0BkkKcYGU+YJYCGT+l5iUZDN+D8Fqq/ns98Q=";
sha256 = "sha256-6X9cUKN0BkkKcYGU+YJYCGT+l5iUZDN+D8Fqq/ns98Q=";
leaveDotGit = true;
};
disabled = python3Packages.pythonOlder "3.7";
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail ', "setuptools-git-versioning>=2.0,<3"' ""
'';
pythonImportsCheck = [ "amd_debug" ];
meta = {
meta = with lib; {
description = "Debug tools for AMD zen systems";
homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/superm1/amd-debug-tools.git/";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
license = licenses.mit;
platforms = platforms.linux;
};
}

14
nix/configuration/roles/network/default.nix
View File

@ -94,12 +94,12 @@
# "net.ipv6.conf.default.use_tempaddr" = 2;
};
# nixpkgs.overlays = [
# (final: prev: {
# inherit (pkgs-dda3dcd3f)
# linux-firmware
# ;
# })
# ];
nixpkgs.overlays = [
(final: prev: {
inherit (pkgs-dda3dcd3f)
linux-firmware
;
})
];
}

28
nix/configuration/roles/optimized_build/default.nix
View File

@ -47,7 +47,7 @@
(lib.mkIf (!config.me.optimizations.enable) (
lib.mkMerge [
{
boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_16;
boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_15;
}
]
))
@ -94,7 +94,7 @@
HZ = lib.kernel.freeform "300";
HZ_300 = lib.kernel.yes;
HZ_1000 = lib.kernel.no;
} prev.linux_6_16;
} prev.linux_6_15;
}
)
(final: prev: {
@ -126,29 +126,6 @@
}
);
})
# (final: prev: {
# python = prev.python.override {
# packageOverrides = python-final: python-prev: {
# inherit (pkgs-unoptimized.pythonPackages) coverage;
# };
# };
# })
# (final: prev: {
# pythonPackagesOverlays = prev.pythonPackagesOverlays.extend (
# final': prev': {
# inherit (pkgs-unoptimized.pythonPackagesOverlays)
# coverage
# ;
# }
# );
# })
# (final: prev: {
# pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
# (python-final: python-prev: {
# inherit (pkgs-unoptimized.pythonPackages) coverage;
# })
# ];
# })
(final: prev: {
inherit (pkgs-unoptimized)
gsl
@ -156,7 +133,6 @@
valkey
nix-serve-ng
rapidjson
assimp
;
})
];