bartvdbraak/dotfiles
1
0
Fork 0
mirror of https://github.com/bartvdbraak/dotfiles.git synced 2025-10-30 15:19:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: bartvdbraak:e12b42e3d4b007f2d228f5b8e54e9fdc4ec80279
Branches Tags
bartvdbraak:main
bartvdbraak:kairpods
bartvdbraak:gentoo
bartvdbraak:bigrefactor
..
compare: bartvdbraak:c178e695f4975c6c00e07e0ede305115b2e7c072
Branches Tags
bartvdbraak:main
bartvdbraak:kairpods
bartvdbraak:gentoo
bartvdbraak:bigrefactor

1 commit
e12b42e3d4 ... c178e695f4

Author SHA1 Message Date
Bart van der Braak
c178e695f4
Merge f87cbd8ad9 into 5ac124b389 2025-01-21 01:45:20 +01:00
4 changed files with 101 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

22
nixos/flake.lock generated
View file

@ -2,14 +2,18 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 0, "lastModified": 1736883708,
"narHash": "sha256-vH5mXxEvZeoGNkqKoCluhTGfoeXCZ1seYhC2pbMN0sg=", "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
"path": "/nix/store/zd5dgszslv09jzybcpf25gpl12s6r2d9-source", "owner": "NixOS",
"type": "path" "repo": "nixpkgs",
"rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
"type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"type": "indirect" "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
@ -39,11 +43,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1737404254, "lastModified": 1736997529,
"narHash": "sha256-L8Lxp/WVdy9gKO2cXptphdP8cMsnGvZF5Noj8N3jLzI=", "narHash": "sha256-eyZXz3aphVJ8mMZ5KivtnYS+5vhNxVjWGlBJM0DMqlE=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "f8ef9c97ac2f49d5c04dbf3b3d80a0490c05fefb", "rev": "96be5663cc2ef52e8815c90f7abf3363be3950c2",
"type": "github" "type": "github"
}, },
"original": { "original": {

173
nixos/flake.nix
View file

@ -2,13 +2,14 @@
description = "Bart's NixOS Configuration"; description = "Bart's NixOS Configuration";
inputs = { inputs = {
zen-browser.url = "github:0xc000022070/zen-browser-flake"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
zen-browser.url = "github:0xc000022070/zen-browser-flake";
}; };
outputs = { nixpkgs, ... } @ inputs: outputs = { nixpkgs, ... } @ inputs:
{ {
nixosConfigurations = { nixosConfigurations = {
tongfang = nixpkgs.lib.nixosSystem { default = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./hardware/tongfang.nix ./hardware/tongfang.nix
@ -19,93 +20,93 @@
]; ];
}; };
# tongfang = nixpkgs.lib.nixosSystem { tongfang = nixpkgs.lib.nixosSystem {
# specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
# modules = [ modules = [
# ./hardware/tongfang.nix ./hardware/tongfang.nix
# ./modules/kde.nix ./modules/kde.nix
# ./modules/battery.nix ./modules/battery.nix
# ./modules/bluetooth.nix ./modules/bluetooth.nix
# ./modules/bootloader.nix ./modules/bootloader.nix
# ./modules/configuration.nix ./modules/configuration.nix
# ./modules/creative-tools.nix ./modules/creative-tools.nix
# ./modules/devops-tools.nix ./modules/devops-tools.nix
# ./modules/display-manager.nix ./modules/display-manager.nix
# ./modules/environment-variables.nix ./modules/environment-variables.nix
# ./modules/firewall.nix ./modules/firewall.nix
# ./modules/fonts.nix ./modules/fonts.nix
# ./modules/gc.nix ./modules/gc.nix
# ./modules/greeter.nix ./modules/greeter.nix
# ./modules/info-fetchers.nix ./modules/info-fetchers.nix
# ./modules/internationalisation.nix ./modules/internationalisation.nix
# ./modules/keyboard.nix ./modules/keyboard.nix
# ./modules/linux-kernel.nix ./modules/linux-kernel.nix
# ./modules/lsp.nix ./modules/lsp.nix
# ./modules/networking.nix ./modules/networking.nix
# ./modules/nix-settings.nix ./modules/nix-settings.nix
# ./modules/nixpkgs.nix ./modules/nixpkgs.nix
# ./modules/open-ssh.nix ./modules/open-ssh.nix
# ./modules/printing.nix ./modules/printing.nix
# ./modules/programming-languages.nix ./modules/programming-languages.nix
# ./modules/screen.nix ./modules/screen.nix
# ./modules/services.nix ./modules/services.nix
# ./modules/sound.nix ./modules/sound.nix
# ./modules/terminal-utils.nix ./modules/terminal-utils.nix
# ./modules/theme.nix ./modules/theme.nix
# ./modules/time.nix ./modules/time.nix
# ./modules/usb.nix ./modules/usb.nix
# ./modules/users.nix ./modules/users.nix
# ./modules/utils.nix ./modules/utils.nix
# ./modules/virtualisation.nix ./modules/virtualisation.nix
# ./modules/vpn.nix ./modules/vpn.nix
# ./modules/work.nix ./modules/work.nix
# ]; ];
# }; };
# qemu = nixpkgs.lib.nixosSystem { qemu = nixpkgs.lib.nixosSystem {
# specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
# modules = [ modules = [
# ./hardware/qemu.nix ./hardware/qemu.nix
# ./modules/kde.nix ./modules/kde.nix
# # ./modules/battery.nix # ./modules/battery.nix
# # ./modules/bluetooth.nix # ./modules/bluetooth.nix
# # ./modules/bootloader.nix # ./modules/bootloader.nix
# ./modules/configuration.nix ./modules/configuration.nix
# # ./modules/creative-tools.nix # ./modules/creative-tools.nix
# # ./modules/devops-tools.nix # ./modules/devops-tools.nix
# ./modules/display-manager.nix ./modules/display-manager.nix
# # ./modules/environment-variables.nix # ./modules/environment-variables.nix
# # ./modules/firewall.nix # ./modules/firewall.nix
# # ./modules/fonts.nix # ./modules/fonts.nix
# # ./modules/gc.nix # ./modules/gc.nix
# ./modules/greeter.nix ./modules/greeter.nix
# # ./modules/info-fetchers.nix # ./modules/info-fetchers.nix
# # ./modules/internationalisation.nix # ./modules/internationalisation.nix
# # ./modules/keyboard.nix # ./modules/keyboard.nix
# # ./modules/linux-kernel.nix # ./modules/linux-kernel.nix
# # ./modules/lsp.nix # ./modules/lsp.nix
# ./modules/networking.nix ./modules/networking.nix
# ./modules/nix-settings.nix ./modules/nix-settings.nix
# # ./modules/nixpkgs.nix # ./modules/nixpkgs.nix
# # ./modules/open-ssh.nix # ./modules/open-ssh.nix
# # ./modules/printing.nix # ./modules/printing.nix
# # ./modules/programming-languages.nix # ./modules/programming-languages.nix
# # ./modules/screen.nix # ./modules/screen.nix
# # ./modules/services.nix # ./modules/services.nix
# # ./modules/sound.nix # ./modules/sound.nix
# # ./modules/terminal-utils.nix # ./modules/terminal-utils.nix
# # ./modules/theme.nix # ./modules/theme.nix
# # ./modules/time.nix # ./modules/time.nix
# # ./modules/usb.nix # ./modules/usb.nix
# ./modules/users.nix ./modules/users.nix
# # ./modules/utils.nix # ./modules/utils.nix
# # ./modules/virtualisation.nix # ./modules/virtualisation.nix
# # ./modules/vpn.nix # ./modules/vpn.nix
# # ./modules/work.nix # ./modules/work.nix
# ]; ];
# }; };
}; };
}; };
} }

