feat: alejandra -> nixfmt
This commit is contained in:
parent
acc6e6e825
commit
65ce9c5882
56 changed files with 737 additions and 456 deletions
|
@ -1,4 +1,5 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./common.nix
|
||||
|
||||
|
@ -7,7 +8,7 @@
|
|||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
(ffmpeg-full.override {withUnfree = true;})
|
||||
(ffmpeg-full.override { withUnfree = true; })
|
||||
fastfetch
|
||||
lazygit
|
||||
nixd
|
||||
|
@ -15,8 +16,8 @@
|
|||
|
||||
hm.programs.keychain = {
|
||||
enable = true;
|
||||
agents = ["ssh"];
|
||||
keys = ["id_ed25519"];
|
||||
agents = [ "ssh" ];
|
||||
keys = [ "id_ed25519" ];
|
||||
};
|
||||
|
||||
networking = {
|
||||
|
@ -24,7 +25,7 @@
|
|||
networkmanager = {
|
||||
enable = true;
|
||||
dns = "systemd-resolved";
|
||||
plugins = [pkgs.networkmanager-fortisslvpn];
|
||||
plugins = [ pkgs.networkmanager-fortisslvpn ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -10,20 +10,25 @@
|
|||
vencord,
|
||||
hydro,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
username = "leo";
|
||||
stateVersion = "24.11";
|
||||
|
||||
rootPassword = _utils.setupSingleSecret config "rootPassword" {};
|
||||
rootPassword = _utils.setupSingleSecret config "rootPassword" { };
|
||||
secrets = _utils.setupSharedSecrets config {
|
||||
secrets = ["userPassword" "tailscaleKey"];
|
||||
secrets = [
|
||||
"userPassword"
|
||||
"tailscaleKey"
|
||||
];
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
agenix.nixosModules.default
|
||||
home-manager.nixosModules.home-manager
|
||||
|
||||
(lib.mkAliasOptionModule ["hm"] ["home-manager" "users" username])
|
||||
(lib.mkAliasOptionModule [ "hm" ] [ "home-manager" "users" username ])
|
||||
|
||||
rootPassword.generate
|
||||
secrets.generate
|
||||
|
@ -35,12 +40,15 @@ in {
|
|||
|
||||
age = {
|
||||
ageBin = lib.getExe pkgs.rage;
|
||||
identityPaths = ["/etc/age/key"];
|
||||
identityPaths = [ "/etc/age/key" ];
|
||||
};
|
||||
|
||||
boot = {
|
||||
kernelPackages = lib.mkDefault pkgs.linuxPackages; # use lts
|
||||
kernelParams = ["quiet" "loglevel=3"];
|
||||
kernelParams = [
|
||||
"quiet"
|
||||
"loglevel=3"
|
||||
];
|
||||
|
||||
# faster tcp !!!
|
||||
kernel.sysctl = {
|
||||
|
@ -65,7 +73,7 @@ in {
|
|||
];
|
||||
|
||||
hm = {
|
||||
home = {inherit stateVersion;};
|
||||
home = { inherit stateVersion; };
|
||||
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
|
@ -83,14 +91,17 @@ in {
|
|||
|
||||
networking = {
|
||||
useNetworkd = lib.mkDefault true;
|
||||
nameservers = ["1.1.1.1" "1.0.0.1"];
|
||||
nameservers = [
|
||||
"1.1.1.1"
|
||||
"1.0.0.1"
|
||||
];
|
||||
};
|
||||
|
||||
nix = {
|
||||
# package = pkgs.nixVersions.latest;
|
||||
channel.enable = false;
|
||||
# The `flake:` syntax in `$NIX_PATH` seems to do some weird copying on Nix 2.24
|
||||
nixPath = ["nixpkgs=${config.nixpkgs.flake.source}"];
|
||||
nixPath = [ "nixpkgs=${config.nixpkgs.flake.source}" ];
|
||||
|
||||
gc = {
|
||||
automatic = true;
|
||||
|
@ -110,8 +121,14 @@ in {
|
|||
|
||||
settings = {
|
||||
auto-optimise-store = true;
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
trusted-users = ["root" "@wheel"];
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
trusted-users = [
|
||||
"root"
|
||||
"@wheel"
|
||||
];
|
||||
connect-timeout = 5; # fail fast if substituters are not available
|
||||
builders-use-substitutes = true;
|
||||
log-lines = 25;
|
||||
|
@ -132,7 +149,7 @@ in {
|
|||
nixpkgs = {
|
||||
config.allowUnfree = true;
|
||||
flake.setNixPath = false;
|
||||
overlays = [(import ../exprs/overlay.nix {inherit vencord hydro;})];
|
||||
overlays = [ (import ../exprs/overlay.nix { inherit vencord hydro; }) ];
|
||||
};
|
||||
|
||||
programs = {
|
||||
|
@ -172,7 +189,10 @@ in {
|
|||
tailscale = {
|
||||
enable = true;
|
||||
useRoutingFeatures = "both";
|
||||
extraUpFlags = ["--ssh" "--stateful-filtering"];
|
||||
extraUpFlags = [
|
||||
"--ssh"
|
||||
"--stateful-filtering"
|
||||
];
|
||||
authKeyFile = secrets.get "tailscaleKey";
|
||||
};
|
||||
};
|
||||
|
@ -197,7 +217,14 @@ in {
|
|||
"${username}" = {
|
||||
isNormalUser = true;
|
||||
shell = pkgs.fish;
|
||||
extraGroups = ["networkmanager" "wheel" "video" "libvirtd" "input" "docker"];
|
||||
extraGroups = [
|
||||
"networkmanager"
|
||||
"wheel"
|
||||
"video"
|
||||
"libvirtd"
|
||||
"input"
|
||||
"docker"
|
||||
];
|
||||
hashedPasswordFile = secrets.get "userPassword";
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN+7+KfdOrhcnHayxvOENUeMx8rE4XEIV/AxMHiaNUP8"
|
||||
|
|
|
@ -5,7 +5,8 @@
|
|||
catppuccin,
|
||||
lanzaboote,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
catppuccin.nixosModules.catppuccin
|
||||
lanzaboote.nixosModules.lanzaboote
|
||||
|
@ -24,10 +25,10 @@
|
|||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
extraModulePackages = with config.boot.kernelPackages; [v4l2loopback];
|
||||
kernelModules = ["v4l2loopback"];
|
||||
extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
|
||||
kernelModules = [ "v4l2loopback" ];
|
||||
|
||||
supportedFilesystems = ["ntfs"];
|
||||
supportedFilesystems = [ "ntfs" ];
|
||||
|
||||
loader = {
|
||||
systemd-boot.enable = lib.mkForce false;
|
||||
|
@ -61,7 +62,7 @@
|
|||
];
|
||||
|
||||
fontconfig.defaultFonts = {
|
||||
emoji = ["Twitter Color Emoji"];
|
||||
emoji = [ "Twitter Color Emoji" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -91,7 +92,7 @@
|
|||
strawberry
|
||||
teams-for-linux
|
||||
thunderbird
|
||||
(vesktop.override {withSystemVencord = true;})
|
||||
(vesktop.override { withSystemVencord = true; })
|
||||
vscode
|
||||
|
||||
# libreoffice stuff
|
||||
|
|
|
@ -3,10 +3,11 @@
|
|||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
imports = [./desktop.nix];
|
||||
}:
|
||||
{
|
||||
imports = [ ./desktop.nix ];
|
||||
|
||||
boot.initrd.kernelModules = ["xe"];
|
||||
boot.initrd.kernelModules = [ "xe" ];
|
||||
|
||||
hardware = {
|
||||
bluetooth.enable = true;
|
||||
|
@ -18,7 +19,7 @@
|
|||
vpl-gpu-rt
|
||||
];
|
||||
|
||||
extraPackages32 = [pkgs.driversi686Linux.intel-media-driver];
|
||||
extraPackages32 = [ pkgs.driversi686Linux.intel-media-driver ];
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -30,7 +31,7 @@
|
|||
programs.light.enable = true;
|
||||
|
||||
# hyprland stuff
|
||||
services.blueman = lib.mkIf config.programs.hyprland.enable {enable = true;};
|
||||
services.blueman = lib.mkIf config.programs.hyprland.enable { enable = true; };
|
||||
hm.wayland.windowManager.hyprland.settings.exec-once = with pkgs; [
|
||||
"${lib.getExe networkmanagerapplet}"
|
||||
"${lib.getExe' blueman "blueman-applet"}"
|
||||
|
|
|
@ -2,11 +2,13 @@
|
|||
config,
|
||||
_utils,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
secrets = _utils.setupSharedSecrets config {
|
||||
secrets = ["vmAuthToken"];
|
||||
secrets = [ "vmAuthToken" ];
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./common.nix
|
||||
secrets.generate
|
||||
|
@ -21,7 +23,7 @@ in {
|
|||
};
|
||||
|
||||
services = {
|
||||
tailscale.extraUpFlags = ["--advertise-exit-node"];
|
||||
tailscale.extraUpFlags = [ "--advertise-exit-node" ];
|
||||
|
||||
openssh = {
|
||||
enable = true;
|
||||
|
@ -46,20 +48,22 @@ in {
|
|||
prometheus.exporters.node = {
|
||||
enable = true;
|
||||
port = 9091;
|
||||
enabledCollectors = ["systemd"];
|
||||
enabledCollectors = [ "systemd" ];
|
||||
};
|
||||
|
||||
vmagent = {
|
||||
enable = true;
|
||||
remoteWrite.url = "https://metrics.uku3lig.net/api/v1/write";
|
||||
extraArgs = ["-remoteWrite.bearerTokenFile=\${CREDENTIALS_DIRECTORY}/vm_auth_token"];
|
||||
extraArgs = [ "-remoteWrite.bearerTokenFile=\${CREDENTIALS_DIRECTORY}/vm_auth_token" ];
|
||||
prometheusConfig = {
|
||||
global.scrape_interval = "15s";
|
||||
|
||||
scrape_configs = [
|
||||
{
|
||||
job_name = "node";
|
||||
static_configs = [{targets = ["localhost:${builtins.toString config.services.prometheus.exporters.node.port}"];}];
|
||||
static_configs = [
|
||||
{ targets = [ "localhost:${builtins.toString config.services.prometheus.exporters.node.port}" ]; }
|
||||
];
|
||||
relabel_configs = [
|
||||
{
|
||||
target_label = "instance";
|
||||
|
@ -73,7 +77,7 @@ in {
|
|||
};
|
||||
|
||||
systemd = {
|
||||
services.vmagent.serviceConfig.LoadCredential = ["vm_auth_token:${secrets.get "vmAuthToken"}"];
|
||||
services.vmagent.serviceConfig.LoadCredential = [ "vm_auth_token:${secrets.get "vmAuthToken"}" ];
|
||||
|
||||
# For more detail, see:
|
||||
# https://0pointer.de/blog/projects/watchdog.html
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue