jahanson/nix-config-tn
Archived
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

chore: inital pre-commit tidy

Browse source
This commit is contained in:
truxnell 2024-03-18 08:04:32 +11:00
parent 837fdfed30
commit c807e69147
28 changed files with 360 additions and 304 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
flake.nix
View file

@ -17,12 +17,14 @@
url = "github:nix-community/nix-vscode-extensions";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, sops-nix, ... }@inputs:
with inputs;
{
outputs = {
self,
nixpkgs,
sops-nix,
...
} @ inputs:
with inputs; {
# Use nixpkgs-fmt for 'nix fmt'
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
@ -33,7 +35,6 @@
(x: {
name = x;
value = nixpkgs.lib.nixosSystem {
# Make inputs and the flake itself accessible as module parameters.
# Technically, adding the inputs is redundant as they can be also
# accessed with flake-self.inputs.X, but adding them individually

7
iso/iso.nix
View file

@ -1,5 +1,8 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
imports = [
<nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix>
@ -15,12 +18,10 @@
pkgs.vim
pkgs.git
pkgs.dnsutils
];
systemd.services.sshd.wantedBy = pkgs.lib.mkForce ["multi-user.target"];
users.users.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMZS9J1ydflZ4iJdJgO8+vnN8nNSlEwyn9tbWU9OcysW truxnell@home"
];
}

16
nixos/hosts/bootstrap/configuration.nix
View file

@ -1,15 +1,15 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }:
{
imports =
[
config,
lib,
pkgs,
...
}: {
imports = [
# Host-specific
./hardware-configuration.nix
];
boot.loader.systemd-boot.enable = true;
@ -63,7 +63,6 @@
];
};
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
@ -88,7 +87,6 @@
};
};
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
@ -139,6 +137,4 @@
#
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
system.stateVersion = "23.11"; # Did you read the comment?
}

14
nixos/hosts/common/nixos/default.nix
View file

