Compare commits

..

No commits in common. "e191f9b38611114ea0e3b048cf297d285d339aab" and "5c03440098384346d6e6796255a6e69fca9f32a6" have entirely different histories.

4 changed files with 153 additions and 6 deletions

View File

@ -11,11 +11,8 @@ with pkgs;
{ {
# Kernel configuration # Kernel configuration
boot = { boot = {
kernelPackages = linuxPackages_zen; kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
blacklistedKernelModules = [ blacklistedKernelModules = [ "btusb" "bluetooth" ];
"btusb"
"bluetooth"
];
kernelParams = [ kernelParams = [
"zfs.zfs_arc_max=8589934592" "zfs.zfs_arc_max=8589934592"
"zfs.zfs_arc_min=1073741824" "zfs.zfs_arc_min=1073741824"

144
flake.lock generated
View File

@ -149,6 +149,27 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": [
"openconnect-sso",
"systems"
]
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -232,6 +253,27 @@
"type": "path" "type": "path"
} }
}, },
"nix-github-actions": {
"inputs": {
"nixpkgs": [
"openconnect-sso",
"nixpkgs"
]
},
"locked": {
"lastModified": 1720066371,
"narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "622f829f5fe69310a866c8a6cd07e747c44ef820",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nix-index-database": { "nix-index-database": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -298,6 +340,69 @@
"type": "github" "type": "github"
} }
}, },
"openconnect-sso": {
"inputs": {
"flake-utils": "flake-utils_2",
"nix-github-actions": "nix-github-actions",
"nixpkgs": [
"nixpkgs"
],
"poetry2nix": "poetry2nix",
"systems": "systems_3",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1724283233,
"narHash": "sha256-XMPn6YHwFOJCGLE9M5F3AEFKA0u+maf8CpIEWmvaQTQ=",
"owner": "ThinkChaos",
"repo": "openconnect-sso",
"rev": "94f1ddfef1662d56ede0a093bcfc3d23156bc1a1",
"type": "github"
},
"original": {
"owner": "ThinkChaos",
"ref": "fix/nix-flake",
"repo": "openconnect-sso",
"type": "github"
}
},
"poetry2nix": {
"inputs": {
"flake-utils": [
"openconnect-sso",
"flake-utils"
],
"nix-github-actions": [
"openconnect-sso",
"nix-github-actions"
],
"nixpkgs": [
"openconnect-sso",
"nixpkgs"
],
"systems": [
"openconnect-sso",
"systems"
],
"treefmt-nix": [
"openconnect-sso",
"treefmt-nix"
]
},
"locked": {
"lastModified": 1721039874,
"narHash": "sha256-XANsG9GYHip8pxZpbqKf/YGv8tIa0xTh289Y+WNBNfw=",
"owner": "nix-community",
"repo": "poetry2nix",
"rev": "d11c01e58587e5f21037ed6477465a7f26a32e27",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "poetry2nix",
"type": "github"
}
},
"pre-commit-hooks-nix": { "pre-commit-hooks-nix": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
@ -337,7 +442,8 @@
"local-bitwig": "local-bitwig", "local-bitwig": "local-bitwig",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"openconnect-sso": "openconnect-sso"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -394,6 +500,42 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"openconnect-sso",
"nixpkgs"
]
},
"locked": {
"lastModified": 1721769617,
"narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View File

@ -16,6 +16,10 @@
url = "github:ryantm/agenix"; url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
openconnect-sso = {
url = "github:ThinkChaos/openconnect-sso/fix/nix-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
cyrus-sasl-xoauth2 = { cyrus-sasl-xoauth2 = {
url = "github:robn/sasl2-oauth"; url = "github:robn/sasl2-oauth";
flake = false; flake = false;

View File

@ -80,6 +80,8 @@ in
libreoffice-fresh libreoffice-fresh
simple-scan simple-scan
bc bc
citrix_workspace
teams-for-linux
pdfgrep pdfgrep
# Mail stack # Mail stack
mu mu
@ -101,6 +103,8 @@ in
keyutils keyutils
# Overlays # Overlays
cachix cachix
# Networking
inputs.openconnect-sso.packages.${config.nixpkgs.localSystem.system}.default
# Budgeting # Budgeting
beancount beancount
beancount-language-server beancount-language-server