Compare commits
6 Commits
b36fedacf7
...
f8ecef5850
Author | SHA1 | Date | |
---|---|---|---|
f8ecef5850 | |||
5c61f322dc | |||
38e422cf3e | |||
7b0c1fc10d | |||
d85b00971e | |||
1257eab6c4 |
@ -11,8 +11,11 @@ with pkgs;
|
|||||||
{
|
{
|
||||||
# Kernel configuration
|
# Kernel configuration
|
||||||
boot = {
|
boot = {
|
||||||
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
|
kernelPackages = linuxPackages_zen;
|
||||||
blacklistedKernelModules = [ "btusb" "bluetooth" ];
|
blacklistedKernelModules = [
|
||||||
|
"btusb"
|
||||||
|
"bluetooth"
|
||||||
|
];
|
||||||
kernelParams = [
|
kernelParams = [
|
||||||
"zfs.zfs_arc_max=8589934592"
|
"zfs.zfs_arc_max=8589934592"
|
||||||
"zfs.zfs_arc_min=1073741824"
|
"zfs.zfs_arc_min=1073741824"
|
||||||
|
162
flake.lock
generated
162
flake.lock
generated
@ -149,27 +149,6 @@
|
|||||||
"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": [
|
||||||
@ -253,27 +232,6 @@
|
|||||||
"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": [
|
||||||
@ -281,11 +239,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728263287,
|
"lastModified": 1731814505,
|
||||||
"narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=",
|
"narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259",
|
"rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -296,11 +254,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728269138,
|
"lastModified": 1731797098,
|
||||||
"narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=",
|
"narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b",
|
"rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -311,11 +269,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730785428,
|
"lastModified": 1731676054,
|
||||||
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
|
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
|
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -340,69 +298,6 @@
|
|||||||
"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": [
|
||||||
@ -442,8 +337,7 @@
|
|||||||
"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": {
|
||||||
@ -500,42 +394,6 @@
|
|||||||
"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",
|
||||||
|
24
flake.nix
24
flake.nix
@ -2,8 +2,7 @@
|
|||||||
description = "System configuration for panacea";
|
description = "System configuration for panacea";
|
||||||
|
|
||||||
nixConfig = {
|
nixConfig = {
|
||||||
extra-substituters =
|
extra-substituters = "https://cachix.cachix.org https://nix-community.cachix.org";
|
||||||
"https://cachix.cachix.org https://nix-community.cachix.org";
|
|
||||||
extra-trusted-public-keys = ''
|
extra-trusted-public-keys = ''
|
||||||
cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM=
|
cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM=
|
||||||
nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs='';
|
nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs='';
|
||||||
@ -16,10 +15,6 @@
|
|||||||
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;
|
||||||
@ -38,7 +33,8 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, ... }@inputs:
|
outputs =
|
||||||
|
{ self, nixpkgs, ... }@inputs:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
|
||||||
@ -47,16 +43,22 @@
|
|||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
overlays = [
|
overlays = [
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
emacs-vterm =
|
emacs-vterm = (
|
||||||
((pkgs.emacsPackagesFor pkgs.emacs29-pgtk).emacsWithPackages
|
(pkgs.emacsPackagesFor pkgs.emacs29-pgtk).emacsWithPackages (
|
||||||
(epkgs: with epkgs; [ vterm mu4e ]));
|
epkgs: with epkgs; [
|
||||||
|
vterm
|
||||||
|
mu4e
|
||||||
|
]
|
||||||
|
)
|
||||||
|
);
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
lib = nixpkgs.lib;
|
lib = nixpkgs.lib;
|
||||||
|
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
nixosConfigurations.panacea = lib.nixosSystem {
|
nixosConfigurations.panacea = lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
modules = [
|
modules = [
|
||||||
|
@ -5,9 +5,9 @@ let
|
|||||||
folder = ../cachix;
|
folder = ../cachix;
|
||||||
toImport = name: value: folder + ("/" + name);
|
toImport = name: value: folder + ("/" + name);
|
||||||
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
|
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
|
||||||
imports = lib.mapAttrsToList toImport
|
imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
|
||||||
(lib.filterAttrs filterCaches (builtins.readDir folder));
|
in
|
||||||
in {
|
{
|
||||||
inherit imports;
|
inherit imports;
|
||||||
nix.binaryCaches = [ "https://cache.nixos.org/" ];
|
nix.binaryCaches = [ "https://cache.nixos.org/" ];
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,9 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
# ZFS automatic snapshots
|
# ZFS automatic snapshots
|
||||||
@ -88,48 +93,4 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Automount external storage
|
|
||||||
systemd.mounts = [
|
|
||||||
# UGent Samba
|
|
||||||
{
|
|
||||||
what = "//files.ugent.be/akasroua/home";
|
|
||||||
type = "cifs";
|
|
||||||
where = "/ugent";
|
|
||||||
options =
|
|
||||||
"credentials=${config.age.secrets.samba-ugent.path},noperm,vers=3.11,sec=ntlmv2i,noserverino";
|
|
||||||
mountConfig = { TimeoutSec = "5"; };
|
|
||||||
}
|
|
||||||
];
|
|
||||||
systemd.automounts = [
|
|
||||||
# UGent Samba
|
|
||||||
{
|
|
||||||
where = "/ugent";
|
|
||||||
automountConfig = { TimeoutIdleSec = "5"; };
|
|
||||||
wantedBy = [ "default.target" ];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
# HACK Workaround to change the configuration of keyutils in order to get CIFS working
|
|
||||||
environment.etc."request-key.conf" = {
|
|
||||||
text = let
|
|
||||||
upcall = "${pkgs.cifs-utils}/bin/cifs.upcall";
|
|
||||||
keyctl = "${pkgs.keyutils}/bin/keyctl";
|
|
||||||
in ''
|
|
||||||
#OP TYPE DESCRIPTION CALLOUT_INFO PROGRAM
|
|
||||||
# -t is required for DFS share servers...
|
|
||||||
create cifs.spnego * * ${upcall} -t %k
|
|
||||||
create dns_resolver * * ${upcall} %k
|
|
||||||
# Everything below this point is essentially the default configuration,
|
|
||||||
# modified minimally to work under NixOS. Notably, it provides debug
|
|
||||||
# logging.
|
|
||||||
create user debug:* negate ${keyctl} negate %k 30 %S
|
|
||||||
create user debug:* rejected ${keyctl} reject %k 30 %c %S
|
|
||||||
create user debug:* expired ${keyctl} reject %k 30 %c %S
|
|
||||||
create user debug:* revoked ${keyctl} reject %k 30 %c %S
|
|
||||||
create user debug:loop:* * |${pkgs.coreutils}/bin/cat
|
|
||||||
create user debug:* * ${pkgs.keyutils}/share/keyutils/request-key-debug.sh %k %d %c %S
|
|
||||||
negate * * * ${keyctl} negate %k 30 %S
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,9 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
# Improve nix-shell and direnv integration
|
# Improve nix-shell and direnv integration
|
||||||
|
@ -1,56 +1,66 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" ];
|
boot.initrd.availableKernelModules = [
|
||||||
|
"nvme"
|
||||||
|
"xhci_pci"
|
||||||
|
"usbhid"
|
||||||
|
];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "syscea/stateful/root";
|
device = "syscea/stateful/root";
|
||||||
fsType = "zfs";
|
fsType = "zfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/nix" =
|
fileSystems."/nix" = {
|
||||||
{ device = "syscea/ephemeral/nix";
|
device = "syscea/ephemeral/nix";
|
||||||
fsType = "zfs";
|
fsType = "zfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/ugent" =
|
fileSystems."/ugent" = {
|
||||||
{ device = "systemd-1";
|
device = "systemd-1";
|
||||||
fsType = "autofs";
|
fsType = "autofs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/home/coolneng" =
|
fileSystems."/home/coolneng" = {
|
||||||
{ device = "syscea/stateful/home";
|
device = "syscea/stateful/home";
|
||||||
fsType = "zfs";
|
fsType = "zfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/tmp" =
|
fileSystems."/tmp" = {
|
||||||
{ device = "syscea/ephemeral/tmp";
|
device = "syscea/ephemeral/tmp";
|
||||||
fsType = "zfs";
|
fsType = "zfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/home/coolneng/Downloads" =
|
fileSystems."/home/coolneng/Downloads" = {
|
||||||
{ device = "syscea/stateful/home/downloads";
|
device = "syscea/stateful/home/downloads";
|
||||||
fsType = "zfs";
|
fsType = "zfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-uuid/C374-A2FD";
|
device = "/dev/disk/by-uuid/C374-A2FD";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices = [
|
||||||
[ { device = "/dev/disk/by-uuid/1231a42f-a71a-4c67-b4d8-7506c02a8328"; }
|
{ device = "/dev/disk/by-uuid/1231a42f-a71a-4c67-b4d8-7506c02a8328"; }
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
@ -1,4 +1,9 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
with pkgs;
|
with pkgs;
|
||||||
|
|
||||||
@ -6,13 +11,14 @@ let
|
|||||||
sender = "akasroua@disroot.org";
|
sender = "akasroua@disroot.org";
|
||||||
recipient = "akasroua+smart@disroot.org";
|
recipient = "akasroua+smart@disroot.org";
|
||||||
|
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
# Notify when a disk starts going haywire
|
# Notify when a disk starts going haywire
|
||||||
services.smartd = {
|
services.smartd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaults.monitored = "-H -f -t -C 197 -U 198 -d nvme";
|
defaults.monitored = "-H -f -t -C 197 -U 198 -d nvme";
|
||||||
autodetect = false;
|
autodetect = false;
|
||||||
devices = [{ device = "/dev/nvme0"; }];
|
devices = [ { device = "/dev/nvme0"; } ];
|
||||||
notifications.mail = {
|
notifications.mail = {
|
||||||
enable = true;
|
enable = true;
|
||||||
sender = sender;
|
sender = sender;
|
||||||
|
@ -1,8 +1,15 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
let wireguard_port = "1194";
|
let
|
||||||
|
wireguard_port = "1194";
|
||||||
|
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
# Set hostname, hostid and enable WiFi
|
# Set hostname, hostid and enable WiFi
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "panacea";
|
hostName = "panacea";
|
||||||
@ -77,11 +84,13 @@ in {
|
|||||||
PrivateKeyFile = config.age.secrets.wireguard.path;
|
PrivateKeyFile = config.age.secrets.wireguard.path;
|
||||||
FirewallMark = 34952;
|
FirewallMark = 34952;
|
||||||
};
|
};
|
||||||
wireguardPeers = [{
|
wireguardPeers = [
|
||||||
PublicKey = "GN8lqPBZYOulh6xD4GhkoEWI65HMMCpSxJSH5871YnU=";
|
{
|
||||||
AllowedIPs = [ "0.0.0.0/0" ];
|
PublicKey = "GN8lqPBZYOulh6xD4GhkoEWI65HMMCpSxJSH5871YnU=";
|
||||||
Endpoint = "coolneng.duckdns.org:1194";
|
AllowedIPs = [ "0.0.0.0/0" ];
|
||||||
}];
|
Endpoint = "coolneng.duckdns.org:1194";
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
systemd.network.networks."wg0" = {
|
systemd.network.networks."wg0" = {
|
||||||
matchConfig.Name = "wg0";
|
matchConfig.Name = "wg0";
|
||||||
@ -90,20 +99,22 @@ in {
|
|||||||
Address = "10.8.0.2/32";
|
Address = "10.8.0.2/32";
|
||||||
DNS = "10.8.0.1";
|
DNS = "10.8.0.1";
|
||||||
DNSDefaultRoute = true;
|
DNSDefaultRoute = true;
|
||||||
Domains = "~.";
|
|
||||||
MulticastDNS = "yes";
|
|
||||||
};
|
};
|
||||||
routingPolicyRules = [{
|
routingPolicyRules = [
|
||||||
FirewallMark = 34952;
|
{
|
||||||
InvertRule = true;
|
FirewallMark = 34952;
|
||||||
Table = 1000;
|
InvertRule = true;
|
||||||
Priority = 10;
|
Table = 1000;
|
||||||
}];
|
Priority = 10;
|
||||||
routes = [{
|
}
|
||||||
Gateway = "10.8.0.1";
|
];
|
||||||
GatewayOnLink = true;
|
routes = [
|
||||||
Table = 1000;
|
{
|
||||||
}];
|
Gateway = "10.8.0.1";
|
||||||
|
GatewayOnLink = true;
|
||||||
|
Table = 1000;
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Firewall configuration
|
# Firewall configuration
|
||||||
|
@ -1,14 +1,26 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
with pkgs;
|
with pkgs;
|
||||||
|
|
||||||
let isync-oauth2 = (isync.override { withCyrusSaslXoauth2 = true; });
|
let
|
||||||
|
isync-oauth2 = (isync.override { withCyrusSaslXoauth2 = true; });
|
||||||
|
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
# Upgrade Doom Emacs daily
|
# Upgrade Doom Emacs daily
|
||||||
systemd.user.services.doom-upgrade = {
|
systemd.user.services.doom-upgrade = {
|
||||||
description = "Upgrade Doom Emacs";
|
description = "Upgrade Doom Emacs";
|
||||||
path = [ bash emacs-vterm git coreutils ];
|
path = [
|
||||||
|
bash
|
||||||
|
emacs-vterm
|
||||||
|
git
|
||||||
|
coreutils
|
||||||
|
];
|
||||||
script = ''
|
script = ''
|
||||||
${pkgs.bash}/bin/bash -c "/home/coolneng/.emacs.d/bin/doom -! upgrade"
|
${pkgs.bash}/bin/bash -c "/home/coolneng/.emacs.d/bin/doom -! upgrade"
|
||||||
'';
|
'';
|
||||||
@ -20,7 +32,10 @@ in {
|
|||||||
# Upgrade Neovim plugins weekly
|
# Upgrade Neovim plugins weekly
|
||||||
systemd.user.services.vim-plug-upgrade = {
|
systemd.user.services.vim-plug-upgrade = {
|
||||||
description = "Upgrade Vim-Plug";
|
description = "Upgrade Vim-Plug";
|
||||||
path = [ git neovim ];
|
path = [
|
||||||
|
git
|
||||||
|
neovim
|
||||||
|
];
|
||||||
script = "${pkgs.neovim}/bin/nvim +PlugUpgrade +PlugUpdate +qa";
|
script = "${pkgs.neovim}/bin/nvim +PlugUpgrade +PlugUpdate +qa";
|
||||||
serviceConfig.Type = "oneshot";
|
serviceConfig.Type = "oneshot";
|
||||||
startAt = "Wed 18:00:00";
|
startAt = "Wed 18:00:00";
|
||||||
@ -30,7 +45,11 @@ in {
|
|||||||
# Push password-store changes to git daily
|
# Push password-store changes to git daily
|
||||||
systemd.user.services.password-store-push = {
|
systemd.user.services.password-store-push = {
|
||||||
description = "Push password-store changes to git";
|
description = "Push password-store changes to git";
|
||||||
path = [ pass-wayland git gitAndTools.pass-git-helper ];
|
path = [
|
||||||
|
pass-wayland
|
||||||
|
git
|
||||||
|
gitAndTools.pass-git-helper
|
||||||
|
];
|
||||||
script = "${pkgs.pass-wayland}/bin/pass git push";
|
script = "${pkgs.pass-wayland}/bin/pass git push";
|
||||||
serviceConfig.Type = "oneshot";
|
serviceConfig.Type = "oneshot";
|
||||||
startAt = "18:00:00";
|
startAt = "18:00:00";
|
||||||
@ -83,7 +102,14 @@ in {
|
|||||||
systemd.user.services.goimapnotify-disroot = {
|
systemd.user.services.goimapnotify-disroot = {
|
||||||
description = "Sync disroot mail using IMAP IDLE";
|
description = "Sync disroot mail using IMAP IDLE";
|
||||||
wantedBy = [ "default.target" ];
|
wantedBy = [ "default.target" ];
|
||||||
path = [ goimapnotify pass-wayland isync-oauth2 mu procps emacs-vterm ];
|
path = [
|
||||||
|
goimapnotify
|
||||||
|
pass-wayland
|
||||||
|
isync-oauth2
|
||||||
|
mu
|
||||||
|
procps
|
||||||
|
emacs-vterm
|
||||||
|
];
|
||||||
script = ''
|
script = ''
|
||||||
${pkgs.goimapnotify}/bin/goimapnotify -conf /home/coolneng/.config/goimapnotify/disroot.conf
|
${pkgs.goimapnotify}/bin/goimapnotify -conf /home/coolneng/.config/goimapnotify/disroot.conf
|
||||||
'';
|
'';
|
||||||
@ -100,8 +126,16 @@ in {
|
|||||||
systemd.user.services.periodic-mail-sync = {
|
systemd.user.services.periodic-mail-sync = {
|
||||||
description = "Run a mail sync operation periodically";
|
description = "Run a mail sync operation periodically";
|
||||||
wantedBy = [ "default.target" ];
|
wantedBy = [ "default.target" ];
|
||||||
path =
|
path = [
|
||||||
[ pass-wayland isync-oauth2 mu procps emacs-vterm python39 gnupg nix ];
|
pass-wayland
|
||||||
|
isync-oauth2
|
||||||
|
mu
|
||||||
|
procps
|
||||||
|
emacs-vterm
|
||||||
|
python39
|
||||||
|
gnupg
|
||||||
|
nix
|
||||||
|
];
|
||||||
script = ''
|
script = ''
|
||||||
/home/coolneng/.local/share/scripts/mail-sync -a
|
/home/coolneng/.local/share/scripts/mail-sync -a
|
||||||
'';
|
'';
|
||||||
@ -116,13 +150,20 @@ in {
|
|||||||
script = "chmod 751 /home/coolneng";
|
script = "chmod 751 /home/coolneng";
|
||||||
serviceConfig.Type = "oneshot";
|
serviceConfig.Type = "oneshot";
|
||||||
after = [ "home-coolneng.mount" ];
|
after = [ "home-coolneng.mount" ];
|
||||||
before = [ "mopidy.service" "mopidy-scan.service" ];
|
before = [
|
||||||
|
"mopidy.service"
|
||||||
|
"mopidy-scan.service"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Push panacea changes to git daily
|
# Push panacea changes to git daily
|
||||||
systemd.user.services.panacea-push = {
|
systemd.user.services.panacea-push = {
|
||||||
description = "Push panacea changes to git";
|
description = "Push panacea changes to git";
|
||||||
path = [ pass-wayland git gitAndTools.pass-git-helper ];
|
path = [
|
||||||
|
pass-wayland
|
||||||
|
git
|
||||||
|
gitAndTools.pass-git-helper
|
||||||
|
];
|
||||||
script = "${pkgs.git}/bin/git -C /home/coolneng/Projects/panacea push";
|
script = "${pkgs.git}/bin/git -C /home/coolneng/Projects/panacea push";
|
||||||
serviceConfig.Type = "oneshot";
|
serviceConfig.Type = "oneshot";
|
||||||
startAt = "14:00:00";
|
startAt = "14:00:00";
|
||||||
|
@ -1,4 +1,9 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
# Enable power-profiles-daemon
|
# Enable power-profiles-daemon
|
||||||
|
@ -1,10 +1,18 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
# Enable CUPS
|
# Enable CUPS
|
||||||
services.printing = {
|
services.printing = {
|
||||||
enable = true;
|
enable = true;
|
||||||
drivers = with pkgs; [ brgenml1cupswrapper hplip ];
|
drivers = with pkgs; [
|
||||||
|
brgenml1cupswrapper
|
||||||
|
hplip
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable SANE
|
# Enable SANE
|
||||||
|
@ -80,8 +80,6 @@ in
|
|||||||
libreoffice-fresh
|
libreoffice-fresh
|
||||||
simple-scan
|
simple-scan
|
||||||
bc
|
bc
|
||||||
citrix_workspace
|
|
||||||
teams-for-linux
|
|
||||||
pdfgrep
|
pdfgrep
|
||||||
# Mail stack
|
# Mail stack
|
||||||
mu
|
mu
|
||||||
@ -99,12 +97,8 @@ in
|
|||||||
zip
|
zip
|
||||||
unzip
|
unzip
|
||||||
unar
|
unar
|
||||||
cifs-utils
|
|
||||||
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
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
let
|
let
|
||||||
coolneng =
|
coolneng = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC57m1j/G6iQyi2EpU3nj3+df5Z4PL/XbiOmDcqA7ODg";
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC57m1j/G6iQyi2EpU3nj3+df5Z4PL/XbiOmDcqA7ODg";
|
in
|
||||||
in {
|
{
|
||||||
"wireguard.age".publicKeys = [ coolneng ];
|
"wireguard.age".publicKeys = [ coolneng ];
|
||||||
"syncthing.age".publicKeys = [ coolneng ];
|
"syncthing.age".publicKeys = [ coolneng ];
|
||||||
"samba-ugent.age".publicKeys = [ coolneng ];
|
"samba-ugent.age".publicKeys = [ coolneng ];
|
||||||
|
Loading…
Reference in New Issue
Block a user