erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:684d0d3adf9bcae547f682ceed8477aa81e9b72c
Branches Tags
erwin:main
...
compare: erwin:e75c8518b380a6de84f99e924b0636d9d60898b0
Branches Tags
erwin:main

3 commits
684d0d3adf ... e75c8518b3

Author SHA1 Message Date
Erwin Boskma
e75c8518b3
overlay: Remove python overrides 2024-11-06 09:42:35 +01:00
Erwin Boskma
b9811fc719
mimir: Switch to LTS kernel due to issues with NVIDIA on 6.11 2024-11-06 09:41:47 +01:00
Erwin Boskma
eabae23c26
flake.lock: Update 
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/3a071974344ba47573382596d91bd7a94beeac20?narHash=sha256-UJ1D89beMdNVdsOIvhMrQkjNQrxK3dJX2YVC6zWJUgw%3D' (2024-11-05)
  → 'github:nix-community/emacs-overlay/c626c28c864722e20b7e9b507ccb1ca48d4328af?narHash=sha256-XvZhPCECx8MVK3wgJ/EXAIclEkzyA4WIALOIeommFDE%3D' (2024-11-06)
• Updated input 'home-manager':
    'github:nix-community/home-manager/8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661?narHash=sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo%2BGYdmEPaYi1bZB6uf0%3D' (2024-11-03)
  → 'github:nix-community/home-manager/2f607e07f3ac7e53541120536708e824acccfaa8?narHash=sha256-0kZL4m%2BbKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc%3D' (2024-11-05)
• Updated input 'nixos-facter-modules':
    'github:numtide/nixos-facter-modules/c22b916f629fee6941a2976c62247b0bec68082b?narHash=sha256-PzJrTMhHb9f46uMxmRD4GjnyVuNqxeyEvxaq7OierUQ%3D' (2024-11-04)
  → 'github:numtide/nixos-facter-modules/d0e205eafca7091caad3925ff82a46fea08351e1?narHash=sha256-2KexAe17KRg2191SdBxVXqJKwV6MxKzlE35DDcAX%2BDs%3D' (2024-11-05)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/f6e0cd5c47d150c4718199084e5764f968f1b560?narHash=sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8%3D' (2024-11-02)
  → 'github:NixOS/nixos-hardware/12ad8c1bf13ff15ffa6afe82c59b4af0b9226035?narHash=sha256-VK7LkfdcpUi8tqcgMIYY2jejDh4O3MNw9An0FcKveRQ%3D' (2024-11-06)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/7ffd9ae656aec493492b44d0ddfb28e79a1ea25d?narHash=sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY%3D' (2024-11-02)
  → 'github:nixos/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7?narHash=sha256-Zwl8YgTVJTEum%2BL%2B0zVAWvXAGbWAuXHax3KzuejaDyo%3D' (2024-11-05)
• Updated input 'pre-commit-hooks':
    'github:cachix/git-hooks.nix/af8a16fe5c264f5e9e18bcee2859b40a656876cf?narHash=sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU%3D' (2024-10-30)
  → 'github:cachix/git-hooks.nix/d70155fdc00df4628446352fc58adc640cd705c2?narHash=sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF%2B06nOg%3D' (2024-11-05)
• Updated input 'pre-commit-hooks/nixpkgs-stable':
    'github:NixOS/nixpkgs/194846768975b7ad2c4988bdb82572c00222c0d7?narHash=sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo%3D' (2024-07-07)
  → 'github:NixOS/nixpkgs/d063c1dd113c91ab27959ba540c0d9753409edf3?narHash=sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo%3D' (2024-11-04)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/e19e9d54fac1e53f73411ebe22d19f946b1ba0bd?narHash=sha256-pULo7GryzLkqGveWvnNWVz1Kk6EJqvq%2BHQeSkwvr7DA%3D' (2024-11-05)
  → 'github:oxalica/rust-overlay/b8eb3aeb21629cbe14968a5e3b1cbaefb0d1b260?narHash=sha256-u0sfA4B65Q9cRO3xpIkQ4nldB8isfdIb3rWtsnRZ%2BIw%3D' (2024-11-06)
• Updated input 'sops':
    'github:Mic92/sops-nix/59d6988329626132eaf107761643f55eb979eef1?narHash=sha256-ZGmI%2B3AbT8NkDdBQujF%2BHIxZ%2BsWXuyT6X8B49etWY2g%3D' (2024-11-04)
  → 'github:Mic92/sops-nix/f21c31dadf0a486ee5a501779e505036fb1b1bcf?narHash=sha256-AO3xerwwEQ74s8TMeAfaOvHSvPI6FK4J5H%2BACkRZVGk%3D' (2024-11-06)
 2024-11-06 09:03:01 +01:00
3 changed files with 29 additions and 88 deletions
Show stats Expand all files Collapse all files

54
flake.lock
View file