@ -1,12 +1,20 @@
{ inputs, outputs, config, sops-nix, ... }: {
imports = [
{
inputs,
outputs,
config,
sops-nix,
...
}: {
imports =
[
# inputs.home-manager.nixosModules.home-manager
#inputs.sops-nix.nixosModules.sops
./locale.nix
./nix.nix
./openssh.nix
./packages.nix
] ++ (builtins.attrValues {});
]
++ (builtins.attrValues {});
# home-manager.extraSpecialArgs = { inherit inputs outputs; }; TODO Home-manager

5
nixos/hosts/common/nixos/nix.nix
View file

@ -1,5 +1,8 @@
{ inputs, lib, ... }:
{
inputs,
lib,
...
}: {
nix = {
settings = {
experimental-features = ["nix-command" "flakes"];

13
nixos/hosts/common/nixos/openssh.nix
View file

@ -1,11 +1,12 @@
{ outputs, lib, config, ... }:
let
{
outputs,
lib,
config,
...
}: let
inherit (config.networking) hostName;
hosts = outputs.nixosConfigurations;
in
{
in {
services.openssh = {
enable = true;
settings = {

17
nixos/hosts/common/nixos/packages.nix
View file

@ -1,5 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}: {
environment.systemPackages = with pkgs; [
bat
jq
@ -10,13 +14,14 @@
git
dnsutils
nvd
gh
# TODO Move
nixpkgs-fmt
nil
gh
sops
];
programs.direnv = {
# TODO move to home-manager
enable = true;
nix-direnv.enable = true;
};
programs.mtr.enable = true;
}

15
nixos/hosts/common/nixos/users/truxnell/default.nix
View file

@ -1,15 +1,20 @@
{ pkgs, config, ... }:
let ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
in
{
pkgs,
config,
...
}: let
ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
in {
users.users.truxnell = {
isNormalUser = true;
shell = pkgs.fish;
# passwordFile = config.sops.secrets.taylor-password.path;
# initialHashedPassword = ""; # TODO add key
extraGroups = [
extraGroups =
[
"wheel"
] ++ ifTheyExist [
]
++ ifTheyExist [
"network"
"samba-users"
];

7
nixos/hosts/common/optional/chrony.nix
View file

@ -1,4 +1,9 @@
{ inputs, outputs, config, ... }: {
{
inputs,
outputs,
config,
...
}: {
# Time
networking.timeServers = ["10.8.10.1"];
services.chrony = {

13
nixos/hosts/common/optional/cloudflare-dyndns.nix
View file

@ -1,5 +1,8 @@
{ config, lib, ... }: {
{
config,
lib,
...
}: {
# Current nixpkgs cf-ddns only supports using a env file for the apitoken
# but not for domains, which makes them hard to find.
# To circumvent this, I put both in the 'apiTokenFile' var
@ -15,7 +18,6 @@
# Restart when secret changes
config.sops.secrets."system/networking/cloudflare-dyndns/apiTokenFile".restartUnits = ["cloudflare-dyndns"];
# Cloudflare dynamic dns to keep my DNS records pointed at home
config.services.cloudflare-dyndns = {
enable = true;
@ -24,9 +26,4 @@
apiTokenFile = config.sops.secrets."system/networking/cloudflare-dyndns/apiTokenFile".path;
domains = [];
};
}

10
nixos/hosts/common/optional/dnscrypt-proxy2.nix
View file

@ -1,7 +1,11 @@
# Ref: https://nixos.wiki/wiki/Encrypted_DNS#dnscrypt-proxy2
{ inputs, outputs, pkgs, config, ... }: {
{
inputs,
outputs,
pkgs,
config,
...
}: {
# Disable resolvd to ensure it doesnt re-write /etc/resolv.conf
config.services.resolved.enable = false;

19
nixos/hosts/common/optional/editors/vscode/default.nix
View file

@ -1,16 +1,18 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}: {
# Enable vscode & addons
environment.systemPackages = with pkgs; [
(vscode-with-extensions.override {
vscode = vscodium;
vscodeExtensions = with vscode-extensions; [
vscodeExtensions = with vscode-extensions;
[
bbenoist.nix
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
]
++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
{
name = "prettier-vscode";
publisher = "esbenp";
@ -53,8 +55,6 @@
sha256 = "0pww9qndd2vsizsibjsvscz9fbfx8srrj67x4vhmwr581q674944";
}
{
name = "todo-tree";
publisher = "gruntfuggly";
@ -131,7 +131,6 @@
version = "0.0.3";
sha256 = "1d1c18mr91ll5fsp0l0aszyi7nx0ad352ssm0fm40z81m4dmzm0w";
}
];
})
];

9
nixos/hosts/common/optional/editors/vscode/extensions.nix
View file

@ -1,12 +1,7 @@
# Warning, this file is autogenerated by nix4vscode. Don't modify this manually.
{ pkgs }:
let
{pkgs}: let
vscode-utils = pkgs.vscode-utils;
in
{
in {
"ms-python"."python" = vscode-utils.extensionFromVscodeMarketplace {
name = "python";
publisher = "ms-python";

8
nixos/hosts/common/optional/firefox.nix
View file

@ -1,8 +1,10 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}: {
programs.firefox = {
enable = true;
};
}

15
nixos/hosts/common/optional/gnome.nix
View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}: {
# Ref: https://nixos.wiki/wiki/GNOME
# GNOME plz
@ -15,16 +18,17 @@
layout = "us"; # `localctl` will give you
};
# And dconf
programs.dconf.enable = true;
# dconf write /org/gnome/mutter/experimental-features "['scale-monitor-framebuffer']"
# Exclude default GNOME packages that dont interest me.
environment.gnome.excludePackages = (with pkgs; [
environment.gnome.excludePackages =
(with pkgs; [
gnome-photos
gnome-tour
]) ++ (with pkgs.gnome; [
])
++ (with pkgs.gnome; [
cheese # webcam tool
gnome-music
gnome-terminal
@ -39,5 +43,4 @@
hitori # sudoku game
atomix # puzzle game
]);
}

11
nixos/hosts/common/optional/maddy.nix
View file

@ -1,5 +1,9 @@
{ inputs, outputs, config, ... }: {
{
inputs,
outputs,
config,
...
}: {
# init secret
config.sops.secrets."system/mail/maddy/envFile" = {
sopsFile = ./maddy.sops.yaml;
@ -10,13 +14,10 @@
# Restart dnscrypt when secret changes
config.sops.secrets."system/mail/maddy/envFile".restartUnits = ["maddy"];
#
config.services.maddy = {
enable = true;
secrets = [config.sops.secrets."system/mail/maddy/envFile".path];
config = builtins.readFile ./maddy.conf;
};
}

8
nixos/hosts/common/optional/monitoring.nix
View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}: {
services.prometheus.exporters = {
node = {
enable = true;
@ -25,5 +28,4 @@
config.services.prometheus.exporters.node.port
config.services.prometheus.exporters.smartctl.port
];
}

8
nixos/hosts/common/optional/sops-nix.nix
View file

@ -1,7 +1,11 @@
{ inputs, outputs, config, ... }: {
{
inputs,
outputs,
config,
...
}: {
# SOPS settings
# https://github.com/Mic92/sops-nix
sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
}

19
nixos/hosts/nixosvm/default.nix
View file

@ -1,12 +1,13 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }:
{
imports =
[
config,
lib,
pkgs,
...
}: {
imports = [
# Host-specific
./hardware-configuration.nix
@ -23,8 +24,6 @@
../common/optional/sops-nix.nix
../common/optional/cloudflare-dyndns.nix
../common/optional/maddy.nix
];
boot.loader.systemd-boot.enable = true;
@ -51,9 +50,6 @@
# Enable the X11 windowing system.
# services.xserver.enable = true;
# Configure keymap in X11
# services.xserver.xkb.layout = "us";
# services.xserver.xkb.options = "eurosign:e,caps:escape";
@ -68,7 +64,6 @@
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
@ -107,6 +102,4 @@
#
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
system.stateVersion = "23.11"; # Did you read the comment?
}

19
nixos/hosts/nixosvm/hardware-configuration.nix
View file

@ -1,9 +1,13 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [];
boot.initrd.availableKernelModules = ["ata_piix" "mptspi" "uhci_hcd" "ehci_pci" "sd_mod" "sr_mod"];
@ -11,20 +15,17 @@
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [];
fileSystems."/" =
{
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
fsType = "ext4";
};
fileSystems."/boot" =
{
fileSystems."/boot" = {
device = "/dev/disk/by-label/boot";
fsType = "vfat";
};
swapDevices =
[{ device = "/dev/sda2"; }];
swapDevices = [{device = "/dev/sda2";}];
# 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
@ -37,6 +38,4 @@
virtualisation.vmware.guest.enable = true;
virtualisation.virtualbox.guest.enable = true;
virtualisation.virtualbox.guest.x11 = true;
}

6
nixos/hosts/playground/default.nix
View file

@ -1,6 +1,8 @@
{ config, lib, ... }:
{
config,
lib,
...
}: {
imports = [./playground.nix];
boot.isContainer = true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

11
nixos/hosts/playground/playground.nix
View file

@ -1,3 +1,8 @@
{ config, pkgs, lib, inputs, outputs, ... }:
{ }
{
config,
pkgs,
lib,
inputs,
outputs,
...
}: {}

3
nixos/overlays/default.nix
View file

@ -1,5 +1,4 @@
{ inputs, ... }:
{
{inputs, ...}: {
unstable-packages = final: _prev: {
unstable = import inputs.nixpkgs-unstable {
system = final.system;

26
shell.nix Normal file
View file

@ -0,0 +1,26 @@
# Shell for bootstrapping flake-enabled nix and other tooling
{
pkgs ?
# If pkgs is not defined, instanciate nixpkgs from locked commit
let
lock =
(builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked;
nixpkgs = fetchTarball {
url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz";
sha256 = lock.narHash;
};
in
import nixpkgs {overlays = [];},
...
}:
pkgs.mkShell {
NIX_CONFIG = "extra-experimental-features = nix-command flakes repl-flake";
nativeBuildInputs = with pkgs; [
nixpkgs-fmt
nil
sops
pre-commit
go-task
alejandra
];
}