8
nixos/hardware/tongfang.nix
View file

@ -3,12 +3,6 @@
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
let
yt6801 = import ./yt6801.nix {
inherit (pkgs) stdenv lib fetchzip;
kernel = pkgs.linuxPackages.kernel;
};
in
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
@ -41,4 +35,4 @@ in
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

51
nixos/hardware/yt6801.nix
View file

@ -1,51 +0,0 @@
{
kernel,
stdenv,
lib,
fetchzip,
}:
stdenv.mkDerivation {
pname = "yt6801";
version = "1.0.29";
src = fetchzip {
url = "https://www.motor-comm.com/Public/Uploads/uploadfile/files/20240812/yt6801-linux-driver-1.0.29.zip";
sha256 = "sha256-oz6CeOUN6QWKXxe3WUZljhGDTFArsknjzBuQ4IchGeU=";
stripRoot = false;
};
nativeBuildInputs = kernel.moduleBuildDependencies;
preConfigure = "cd src";
configurePhase = "true";
buildFlags = [ "modules" ];
makeFlags =
[
"ARCH=${stdenv.hostPlatform.linuxArch}"
"KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
]
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
];
installPhase = ''
mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/ethernet/motorcomm
cp src/yt6801.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/ethernet/motorcomm/
'';
enableParallelBuilding = true;
meta = with lib; {
description = "Motorcomm yt6801 Network Interface Card driver";
homepage = "https://www.motor-comm.com/product/ethernet-control-chip";
license = with licenses; [
gpl2Plus
gpl2Only
];
platforms = platforms.linux;
};
}