@ -170,11 +170,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1730794820,
"narHash": "sha256-UJ1D89beMdNVdsOIvhMrQkjNQrxK3dJX2YVC6zWJUgw=",
"lastModified": 1730857873,
"narHash": "sha256-XvZhPCECx8MVK3wgJ/EXAIclEkzyA4WIALOIeommFDE=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "3a071974344ba47573382596d91bd7a94beeac20",
"rev": "c626c28c864722e20b7e9b507ccb1ca48d4328af",
"type": "github"
},
"original": {
@ -402,11 +402,11 @@
]
},
"locked": {
"lastModified": 1730633670,
"narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
"lastModified": 1730837930,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"type": "github"
},
"original": {
@ -487,11 +487,11 @@
},
"nixos-facter-modules": {
"locked": {
"lastModified": 1730737399,
"narHash": "sha256-PzJrTMhHb9f46uMxmRD4GjnyVuNqxeyEvxaq7OierUQ=",
"lastModified": 1730798058,
"narHash": "sha256-2KexAe17KRg2191SdBxVXqJKwV6MxKzlE35DDcAX+Ds=",
"owner": "numtide",
"repo": "nixos-facter-modules",
"rev": "c22b916f629fee6941a2976c62247b0bec68082b",
"rev": "d0e205eafca7091caad3925ff82a46fea08351e1",
"type": "github"
},
"original": {
@ -502,11 +502,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1730537918,
"narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=",
"lastModified": 1730874081,
"narHash": "sha256-VK7LkfdcpUi8tqcgMIYY2jejDh4O3MNw9An0FcKveRQ=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "f6e0cd5c47d150c4718199084e5764f968f1b560",
"rev": "12ad8c1bf13ff15ffa6afe82c59b4af0b9226035",
"type": "github"
},
"original": {
@ -517,11 +517,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1730531603,
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
"lastModified": 1730785428,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"type": "github"
},
"original": {
@ -561,11 +561,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1720386169,
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
"lastModified": 1730741070,
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
"type": "github"
},
"original": {
@ -629,11 +629,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1730302582,
"narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
"lastModified": 1730814269,
"narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
"rev": "d70155fdc00df4628446352fc58adc640cd705c2",
"type": "github"
},
"original": {
@ -675,11 +675,11 @@
]
},
"locked": {
"lastModified": 1730773675,
"narHash": "sha256-pULo7GryzLkqGveWvnNWVz1Kk6EJqvq+HQeSkwvr7DA=",
"lastModified": 1730860036,
"narHash": "sha256-u0sfA4B65Q9cRO3xpIkQ4nldB8isfdIb3rWtsnRZ+Iw=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "e19e9d54fac1e53f73411ebe22d19f946b1ba0bd",
"rev": "b8eb3aeb21629cbe14968a5e3b1cbaefb0d1b260",
"type": "github"
},
"original": {
@ -696,11 +696,11 @@
"nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1730746162,
"narHash": "sha256-ZGmI+3AbT8NkDdBQujF+HIxZ+sWXuyT6X8B49etWY2g=",
"lastModified": 1730872678,
"narHash": "sha256-AO3xerwwEQ74s8TMeAfaOvHSvPI6FK4J5H+ACkRZVGk=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "59d6988329626132eaf107761643f55eb979eef1",
"rev": "f21c31dadf0a486ee5a501779e505036fb1b1bcf",
"type": "github"
},
"original": {

2
machines/mimir/configuration.nix
View file

@ -156,7 +156,7 @@
};
# NVIDIA driver is broken with Linux 6.11
kernelPackages = pkgs.linuxPackages_6_10;
# kernelPackages = pkgs.linuxPackages_latest;
kernelModules = [
"kvm-amd"
"apple-mfi-fastcharge"

61
overlays/default.nix
View file

@ -1,4 +1,4 @@
final: prev: {
_final: prev: {
backscrub = prev.pkgs.callPackage ../pkgs/backscrub {
inherit (prev.pkgs)
gcc
@ -26,63 +26,4 @@ final: prev: {
mapshot = prev.pkgs.callPackage ../pkgs/mapshot { };
factorio = prev.factorio.override { versionsJson = ./factorio.json; };
python312 = prev.python312.override {
packageOverrides = _pyfinal: pyprev: {
pyscard = pyprev.pyscard.overrideAttrs (_old: {
version = "2.2.0";
src = final.fetchFromGitHub {
owner = "LudovicRousseau";
repo = "pyscard";
rev = "refs/tags/2.2.0";
hash = "sha256-yZeP4Tcxnwb2My+XOsMtj+H8mNIf6JYf5tpOVUYjev0=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'requires = ["setuptools","swig"]' 'requires = ["setuptools"]'
substituteInPlace setup.py --replace-fail "pkg-config" "$PKG_CONFIG"
substituteInPlace src/smartcard/scard/winscarddll.c \
--replace-fail "libpcsclite.so.1" \
"${final.lib.getLib final.pcsclite}/lib/libpcsclite${final.stdenv.hostPlatform.extensions.sharedLibrary}"
'';
preCheck = null;
disabledTests = [ ];
});
};
};
python312Packages = final.python312.pkgs;
python311 = prev.python311.override {
packageOverrides = _pyfinal: pyprev: {
pyscard = pyprev.pyscard.overrideAttrs (_old: {
version = "2.2.0";
src = final.fetchFromGitHub {
owner = "LudovicRousseau";
repo = "pyscard";
rev = "refs/tags/2.2.0";
hash = "sha256-yZeP4Tcxnwb2My+XOsMtj+H8mNIf6JYf5tpOVUYjev0=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'requires = ["setuptools","swig"]' 'requires = ["setuptools"]'
substituteInPlace setup.py --replace-fail "pkg-config" "$PKG_CONFIG"
substituteInPlace src/smartcard/scard/winscarddll.c \
--replace-fail "libpcsclite.so.1" \
"${final.lib.getLib final.pcsclite}/lib/libpcsclite${final.stdenv.hostPlatform.extensions.sharedLibrary}"
'';
preCheck = null;
disabledTests = [ ];
});
};
};
python311Packages = final.python311.pkgs;
}