mirror of
https://github.com/RichieCahill/dotfiles.git
synced 2026-04-21 06:39:09 -04:00
Compare commits
9 Commits
feature/ad
...
feature/fi
| Author | SHA1 | Date | |
|---|---|---|---|
| 7b24ac3edb | |||
|
|
27565173d4 | ||
| 0c0ed92cb4 | |||
|
|
cc9996d6fa | ||
| 102f36eb1b | |||
| 9ec988729b | |||
| 4e3c25afb4 | |||
| 0d482aca4b | |||
|
|
c624781d84 |
@@ -22,7 +22,22 @@
|
||||
|
||||
boot = {
|
||||
tmp.useTmpfs = true;
|
||||
kernelPackages = lib.mkDefault pkgs.linuxPackages_6_12;
|
||||
kernelPackages = lib.mkDefault (
|
||||
pkgs.linuxPackages_6_12.extend (
|
||||
self: super: {
|
||||
kernel = super.kernel.override {
|
||||
argsOverride = {
|
||||
version = "6.12.52";
|
||||
modDirVersion = "6.12.52";
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.52.tar.xz";
|
||||
sha256 = "sha256-tIUM9nCgMscPOLcTon1iBGxfdHyvAoxfULGPmGBqnrE=";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
)
|
||||
);
|
||||
zfs.package = lib.mkDefault pkgs.zfs_2_3;
|
||||
};
|
||||
|
||||
|
||||
@@ -37,6 +37,8 @@
|
||||
TcpKeepAlive = "no";
|
||||
X11Forwarding = lib.mkDefault false;
|
||||
KexAlgorithms = [
|
||||
"sntrup761x25519-sha512@openssh.com"
|
||||
"mlkem768x25519-sha256"
|
||||
"curve25519-sha256@libssh.org"
|
||||
"diffie-hellman-group-exchange-sha256"
|
||||
];
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_6_16;
|
||||
zfs.package = pkgs.zfs_2_3;
|
||||
kernelPackages = pkgs.linuxPackages_6_17;
|
||||
zfs.package = pkgs.zfs_unstable;
|
||||
};
|
||||
|
||||
hardware.bluetooth = {
|
||||
|
||||
53
flake.lock
generated
53
flake.lock
generated
@@ -8,11 +8,11 @@
|
||||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"lastModified": 1760673822,
|
||||
"narHash": "sha256-h+liPhhMw1yYvkDGLHzQJQShQs+yLjNgjfAyZX+sRrM=",
|
||||
"lastModified": 1763697825,
|
||||
"narHash": "sha256-AgCCcVPOi1tuzuW5/StlwqBjRWSX62oL97qWuxrq5UA=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "5cca27f1bb30a26140d0cf60ab34daa45b4fa11f",
|
||||
"rev": "cefce78793603231be226fa77e7ad58e0e4899b8",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@@ -29,11 +29,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760662441,
|
||||
"narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=",
|
||||
"lastModified": 1763748372,
|
||||
"narHash": "sha256-AUc78Qv3sWir0hvbmfXoZ7Jzq9VVL97l+sP9Jgms+JU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "722792af097dff5790f1a66d271a47759f477755",
|
||||
"rev": "d10a9b16b2a3ee28433f3d1c603f4e9f1fecb8e1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -44,11 +44,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1760106635,
|
||||
"narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
|
||||
"lastModified": 1762847253,
|
||||
"narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
|
||||
"rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -60,11 +60,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1760524057,
|
||||
"narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
|
||||
"lastModified": 1763421233,
|
||||
"narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
|
||||
"rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -74,13 +74,29 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-linux-firmware-20251011": {
|
||||
"locked": {
|
||||
"lastModified": 1760099975,
|
||||
"narHash": "sha256-/fXH2TIVxVgmBbPouQNMsEPfUFB8Z9n6T9t40HMeC/k=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f9430900368d5a7346e30e6ecc7b26c9f7cc35cf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f9430900368d5a7346e30e6ecc7b26c9f7cc35cf",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1760751316,
|
||||
"narHash": "sha256-1296zQfPiLZNrLKzX1t+kunadeI/mH82hKze3voduEI=",
|
||||
"lastModified": 1763774007,
|
||||
"narHash": "sha256-PPeHfKA11P09kBkBD5pS3tIAFjnG5muHQnODQGTY87g=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d85429339c0bcf0428084fe1306c970aed364417",
|
||||
"rev": "8a7cf7e9e18384533d9ecd0bfbcf475ac1dc497e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -112,6 +128,7 @@
|
||||
"home-manager": "home-manager",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-linux-firmware-20251011": "nixpkgs-linux-firmware-20251011",
|
||||
"nixpkgs-master": "nixpkgs-master",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"sops-nix": "sops-nix",
|
||||
@@ -125,11 +142,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760393368,
|
||||
"narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=",
|
||||
"lastModified": 1763607916,
|
||||
"narHash": "sha256-VefBA1JWRXM929mBAFohFUtQJLUnEwZ2vmYUNkFnSjE=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437",
|
||||
"rev": "877bb495a6f8faf0d89fc10bd142c4b7ed2bcc0b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -19,6 +19,8 @@
|
||||
nixpkgs-master.url = "github:nixos/nixpkgs/master";
|
||||
systems.url = "github:nix-systems/default-linux";
|
||||
|
||||
nixpkgs-linux-firmware-20251011.url = "github:NixOS/nixpkgs/f9430900368d5a7346e30e6ecc7b26c9f7cc35cf";
|
||||
|
||||
nixos-hardware.url = "github:nixos/nixos-hardware/master";
|
||||
|
||||
home-manager = {
|
||||
@@ -82,6 +84,7 @@
|
||||
jeeves = lib.nixosSystem {
|
||||
modules = [
|
||||
./systems/jeeves
|
||||
./systems/jeeves/linux-firmware-20251011.nix
|
||||
];
|
||||
specialArgs = { inherit inputs outputs; };
|
||||
};
|
||||
|
||||
11
systems/jeeves/linux-firmware-20251011.nix
Normal file
11
systems/jeeves/linux-firmware-20251011.nix
Normal file
@@ -0,0 +1,11 @@
|
||||
{ inputs, ... }:
|
||||
|
||||
let
|
||||
linuxFirmwareOverlay = final: prev: {
|
||||
linux-firmware =
|
||||
inputs.nixpkgs-linux-firmware-20251011.legacyPackages.${final.system}.linux-firmware;
|
||||
};
|
||||
in
|
||||
{
|
||||
nixpkgs.overlays = [ linuxFirmwareOverlay ];
|
||||
}
|
||||
@@ -68,7 +68,7 @@ in
|
||||
jellyfin-apiclient-python
|
||||
psycopg2
|
||||
pymetno
|
||||
pyownet
|
||||
aio-ownet
|
||||
rokuecp
|
||||
uiprotect
|
||||
wakeonlan
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
enable = true;
|
||||
userEmail = "dov.kruger@gmail.com";
|
||||
userName = "Dov Kruger";
|
||||
extraConfig = {
|
||||
settings = {
|
||||
pull.rebase = true;
|
||||
color.ui = true;
|
||||
};
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
enable = true;
|
||||
userEmail = "DumbPuppy208@gmail.com";
|
||||
userName = "Elise Corvidae";
|
||||
extraConfig = {
|
||||
settings = {
|
||||
pull.rebase = true;
|
||||
color.ui = true;
|
||||
};
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
enable = true;
|
||||
userEmail = "matthew.michal11@gmail.com";
|
||||
userName = "Matthew Michal";
|
||||
extraConfig = {
|
||||
settings = {
|
||||
pull.rebase = true;
|
||||
color.ui = true;
|
||||
};
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
enable = true;
|
||||
userEmail = "mousikos112@gmail.com";
|
||||
userName = "megan";
|
||||
extraConfig = {
|
||||
settings = {
|
||||
pull.rebase = true;
|
||||
color.ui = true;
|
||||
};
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
enable = true;
|
||||
userEmail = "Richie@tmmworkshop.com";
|
||||
userName = "Richie Cahill";
|
||||
extraConfig = {
|
||||
settings = {
|
||||
pull.rebase = true;
|
||||
color.ui = true;
|
||||
};
|
||||
|
||||
@@ -88,5 +88,6 @@
|
||||
"redhat.telemetry.enabled": true,
|
||||
"gitlens.plusFeatures.enabled": false,
|
||||
// new
|
||||
"hediet.vscode-drawio.resizeImages": null
|
||||
"hediet.vscode-drawio.resizeImages": null,
|
||||
"hediet.vscode-drawio.appearance": "automatic"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user