reformat all files using alejandra
This commit is contained in:
parent
d9543e17a4
commit
df4d72c06e
74 changed files with 1351 additions and 972 deletions
65
flake.nix
65
flake.nix
|
|
@ -1,10 +1,24 @@
|
|||
{
|
||||
description = "NixOS configuration with flakes";
|
||||
outputs = { self, flake-utils, flake-compat, home-manager
|
||||
, nixpkgs-nixos-unstable, nixpkgs-master, nixpkgs-stable, darwin
|
||||
, nixos-hardware, nur, sops, nil, helix, alejandra, nixpkgs-rust-analyzer
|
||||
, endless-sky, disko }@inputs:
|
||||
let
|
||||
outputs = {
|
||||
self,
|
||||
flake-utils,
|
||||
flake-compat,
|
||||
home-manager,
|
||||
nixpkgs-nixos-unstable,
|
||||
nixpkgs-master,
|
||||
nixpkgs-stable,
|
||||
darwin,
|
||||
nixos-hardware,
|
||||
nur,
|
||||
sops,
|
||||
nil,
|
||||
helix,
|
||||
alejandra,
|
||||
nixpkgs-rust-analyzer,
|
||||
endless-sky,
|
||||
disko,
|
||||
} @ inputs: let
|
||||
mkServer = pkgs: system: hostname:
|
||||
pkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
|
|
@ -14,15 +28,16 @@
|
|||
sops.nixosModules.sops
|
||||
disko.nixosModules.disko
|
||||
];
|
||||
specialArgs = { inherit inputs system; };
|
||||
specialArgs = {inherit inputs system;};
|
||||
};
|
||||
mkRaspi = pkgs: hostname:
|
||||
pkgs.lib.nixosSystem {
|
||||
system = "aarch64-linux";
|
||||
modules = [ (./. + "/nixos/boxes/${hostname}")
|
||||
modules = [
|
||||
(./. + "/nixos/boxes/${hostname}")
|
||||
sops.nixosModules.sops
|
||||
];
|
||||
specialArgs = { inherit inputs; };
|
||||
specialArgs = {inherit inputs;};
|
||||
};
|
||||
mkKiosk = pkgs: system: hostname:
|
||||
pkgs.lib.nixosSystem {
|
||||
|
|
@ -37,8 +52,7 @@
|
|||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.cyryl = {
|
||||
imports =
|
||||
[ ./nixos/home-manager ./nixos/home-manager/linux.nix ];
|
||||
imports = [./nixos/home-manager ./nixos/home-manager/linux.nix];
|
||||
_module.args.inputs = inputs;
|
||||
_module.args.system = system;
|
||||
};
|
||||
|
|
@ -48,11 +62,11 @@
|
|||
inherit inputs system;
|
||||
nixpkgs-nixos-stable-and-unfree = import nixpkgs-stable {
|
||||
inherit system;
|
||||
config = { allowUnfree = true; };
|
||||
config = {allowUnfree = true;};
|
||||
};
|
||||
nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {
|
||||
inherit system;
|
||||
config = { allowUnfree = true; };
|
||||
config = {allowUnfree = true;};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -70,8 +84,7 @@
|
|||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.cyryl = {
|
||||
imports =
|
||||
[ ./nixos/home-manager ./nixos/home-manager/linux.nix ];
|
||||
imports = [./nixos/home-manager ./nixos/home-manager/linux.nix];
|
||||
_module.args.inputs = inputs;
|
||||
_module.args.system = system;
|
||||
};
|
||||
|
|
@ -81,17 +94,18 @@
|
|||
inherit inputs system;
|
||||
nixpkgs-nixos-stable-and-unfree = import nixpkgs-stable {
|
||||
inherit system;
|
||||
config = { allowUnfree = true; };
|
||||
config = {allowUnfree = true;};
|
||||
};
|
||||
nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {
|
||||
inherit system;
|
||||
config = { allowUnfree = true; };
|
||||
config = {allowUnfree = true;};
|
||||
};
|
||||
};
|
||||
};
|
||||
mkShell = packageSet: system:
|
||||
let pkgs = packageSet.legacyPackages.${system};
|
||||
in pkgs.mkShell {
|
||||
mkShell = packageSet: system: let
|
||||
pkgs = packageSet.legacyPackages.${system};
|
||||
in
|
||||
pkgs.mkShell {
|
||||
packages = with pkgs; [
|
||||
inputs.alejandra.defaultPackage.${system}
|
||||
cacert
|
||||
|
|
@ -119,7 +133,7 @@
|
|||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.cyryl = {
|
||||
imports = [ ./nixos/home-manager ];
|
||||
imports = [./nixos/home-manager];
|
||||
_module.args.inputs = inputs;
|
||||
_module.args.system = system;
|
||||
};
|
||||
|
|
@ -132,18 +146,18 @@
|
|||
foryog = mkWorkstation nixpkgs-stable "x86_64-linux" "foryog";
|
||||
thinky = mkWorkstation nixpkgs-stable "x86_64-linux" "thinky";
|
||||
bolty = mkServer nixpkgs-stable "x86_64-linux" "bolty";
|
||||
vpsfree1 = mkServer nixpkgs-stable"x86_64-linux" "vpsfree1";
|
||||
vpsfree1 = mkServer nixpkgs-stable "x86_64-linux" "vpsfree1";
|
||||
mb1 = mkServer nixpkgs-stable "x86_64-linux" "mb1";
|
||||
homescreen = mkRaspi nixpkgs-stable "homescreen";
|
||||
|
||||
bootstrap = nixpkgs-stable.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
modules = [ (./. + "/nixos/boxes/bootstrap") sops.nixosModules.sops ];
|
||||
modules = [(./. + "/nixos/boxes/bootstrap") sops.nixosModules.sops];
|
||||
specialArgs = {
|
||||
inherit inputs system;
|
||||
nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {
|
||||
inherit system;
|
||||
config = { allowUnfree = true; };
|
||||
config = {allowUnfree = true;};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -156,8 +170,7 @@
|
|||
(import
|
||||
"${inputs.nixpkgs-stable}/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix")
|
||||
{
|
||||
environment.systemPackages =
|
||||
with nixpkgs-nixos-unstable.legacyPackages."aarch64-linux"; [
|
||||
environment.systemPackages = with nixpkgs-nixos-unstable.legacyPackages."aarch64-linux"; [
|
||||
neovim
|
||||
htop
|
||||
btop
|
||||
|
|
@ -189,7 +202,7 @@
|
|||
console.earlySetup = true;
|
||||
}
|
||||
];
|
||||
specialArgs = { inherit inputs; };
|
||||
specialArgs = {inherit inputs;};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{ config, pkgs, lib, ... }: {
|
||||
fileSystems."/".options = [ "noatime" "nodiratime" "discard" ];
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
fileSystems."/".options = ["noatime" "nodiratime" "discard"];
|
||||
|
||||
hardware.enableRedistributableFirmware = lib.mkDefault true;
|
||||
boot = {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,17 @@
|
|||
{ config, pkgs, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
boot = {
|
||||
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
|
||||
initrd.availableKernelModules =
|
||||
[ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_acpi" ];
|
||||
initrd.kernelModules = [ "dm-snapshot" ];
|
||||
kernelModules = [ "kvm-amd" ];
|
||||
extraModulePackages = [ ];
|
||||
initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_acpi"];
|
||||
initrd.kernelModules = ["dm-snapshot"];
|
||||
kernelModules = ["kvm-amd"];
|
||||
extraModulePackages = [];
|
||||
loader.systemd-boot.enable = true;
|
||||
loader.efi.canTouchEfiVariables = false;
|
||||
supportedFilesystems = [ "zfs" ];
|
||||
supportedFilesystems = ["zfs"];
|
||||
zfs.forceImportRoot = false;
|
||||
};
|
||||
|
||||
|
|
@ -16,9 +19,9 @@
|
|||
services.zfs.autoScrub.enable = true;
|
||||
services.zfs.trim.enable = true;
|
||||
|
||||
boot.kernelParams = [ "zfs.zfs_arc_max=8589934592" ];
|
||||
boot.kernelParams = ["zfs.zfs_arc_max=8589934592"];
|
||||
|
||||
boot.zfs.extraPools = [ "data" ];
|
||||
boot.zfs.extraPools = ["data"];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/28afab71-ff3d-4f1a-b7e4-2129572706dd";
|
||||
|
|
@ -30,7 +33,7 @@
|
|||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [];
|
||||
|
||||
nix.settings = {
|
||||
max-jobs = 8;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ config, pkgs, inputs, lib, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../cli.nix
|
||||
./bolty-boot.nix
|
||||
|
|
@ -15,7 +21,7 @@
|
|||
./tailscale-cert.nix
|
||||
./virtualisation.nix
|
||||
];
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
boot.binfmt.emulatedSystems = ["aarch64-linux"];
|
||||
programs.ccache.enable = true;
|
||||
networking.hostName = "bolty";
|
||||
networking.hostId = "f05dd3b4";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,14 @@
|
|||
{ config, pkgs, inputs, lib, system, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
system,
|
||||
...
|
||||
}: let
|
||||
unstable = inputs.nixpkgs-nixos-unstable;
|
||||
package = unstable.legacyPackages."${system}".gitea-actions-runner;
|
||||
in
|
||||
{
|
||||
in {
|
||||
sops.secrets."gitea-runner-token" = {
|
||||
sopsFile = ./gitea-runner-token.sops;
|
||||
format = "binary";
|
||||
|
|
@ -14,8 +19,8 @@ in
|
|||
daemon.settings = {
|
||||
};
|
||||
};
|
||||
disabledModules = [ "services/continuous-integration/gitea-actions-runner.nix" ];
|
||||
imports = [ "${unstable}/nixos/modules/services/continuous-integration/gitea-actions-runner.nix" ];
|
||||
disabledModules = ["services/continuous-integration/gitea-actions-runner.nix"];
|
||||
imports = ["${unstable}/nixos/modules/services/continuous-integration/gitea-actions-runner.nix"];
|
||||
|
||||
services.gitea-actions-runner = {
|
||||
inherit package;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,17 @@
|
|||
{ config, pkgs, inputs, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
fqdn = "bolty.raptor-carp.ts.net";
|
||||
port = 30001;
|
||||
path = "/data/grafana";
|
||||
certPath = "${path}/cert.pem";
|
||||
keyPath = "${path}/key.pem";
|
||||
in {
|
||||
networking.firewall.allowedTCPPorts = [ port ];
|
||||
networking.firewall.allowedTCPPorts = [port];
|
||||
|
||||
systemd.services.grafana-prep = {
|
||||
script = ''
|
||||
|
|
@ -19,15 +24,15 @@ in {
|
|||
Type = "oneshot";
|
||||
ReloadPropagatedFrom = "tailscale-cert.service";
|
||||
};
|
||||
before = [ "grafana.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
before = ["grafana.service"];
|
||||
wantedBy = ["multi-user.target"];
|
||||
after = [
|
||||
"network.target"
|
||||
"network-online.target"
|
||||
"tailscaled.service"
|
||||
"tailscale-cert.service"
|
||||
];
|
||||
wants = [ "tailscale-cert.service" ];
|
||||
wants = ["tailscale-cert.service"];
|
||||
};
|
||||
|
||||
systemd.services.grafana = {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,18 @@
|
|||
{ config, pkgs, inputs, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
port = 8123;
|
||||
path = "/data/nginx";
|
||||
certPath = "${path}/cert.pem";
|
||||
keyPath = "${path}/key.pem";
|
||||
in {
|
||||
imports = [ ../nginx.nix ./virtualisation.nix ];
|
||||
imports = [../nginx.nix ./virtualisation.nix];
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ port 1883 ];
|
||||
networking.firewall.allowedTCPPorts = [port 1883];
|
||||
services.mosquitto = {
|
||||
enable = true;
|
||||
listeners = [
|
||||
|
|
@ -18,8 +23,9 @@ in {
|
|||
settings = {
|
||||
allow_anonymous = true;
|
||||
};
|
||||
acl = [ "topic readwrite #" ];
|
||||
}];
|
||||
acl = ["topic readwrite #"];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
services.nginx = {
|
||||
|
|
@ -48,15 +54,14 @@ in {
|
|||
Type = "oneshot";
|
||||
ReloadPropagatedFrom = "tailscale-cert.service";
|
||||
};
|
||||
before = [ "nginx.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
before = ["nginx.service"];
|
||||
wantedBy = ["multi-user.target"];
|
||||
after = [
|
||||
"network.target"
|
||||
"network-online.target"
|
||||
"tailscaled.service"
|
||||
"tailscale-cert.service"
|
||||
];
|
||||
wants = [ "tailscale-cert.service" ];
|
||||
wants = ["tailscale-cert.service"];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,2 +1,8 @@
|
|||
{ config, pkgs, inputs, lib, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,17 @@
|
|||
{ config, pkgs, inputs, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
fqdn = "bolty.raptor-carp.ts.net";
|
||||
port = 8086;
|
||||
path = "/data/influxdb";
|
||||
certPath = "${path}/cert.pem";
|
||||
keyPath = "${path}/key.pem";
|
||||
in {
|
||||
networking.firewall.allowedTCPPorts = [ port ];
|
||||
networking.firewall.allowedTCPPorts = [port];
|
||||
|
||||
systemd.services.influxdb2-prep = {
|
||||
script = ''
|
||||
|
|
@ -19,15 +24,15 @@ in {
|
|||
Type = "oneshot";
|
||||
ReloadPropagatedFrom = "tailscale-cert.service";
|
||||
};
|
||||
before = [ "influxdb2.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
before = ["influxdb2.service"];
|
||||
wantedBy = ["multi-user.target"];
|
||||
after = [
|
||||
"network.target"
|
||||
"network-online.target"
|
||||
"tailscaled.service"
|
||||
"tailscale-cert.service"
|
||||
];
|
||||
wants = [ "tailscale-cert.service" ];
|
||||
wants = ["tailscale-cert.service"];
|
||||
};
|
||||
|
||||
systemd.services.influxdb2 = {
|
||||
|
|
@ -48,5 +53,4 @@ in {
|
|||
tls-key = "${keyPath}";
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,11 @@
|
|||
{ config, pkgs, inputs, lib, ... }: {
|
||||
networking.firewall.allowedTCPPorts = [ 2049 ];
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
networking.firewall.allowedTCPPorts = [2049];
|
||||
services.nfs.server.enable = true;
|
||||
services.nfs.server.exports = ''
|
||||
/data/nfs 10.0.0.244/24(rw,sync,insecure,no_subtree_check,fsid=0) 100.81.212.51(rw,sync,insecure,no_subtree_check)
|
||||
|
|
@ -7,5 +13,4 @@
|
|||
/data/nfs/home_assistant/media 10.0.0.244/24(rw,sync,insecure,no_subtree_check) 100.81.212.51(rw,sync,insecure,no_subtree_check)
|
||||
/data/nfs/home_assistant/backups 10.0.0.244/24(rw,sync,insecure,no_subtree_check) 100.81.212.51(rw,sync,insecure,no_subtree_check)
|
||||
'';
|
||||
|
||||
}
|
||||
|
|
@ -1,4 +1,10 @@
|
|||
{ config, pkgs, inputs, lib, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
networking.hostName = "bolty";
|
||||
systemd.network.enable = true;
|
||||
networking.networkmanager.enable = false;
|
||||
|
|
@ -8,10 +14,10 @@
|
|||
};
|
||||
systemd.network.networks."br0" = {
|
||||
name = "br0";
|
||||
address = [ "10.0.0.8/24" ];
|
||||
gateway = [ "10.0.0.1" ];
|
||||
address = ["10.0.0.8/24"];
|
||||
gateway = ["10.0.0.1"];
|
||||
DHCP = "no";
|
||||
dns = [ "100.100.100.100" "9.9.9.9" ];
|
||||
dns = ["100.100.100.100" "9.9.9.9"];
|
||||
};
|
||||
|
||||
systemd.network.networks."eth" = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
{ config, pkgs, ... }: {
|
||||
nix.settings.trusted-users = [ "nix-ssh" ];
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
nix.settings.trusted-users = ["nix-ssh"];
|
||||
nix.sshServe = {
|
||||
enable = true;
|
||||
write = true;
|
||||
|
|
|
|||
|
|
@ -1,39 +1,45 @@
|
|||
{ config, pkgs, lib, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
networking.firewall.enable = true;
|
||||
networking.firewall.allowedTCPPorts = [ 631 6566 ];
|
||||
networking.firewall.allowedUDPPorts = [ 631 6566 ];
|
||||
networking.firewall.allowedTCPPorts = [631 6566];
|
||||
networking.firewall.allowedUDPPorts = [631 6566];
|
||||
services.printing = {
|
||||
enable = true;
|
||||
drivers = with pkgs; [ epson-escpr ];
|
||||
listenAddresses = [ "*:631" ];
|
||||
drivers = with pkgs; [epson-escpr];
|
||||
listenAddresses = ["*:631"];
|
||||
defaultShared = true;
|
||||
browsing = true;
|
||||
allowFrom = [ "all" ];
|
||||
allowFrom = ["all"];
|
||||
extraConf = ''
|
||||
ServerAlias *
|
||||
DefaultEncryption Never
|
||||
'';
|
||||
};
|
||||
|
||||
hardware.printers.ensurePrinters = [{
|
||||
hardware.printers.ensurePrinters = [
|
||||
{
|
||||
description = "Epson XP-540";
|
||||
location = "connected to bolty";
|
||||
name = "epson_xp540";
|
||||
deviceUri =
|
||||
"usb://EPSON/XP-540%20Series?serial=583245393030303936&interface=1";
|
||||
deviceUri = "usb://EPSON/XP-540%20Series?serial=583245393030303936&interface=1";
|
||||
model = "raw";
|
||||
ppdOptions = { PageSize = "A4"; };
|
||||
}];
|
||||
ppdOptions = {PageSize = "A4";};
|
||||
}
|
||||
];
|
||||
|
||||
hardware.sane = {
|
||||
enable = true;
|
||||
extraBackends = with pkgs; [ sane-airscan gawk ];
|
||||
extraBackends = with pkgs; [sane-airscan gawk];
|
||||
snapshot = true;
|
||||
};
|
||||
|
||||
services.udev.packages = [ ];
|
||||
services.udev.packages = [];
|
||||
|
||||
environment.systemPackages = with pkgs; [ gawk ];
|
||||
environment.systemPackages = with pkgs; [gawk];
|
||||
services.saned = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
|
|
|
|||
|
|
@ -1,34 +1,39 @@
|
|||
{ config, pkgs, inputs, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
fqdn = "bolty.raptor-carp.ts.net";
|
||||
basePath = "/var/lib/tailscale-certs";
|
||||
keyPath = "${basePath}/key.pem";
|
||||
certPath = "${basePath}/cert.pem";
|
||||
in {
|
||||
imports = [ ];
|
||||
imports = [];
|
||||
|
||||
systemd.services.tailscale-cert-make-path = {
|
||||
script = ''
|
||||
mkdir -p ${basePath}
|
||||
'';
|
||||
serviceConfig = { Type = "oneshot"; };
|
||||
before = [ "tailscale-cert.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {Type = "oneshot";};
|
||||
before = ["tailscale-cert.service"];
|
||||
wantedBy = ["multi-user.target"];
|
||||
};
|
||||
|
||||
systemd.services.tailscale-cert = {
|
||||
after = [ "network.target" "network-online.target" "tailscaled.service" ];
|
||||
wants = [ "tailscaled.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = ["network.target" "network-online.target" "tailscaled.service"];
|
||||
wants = ["tailscaled.service"];
|
||||
wantedBy = ["multi-user.target"];
|
||||
|
||||
path = with pkgs; [ tailscale ];
|
||||
path = with pkgs; [tailscale];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
UMask = 22;
|
||||
StateDirectoryMode = 750;
|
||||
ProtectSystem = "strict";
|
||||
ReadWritePaths = [ "${basePath}" ];
|
||||
ReadWritePaths = ["${basePath}"];
|
||||
PrivateTmp = true;
|
||||
WorkingDirectory = "${basePath}";
|
||||
NoNewPrivileges = true;
|
||||
|
|
@ -36,7 +41,7 @@ in {
|
|||
ProtectClock = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
StateDirectory = [ "${basePath}" ];
|
||||
StateDirectory = ["${basePath}"];
|
||||
};
|
||||
|
||||
script = ''
|
||||
|
|
@ -45,7 +50,7 @@ in {
|
|||
};
|
||||
|
||||
systemd.timers.tailscale-renew = {
|
||||
wantedBy = [ "timers.target" ];
|
||||
wantedBy = ["timers.target"];
|
||||
description = "Renew tailscale server cert";
|
||||
timerConfig = {
|
||||
OnCalendar = "weekly";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,16 @@
|
|||
{ config, pkgs, inputs, lib, ... }: {
|
||||
boot.kernelModules = [ "kvm_amd" ];
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
boot.kernelModules = ["kvm_amd"];
|
||||
virtualisation = {
|
||||
libvirtd = {
|
||||
enable = true;
|
||||
qemu.ovmf.enable = true;
|
||||
allowedBridges = [ "br0" ];
|
||||
allowedBridges = ["br0"];
|
||||
};
|
||||
};
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
|
@ -14,8 +20,7 @@
|
|||
virt-viewer
|
||||
lm_sensors
|
||||
];
|
||||
networking.firewall.allowedTCPPorts = [ 5900 ];
|
||||
networking.firewall.allowedTCPPorts = [5900];
|
||||
|
||||
security.allowUserNamespaces = true;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,5 +16,5 @@
|
|||
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
time.timeZone = "Europe/London";
|
||||
programs.zsh.enable=true;
|
||||
programs.zsh.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ config, pkgs, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
atop
|
||||
btop
|
||||
|
|
|
|||
|
|
@ -1,14 +1,21 @@
|
|||
{ config, pkgs, inputs, lib, nixpkgs-nixos-unstable-and-unfree, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
nixpkgs-nixos-unstable-and-unfree,
|
||||
...
|
||||
}: let
|
||||
system_cert_bundle_path = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
form3_cert_path = ./form3-palo-alto.pem;
|
||||
form3_cert_bundle = builtins.toFile "form3-cert-bundle.crt"
|
||||
form3_cert_bundle =
|
||||
builtins.toFile "form3-cert-bundle.crt"
|
||||
(builtins.readFile system_cert_bundle_path
|
||||
+ builtins.readFile form3_cert_path);
|
||||
in {
|
||||
environment.systemPackages = with pkgs; [ vim nixfmt ];
|
||||
environment.systemPackages = with pkgs; [vim nixfmt];
|
||||
|
||||
imports = [ ../../git ../../mercurial ];
|
||||
imports = [../../git ../../mercurial];
|
||||
services.nix-daemon.enable = true;
|
||||
nix = {
|
||||
useDaemon = true;
|
||||
|
|
@ -30,7 +37,7 @@ in {
|
|||
source-code-pro
|
||||
weather-icons
|
||||
];
|
||||
security.pki.certificateFiles = [ form3_cert_path system_cert_bundle_path ];
|
||||
security.pki.certificateFiles = [form3_cert_path system_cert_bundle_path];
|
||||
environment.variables = {
|
||||
SSL_CERT_FILE = form3_cert_bundle;
|
||||
NIX_SSL_CERT_FILE = form3_cert_bundle;
|
||||
|
|
@ -41,9 +48,9 @@ in {
|
|||
|
||||
system.stateVersion = 4;
|
||||
|
||||
home-manager.users.cyryl = { ... }: {
|
||||
imports = [ ];
|
||||
home.packages = with pkgs; [ awscli kubectl cargo-update ];
|
||||
home-manager.users.cyryl = {...}: {
|
||||
imports = [];
|
||||
home.packages = with pkgs; [awscli kubectl cargo-update];
|
||||
programs.git.userEmail = lib.mkForce "cyryl.plotnicki@form3.tech";
|
||||
programs.git.extraConfig = {
|
||||
user.signingkey = "6441B1BC81F8FB1561C9AFF5534222210FE423ED";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,16 @@
|
|||
{ config, lib, pkgs, inputs, ... }: {
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
boot = {
|
||||
kernelModules = [ "kvm-intel" ];
|
||||
kernelModules = ["kvm-intel"];
|
||||
|
||||
initrd = {
|
||||
kernelModules = [ "dm-snapshot" ];
|
||||
availableKernelModules =
|
||||
[ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
||||
kernelModules = ["dm-snapshot"];
|
||||
availableKernelModules = ["xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod"];
|
||||
};
|
||||
|
||||
loader.systemd-boot.enable = true;
|
||||
|
|
@ -13,9 +18,8 @@
|
|||
loader.efi.efiSysMountPoint = "/boot/efi";
|
||||
};
|
||||
|
||||
boot.initrd.secrets = { "/crypto_keyfile.bin" = null; };
|
||||
boot.initrd.luks.devices."luks-43a80125-4089-45be-9561-fab93f984916".device =
|
||||
"/dev/disk/by-uuid/43a80125-4089-45be-9561-fab93f984916";
|
||||
boot.initrd.secrets = {"/crypto_keyfile.bin" = null;};
|
||||
boot.initrd.luks.devices."luks-43a80125-4089-45be-9561-fab93f984916".device = "/dev/disk/by-uuid/43a80125-4089-45be-9561-fab93f984916";
|
||||
|
||||
fileSystems."/boot/efi" = {
|
||||
device = "/dev/disk/by-uuid/D6C0-1A9D";
|
||||
|
|
@ -25,8 +29,8 @@
|
|||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/98f3597c-183a-45fb-b2a4-b598c18d089a";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@" ];
|
||||
options = ["subvol=@"];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,11 @@
|
|||
{ config, pkgs, inputs, lib, nixpkgs-nixos-unstable-and-unfree, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
nixpkgs-nixos-unstable-and-unfree,
|
||||
...
|
||||
}: {
|
||||
networking.hostName = "foureighty";
|
||||
|
||||
imports = [
|
||||
|
|
@ -17,9 +24,9 @@
|
|||
../../sdr.nix
|
||||
];
|
||||
|
||||
fileSystems."/" = { options = [ "compress=zstd" ]; };
|
||||
fileSystems."/" = {options = ["compress=zstd"];};
|
||||
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
boot.binfmt.emulatedSystems = ["aarch64-linux"];
|
||||
boot.plymouth = {
|
||||
enable = true;
|
||||
logo = ./boot.png;
|
||||
|
|
@ -56,9 +63,9 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
services.fprintd = { enable = true; };
|
||||
services.fprintd = {enable = true;};
|
||||
programs.ccache.enable = true;
|
||||
hardware.opengl.extraPackages = with pkgs; [ libva ];
|
||||
hardware.opengl.extraPackages = with pkgs; [libva];
|
||||
programs.steam.enable = true;
|
||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
|
|
@ -71,15 +78,11 @@
|
|||
"vscode"
|
||||
];
|
||||
|
||||
home-manager.users.cyryl = { ... }: {
|
||||
imports =
|
||||
[ ../../home-manager/programs/alacritty.nix ../../gui/vscode.nix ];
|
||||
home.packages =
|
||||
with inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux";
|
||||
[ bisq-desktop ] ++
|
||||
|
||||
(with pkgs; [ lutris ])
|
||||
++ (with inputs.endless-sky.legacyPackages."x86_64-linux";
|
||||
[ endless-sky ]);
|
||||
home-manager.users.cyryl = {...}: {
|
||||
imports = [../../home-manager/programs/alacritty.nix ../../gui/vscode.nix];
|
||||
home.packages = with inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux";
|
||||
[bisq-desktop]
|
||||
++ (with pkgs; [lutris])
|
||||
++ (with inputs.endless-sky.legacyPackages."x86_64-linux"; [endless-sky]);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,19 @@
|
|||
{ config, pkgs, inputs, lib, ... }: {
|
||||
imports =
|
||||
[ inputs.nixos-hardware.nixosModules.raspberry-pi-4 ../../tailscale ];
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [inputs.nixos-hardware.nixosModules.raspberry-pi-4 ../../tailscale];
|
||||
|
||||
networking = {
|
||||
hostName = "homescreen";
|
||||
networkmanager = { enable = true; };
|
||||
networkmanager = {enable = true;};
|
||||
};
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [ neovim htop btop atop ];
|
||||
environment.systemPackages = with pkgs; [neovim htop btop atop];
|
||||
|
||||
services.fail2ban.enable = true;
|
||||
|
||||
|
|
@ -33,7 +38,7 @@
|
|||
|
||||
users = {
|
||||
mutableUsers = false;
|
||||
users.kiosk = { isNormalUser = true; };
|
||||
users.kiosk = {isNormalUser = true;};
|
||||
};
|
||||
users.extraUsers.root.openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEo4R+6J3h6Ix3xWpOMdU7Es1/YxFchHw0c+kcCOJxFb cyryl@foureighty"
|
||||
|
|
@ -42,12 +47,12 @@
|
|||
"/" = {
|
||||
device = "/dev/disk/by-label/NIXOS_SD";
|
||||
fsType = "ext4";
|
||||
options = [ "noatime" ];
|
||||
options = ["noatime"];
|
||||
};
|
||||
"/boot/firmware" = {
|
||||
device = "/dev/disk/by-label/FIRMWARE";
|
||||
fsType = "vfat";
|
||||
options = [ "nofail" "noauto" ];
|
||||
options = ["nofail" "noauto"];
|
||||
};
|
||||
};
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||
|
|
|
|||
|
|
@ -1,16 +1,22 @@
|
|||
{ config, pkgs, inputs, lib, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
"${inputs.nixpkgs-nixos-unstable}/nixos/modules/services/misc/atuin.nix"
|
||||
../nginx.nix
|
||||
];
|
||||
disabledModules = [ "services/misc/atuin.nix" ];
|
||||
disabledModules = ["services/misc/atuin.nix"];
|
||||
|
||||
services.nginx = {
|
||||
virtualHosts = {
|
||||
"atuin.cyplo.dev" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = { proxyPass = "http://127.0.0.1:8888"; };
|
||||
locations."/" = {proxyPass = "http://127.0.0.1:8888";};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
{ config, pkgs, ... }:
|
||||
let
|
||||
path = "/var/www/blog/";
|
||||
in
|
||||
{
|
||||
imports = [ ../nginx.nix ];
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
path = "/var/www/blog/";
|
||||
in {
|
||||
imports = [../nginx.nix];
|
||||
services.nginx = {
|
||||
virtualHosts = {
|
||||
"blog.cyplo.dev" = {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,15 @@
|
|||
{ config, pkgs, inputs, lib, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
boot.loader.grub = {
|
||||
devices = [ "/dev/vda" ];
|
||||
devices = ["/dev/vda"];
|
||||
efiSupport = true;
|
||||
efiInstallAsRemovable = true;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ config, pkgs, inputs, lib, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
"${inputs.nixpkgs-stable}/nixos/modules/profiles/qemu-guest.nix"
|
||||
../cli.nix
|
||||
|
|
@ -10,7 +16,6 @@
|
|||
];
|
||||
networking.hostName = "mb1";
|
||||
|
||||
|
||||
zramSwap = {
|
||||
enable = true;
|
||||
algorithm = "zstd";
|
||||
|
|
@ -18,5 +23,4 @@
|
|||
};
|
||||
|
||||
time.timeZone = "Europe/London";
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ _: {
|
|||
name = "boot";
|
||||
start = "0";
|
||||
end = "1M";
|
||||
flags = [ "bios_grub" ];
|
||||
flags = ["bios_grub"];
|
||||
}
|
||||
{
|
||||
name = "ESP";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,14 @@
|
|||
{ config, pkgs, ... }: {
|
||||
imports = [ ../nginx.nix ];
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [../nginx.nix];
|
||||
virtualisation.oci-containers.containers.searxng = {
|
||||
image =
|
||||
"searxng/searxng@sha256:650c0b183a129e10c2493126bb27c3541ffebbead6e0255fab91831457211b06";
|
||||
volumes = [ ];
|
||||
environment = { BASE_URL = "https://search.cyplo.dev"; };
|
||||
ports = [ "9999:8080" ];
|
||||
image = "searxng/searxng@sha256:650c0b183a129e10c2493126bb27c3541ffebbead6e0255fab91831457211b06";
|
||||
volumes = [];
|
||||
environment = {BASE_URL = "https://search.cyplo.dev";};
|
||||
ports = ["9999:8080"];
|
||||
};
|
||||
services.nginx = {
|
||||
virtualHosts = {
|
||||
|
|
@ -28,5 +31,4 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ config, pkgs, lib,... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
networking.hostName = "thinky";
|
||||
|
||||
imports = [
|
||||
|
|
@ -28,7 +33,7 @@
|
|||
builtins.elem (lib.getName pkg) [
|
||||
"spotify"
|
||||
];
|
||||
home-manager.users.cyryl = { ... }: {
|
||||
imports = [ ../../home-manager/programs/termite.nix ];
|
||||
home-manager.users.cyryl = {...}: {
|
||||
imports = [../../home-manager/programs/termite.nix];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,16 @@
|
|||
{ config, lib, pkgs, inputs, ... }: {
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
boot = {
|
||||
kernelModules = [ "kvm-intel" ];
|
||||
kernelModules = ["kvm-intel"];
|
||||
|
||||
initrd = {
|
||||
kernelModules = [ "dm-snapshot" ];
|
||||
availableKernelModules =
|
||||
[ "ata_generic" "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "sd_mod" ];
|
||||
kernelModules = ["dm-snapshot"];
|
||||
availableKernelModules = ["ata_generic" "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "sd_mod"];
|
||||
};
|
||||
|
||||
loader.grub.enable = true;
|
||||
|
|
@ -17,15 +22,14 @@
|
|||
fsType = "btrfs";
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."crypt".device =
|
||||
"/dev/disk/by-uuid/8d51b38a-5d90-4a7a-a86a-0d57648fd82d";
|
||||
boot.initrd.luks.devices."crypt".device = "/dev/disk/by-uuid/8d51b38a-5d90-4a7a-a86a-0d57648fd82d";
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/195b3f15-885e-4123-879f-6e4591a58317";
|
||||
fsType = "ext2";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [];
|
||||
|
||||
nix.settings = {
|
||||
max-jobs = 2;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
{ config, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
genericBackupPath = "/var/lib/backups/";
|
||||
containersBackupPath = "${genericBackupPath}/oci-containers/";
|
||||
in rec {
|
||||
environment.systemPackages = with pkgs; [ restic ];
|
||||
environment.systemPackages = with pkgs; [restic];
|
||||
|
||||
sops.secrets."restic-backups-b2-repo-password" = {
|
||||
sopsFile = ./restic.sops.yaml;
|
||||
|
|
@ -31,14 +34,13 @@ in rec {
|
|||
backupCleanupCommand = ''
|
||||
systemctl start container@mastodon.service
|
||||
'';
|
||||
timerConfig = { OnCalendar = "daily"; };
|
||||
environmentFile =
|
||||
"${config.sops.secrets.restic-backups-b2-environment.path}";
|
||||
timerConfig = {OnCalendar = "daily";};
|
||||
environmentFile = "${config.sops.secrets.restic-backups-b2-environment.path}";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.restic-backups-b2 = {
|
||||
environment = { GOMAXPROCS = "1"; };
|
||||
environment = {GOMAXPROCS = "1";};
|
||||
serviceConfig = {
|
||||
Nice = 19;
|
||||
IOSchedulingClass = "idle";
|
||||
|
|
|
|||
|
|
@ -1,12 +1,18 @@
|
|||
{ config, pkgs, inputs, lib, ... }: {
|
||||
imports = [ ../nginx.nix ];
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [../nginx.nix];
|
||||
|
||||
services.nginx = {
|
||||
virtualHosts = {
|
||||
"notes.purrfect.estate" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
serverAliases = [ "notes-sandbox.purrfect.estate" ];
|
||||
serverAliases = ["notes-sandbox.purrfect.estate"];
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:9005";
|
||||
proxyWebsockets = true;
|
||||
|
|
@ -15,8 +21,7 @@
|
|||
};
|
||||
};
|
||||
virtualisation.oci-containers.containers.cryptpad = {
|
||||
image =
|
||||
"promasu/cryptpad@sha256:29c61f69e41173188c0592e72f2273cf23a83f48e7d143337e2cd7fea441ed87";
|
||||
image = "promasu/cryptpad@sha256:29c61f69e41173188c0592e72f2273cf23a83f48e7d143337e2cd7fea441ed87";
|
||||
volumes = [
|
||||
"${./cryptpad.config.js}:/cryptpad/config/config.js"
|
||||
|
||||
|
|
@ -34,6 +39,6 @@
|
|||
CPAD_TRUSTED_PROXY = "0.0.0.0/0";
|
||||
CPAD_HTTP2_DISABLE = "true";
|
||||
};
|
||||
ports = [ "9005:80" ];
|
||||
ports = ["9005:80"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ config, pkgs, inputs, lib, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
networking.hostName = "vpsfree1";
|
||||
|
||||
imports = [
|
||||
|
|
@ -20,7 +26,7 @@
|
|||
DefaultTimeoutStartSec=900s
|
||||
'';
|
||||
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
boot.binfmt.emulatedSystems = ["aarch64-linux"];
|
||||
time.timeZone = "Europe/London";
|
||||
nix.settings.cores = 8;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,42 +1,52 @@
|
|||
{ config, pkgs, inputs, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
port = 8081;
|
||||
domain = "fossil.cyplo.dev";
|
||||
baseurl = "https://${domain}";
|
||||
path = "/var/lib/fossil";
|
||||
in {
|
||||
imports = [ ../nginx.nix ];
|
||||
imports = [../nginx.nix];
|
||||
|
||||
services.nginx = {
|
||||
virtualHosts = {
|
||||
"${domain}" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = { proxyPass = "http://localhost:" + toString port; };
|
||||
locations."/" = {proxyPass = "http://localhost:" + toString port;};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
containers.fossil = {
|
||||
autoStart = true;
|
||||
forwardPorts = [{
|
||||
forwardPorts = [
|
||||
{
|
||||
containerPort = port;
|
||||
hostPort = port;
|
||||
}];
|
||||
}
|
||||
];
|
||||
bindMounts = {
|
||||
"${path}" = {
|
||||
hostPath = "${path}";
|
||||
isReadOnly = false;
|
||||
};
|
||||
};
|
||||
config = { config, pkgs, ... }:
|
||||
let
|
||||
config = {
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
user = "fossil";
|
||||
group = "fossil";
|
||||
in {
|
||||
system.stateVersion = "23.05";
|
||||
environment.systemPackages = [ pkgs.fossil ];
|
||||
users.groups = { "${group}" = { }; };
|
||||
environment.systemPackages = [pkgs.fossil];
|
||||
users.groups = {"${group}" = {};};
|
||||
users.users = {
|
||||
fossil = {
|
||||
inherit group;
|
||||
|
|
@ -47,21 +57,25 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = [ "d '${path}' 0770 ${user} ${group} - -" ];
|
||||
systemd.tmpfiles.rules = ["d '${path}' 0770 ${user} ${group} - -"];
|
||||
systemd.services.fossil = {
|
||||
description = "fossil server";
|
||||
after = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = [ pkgs.fossil pkgs.git ];
|
||||
after = ["network-online.target"];
|
||||
wantedBy = ["multi-user.target"];
|
||||
path = [pkgs.fossil pkgs.git];
|
||||
|
||||
serviceConfig = {
|
||||
User = user;
|
||||
Group = group;
|
||||
WorkingDirectory = path;
|
||||
ReadWritePaths = [ path ];
|
||||
ExecStart = "${pkgs.fossil}/bin/fossil server" + " --localhost"
|
||||
+ " --https" + " --port ${toString port}"
|
||||
+ " --baseurl ${baseurl}" + " --repolist ${path}";
|
||||
ReadWritePaths = [path];
|
||||
ExecStart =
|
||||
"${pkgs.fossil}/bin/fossil server"
|
||||
+ " --localhost"
|
||||
+ " --https"
|
||||
+ " --port ${toString port}"
|
||||
+ " --baseurl ${baseurl}"
|
||||
+ " --repolist ${path}";
|
||||
Restart = "always";
|
||||
RestartSec = 3;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{ config, pkgs, inputs, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
foundryvtt = pkgs.fetchzip {
|
||||
name = "foundryvtt";
|
||||
url = "file:///" + ./FoundryVTT-11.306.zip;
|
||||
|
|
@ -8,7 +13,7 @@ let
|
|||
stripRoot = false;
|
||||
};
|
||||
in {
|
||||
imports = [ ../nginx.nix ];
|
||||
imports = [../nginx.nix];
|
||||
|
||||
services.nginx = {
|
||||
clientMaxBodySize = "300M";
|
||||
|
|
@ -26,21 +31,27 @@ in {
|
|||
|
||||
containers.foundryvtt = {
|
||||
autoStart = true;
|
||||
forwardPorts = [{
|
||||
forwardPorts = [
|
||||
{
|
||||
containerPort = 30000;
|
||||
hostPort = 30000;
|
||||
}];
|
||||
}
|
||||
];
|
||||
bindMounts = {
|
||||
"/var/lib/foundryvtt" = {
|
||||
hostPath = "/var/lib/foundryvtt";
|
||||
isReadOnly = false;
|
||||
};
|
||||
};
|
||||
config = { config, pkgs, ... }: {
|
||||
config = {
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
system.stateVersion = "23.05";
|
||||
systemd.services."foundryvtt" = {
|
||||
requires = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
requires = ["network-online.target"];
|
||||
wantedBy = ["multi-user.target"];
|
||||
script = ''
|
||||
mkdir -p /var/lib/foundryvtt
|
||||
${pkgs.nodejs-18_x}/bin/node ${foundryvtt}/resources/app/main.js --dataPath=/var/lib/foundryvtt
|
||||
|
|
|
|||
|
|
@ -1,5 +1,11 @@
|
|||
{ config, pkgs, inputs, lib, system, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
system,
|
||||
...
|
||||
}: let
|
||||
unstable = inputs.nixpkgs-nixos-unstable;
|
||||
package = unstable.legacyPackages."${system}".gitea;
|
||||
httpPort = 8083;
|
||||
|
|
@ -23,18 +29,18 @@ let
|
|||
};
|
||||
groups."${systemGroupName}" = {
|
||||
inherit gid;
|
||||
members = [ "${systemUserName}" "nginx" ];
|
||||
members = ["${systemUserName}" "nginx"];
|
||||
};
|
||||
};
|
||||
in {
|
||||
imports = [ ../nginx.nix ];
|
||||
imports = [../nginx.nix];
|
||||
|
||||
inherit users;
|
||||
|
||||
boot.kernel.sysctl = { "net.ipv4.ip_unprivileged_port_start" = 0; };
|
||||
boot.kernel.sysctl = {"net.ipv4.ip_unprivileged_port_start" = 0;};
|
||||
systemd.services.systemd-sysctl.enable = lib.mkForce true;
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ sshPort ];
|
||||
networking.firewall.allowedTCPPorts = [sshPort];
|
||||
services.nginx = {
|
||||
virtualHosts = {
|
||||
"${domain}" = {
|
||||
|
|
@ -76,15 +82,21 @@ in {
|
|||
isReadOnly = true;
|
||||
};
|
||||
};
|
||||
config = { config, pkgs, lib, ... }: {
|
||||
config = {
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
system.stateVersion = "23.05";
|
||||
users = users // {
|
||||
users =
|
||||
users
|
||||
// {
|
||||
mutableUsers = false;
|
||||
allowNoPasswordLogin = true;
|
||||
};
|
||||
disabledModules = [ "services/misc/gitea.nix" ];
|
||||
imports =
|
||||
[ "${unstable}/nixos/modules/services/misc/gitea.nix" ];
|
||||
disabledModules = ["services/misc/gitea.nix"];
|
||||
imports = ["${unstable}/nixos/modules/services/misc/gitea.nix"];
|
||||
services.gitea = {
|
||||
enable = true;
|
||||
inherit package;
|
||||
|
|
@ -101,8 +113,7 @@ in {
|
|||
"markup.mermaid" = {
|
||||
ENABLED = true;
|
||||
FILE_EXTENSIONS = ".md";
|
||||
RENDER_COMMAND =
|
||||
"${pkgs.asciidoc-full}/bin/asciidoc --out-file=- -";
|
||||
RENDER_COMMAND = "${pkgs.asciidoc-full}/bin/asciidoc --out-file=- -";
|
||||
IS_INPUT_FILE = false;
|
||||
};
|
||||
server = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{ config, pkgs, inputs, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
newestPackages = inputs.nixpkgs-master.legacyPackages.${pkgs.system};
|
||||
package = newestPackages.mastodon;
|
||||
domain = "peninsula.industries";
|
||||
|
|
@ -24,7 +29,7 @@ let
|
|||
};
|
||||
groups."${systemGroupName}" = {
|
||||
inherit gid;
|
||||
members = [ "${systemUserName}" "nginx" ];
|
||||
members = ["${systemUserName}" "nginx"];
|
||||
};
|
||||
};
|
||||
secretSettings = {
|
||||
|
|
@ -33,7 +38,7 @@ let
|
|||
};
|
||||
publicPath = "${path}/public-system/";
|
||||
in {
|
||||
imports = [ ../nginx.nix ];
|
||||
imports = [../nginx.nix];
|
||||
system.stateVersion = "23.05";
|
||||
|
||||
services.nginx = {
|
||||
|
|
@ -43,7 +48,7 @@ in {
|
|||
enableACME = true;
|
||||
root = "${package}/public/";
|
||||
|
||||
locations."/" = { tryFiles = "$uri @proxy"; };
|
||||
locations."/" = {tryFiles = "$uri @proxy";};
|
||||
locations."/system/".alias = "${publicPath}";
|
||||
|
||||
locations."@proxy" = {
|
||||
|
|
@ -58,14 +63,18 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
sops.secrets."${mailgunSmtpSecretName}" = {
|
||||
sops.secrets."${mailgunSmtpSecretName}" =
|
||||
{
|
||||
sopsFile = ./mailgun.sops.yaml;
|
||||
path = mailgunSmtpPasswordPath;
|
||||
} // secretSettings;
|
||||
sops.secrets."${mastodonDbSecretName}" = {
|
||||
}
|
||||
// secretSettings;
|
||||
sops.secrets."${mastodonDbSecretName}" =
|
||||
{
|
||||
sopsFile = ./mastodon-db.sops.yaml;
|
||||
path = mastodonDbSecretPath;
|
||||
} // secretSettings;
|
||||
}
|
||||
// secretSettings;
|
||||
|
||||
inherit users;
|
||||
|
||||
|
|
@ -80,8 +89,8 @@ in {
|
|||
chmod -R g+r ${publicPath}
|
||||
chmod -R u+rwX ${publicPath}
|
||||
'';
|
||||
serviceConfig = { Type = "oneshot"; };
|
||||
before = [ "container@mastodon.service" ];
|
||||
serviceConfig = {Type = "oneshot";};
|
||||
before = ["container@mastodon.service"];
|
||||
};
|
||||
|
||||
containers.mastodon = {
|
||||
|
|
@ -110,10 +119,17 @@ in {
|
|||
isReadOnly = true;
|
||||
};
|
||||
};
|
||||
config = { config, pkgs, lib, ... }: {
|
||||
config = {
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
system.stateVersion = "23.05";
|
||||
services.postgresql.port = postgresPort;
|
||||
users = users // {
|
||||
users =
|
||||
users
|
||||
// {
|
||||
mutableUsers = false;
|
||||
allowNoPasswordLogin = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,29 +1,39 @@
|
|||
{ config, pkgs, inputs, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
port = 8080;
|
||||
domain = "news.cyplo.dev";
|
||||
postgresPort = 5435;
|
||||
in {
|
||||
imports = [ ../nginx.nix ];
|
||||
imports = [../nginx.nix];
|
||||
|
||||
services.nginx = {
|
||||
virtualHosts = {
|
||||
"${domain}" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = { proxyPass = "http://127.0.0.1:" + toString port; };
|
||||
locations."/" = {proxyPass = "http://127.0.0.1:" + toString port;};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
containers.rss = {
|
||||
autoStart = true;
|
||||
forwardPorts = [{
|
||||
forwardPorts = [
|
||||
{
|
||||
containerPort = port;
|
||||
hostPort = port;
|
||||
}];
|
||||
config = { config, pkgs, ... }:
|
||||
let
|
||||
}
|
||||
];
|
||||
config = {
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.services.tt-rss) pool;
|
||||
inherit (config.services.tt-rss) root;
|
||||
in {
|
||||
|
|
@ -41,13 +51,15 @@ in {
|
|||
enable = true;
|
||||
virtualHosts = {
|
||||
"${domain}" = {
|
||||
listen = [{
|
||||
listen = [
|
||||
{
|
||||
inherit port;
|
||||
addr = "0.0.0.0";
|
||||
}];
|
||||
}
|
||||
];
|
||||
root = "${root}/www";
|
||||
locations."/" = { index = "index.php"; };
|
||||
locations."^~ /feed-icons" = { root = "${root}"; };
|
||||
locations."/" = {index = "index.php";};
|
||||
locations."^~ /feed-icons" = {root = "${root}";};
|
||||
locations."~ \\.php$" = {
|
||||
extraConfig = ''
|
||||
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||
|
|
|
|||
|
|
@ -1,18 +1,30 @@
|
|||
{ config, pkgs, inputs, lib, system, nixpkgs-nixos-unstable-and-unfree, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
system,
|
||||
nixpkgs-nixos-unstable-and-unfree,
|
||||
...
|
||||
}: {
|
||||
networking.hostName = "yoga";
|
||||
|
||||
imports = [ ./hardware-configuration.nix ../../boot.nix ../../git ../../gui
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
../../boot.nix
|
||||
../../git
|
||||
../../gui
|
||||
../../vim
|
||||
];
|
||||
];
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
hardware.trackpoint.enable = true;
|
||||
services.hardware.bolt.enable = true;
|
||||
|
||||
services.fprintd = { enable = true; };
|
||||
services.fprintd = {enable = true;};
|
||||
|
||||
home-manager.users.cyryl = { lib, ... }: { home.packages = with pkgs; [ ]; };
|
||||
home-manager.users.cyryl = {lib, ...}: {home.packages = with pkgs; [];};
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
|
|
@ -61,8 +73,8 @@
|
|||
users.users.cyryl = {
|
||||
isNormalUser = true;
|
||||
description = "cyryl";
|
||||
extraGroups = [ "networkmanager" "wheel" ];
|
||||
packages = with pkgs; [ ];
|
||||
extraGroups = ["networkmanager" "wheel"];
|
||||
packages = with pkgs; [];
|
||||
};
|
||||
|
||||
services.fwupd.enable = true;
|
||||
|
|
@ -73,5 +85,4 @@
|
|||
# Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229
|
||||
systemd.services."getty@tty1".enable = false;
|
||||
systemd.services."autovt@tty1".enable = false;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,33 +1,37 @@
|
|||
{ config, lib, pkgs, modulesPath, ... }: {
|
||||
imports = [ ];
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [];
|
||||
|
||||
boot.initrd.availableKernelModules =
|
||||
[ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||
|
||||
# Setup keyfile
|
||||
boot.initrd.secrets = { "/crypto_keyfile.bin" = null; };
|
||||
boot.initrd.secrets = {"/crypto_keyfile.bin" = null;};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/a43a1c42-9166-47dc-9e78-20e0975c75c5";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@" ];
|
||||
options = ["subvol=@"];
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."luks-99498047-118a-484a-8c2a-987ca68d4943".device =
|
||||
"/dev/disk/by-uuid/99498047-118a-484a-8c2a-987ca68d4943";
|
||||
boot.initrd.luks.devices."luks-99498047-118a-484a-8c2a-987ca68d4943".device = "/dev/disk/by-uuid/99498047-118a-484a-8c2a-987ca68d4943";
|
||||
|
||||
fileSystems."/boot/efi" = {
|
||||
device = "/dev/disk/by-uuid/F179-A4EA";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [];
|
||||
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,19 @@
|
|||
{ config, pkgs, nixpkgs-nixos-unstable-and-unfree, lib, ... }: {
|
||||
boot.kernelModules = [ "fuse" ];
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
nixpkgs-nixos-unstable-and-unfree,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
boot.kernelModules = ["fuse"];
|
||||
services.smartd.enable = true;
|
||||
|
||||
sound.enable = true;
|
||||
|
||||
networking.networkmanager = {
|
||||
enable = true;
|
||||
dispatcherScripts = [{
|
||||
dispatcherScripts = [
|
||||
{
|
||||
source = pkgs.writeText "upHook" ''
|
||||
enable_disable_wifi ()
|
||||
{
|
||||
|
|
@ -27,7 +34,8 @@
|
|||
fi
|
||||
'';
|
||||
type = "basic";
|
||||
}];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
|
|
@ -36,7 +44,7 @@
|
|||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
package = pkgs.bluezFull;
|
||||
settings = { General = { Enable = "Source,Sink,Media,Socket"; }; };
|
||||
settings = {General = {Enable = "Source,Sink,Media,Socket";};};
|
||||
};
|
||||
|
||||
services.blueman.enable = true;
|
||||
|
|
@ -55,7 +63,7 @@
|
|||
# no need to redefine it in your config for now)
|
||||
#media-session.enable = true;
|
||||
};
|
||||
environment.systemPackages = with pkgs; [ ghostscript poppler ];
|
||||
environment.systemPackages = with pkgs; [ghostscript poppler];
|
||||
services.printing = {
|
||||
enable = true;
|
||||
drivers = with pkgs; [
|
||||
|
|
@ -73,8 +81,7 @@
|
|||
description = "Epson XP-540 via bolty";
|
||||
name = "epson_xp540_via_bolty";
|
||||
deviceUri = "ipp://bolty:631/printers/epson_xp540";
|
||||
model =
|
||||
"epson-inkjet-printer-escpr/Epson-XP-540_Series-epson-escpr-en.ppd";
|
||||
model = "epson-inkjet-printer-escpr/Epson-XP-540_Series-epson-escpr-en.ppd";
|
||||
ppdOptions = {
|
||||
PageSize = "A4";
|
||||
Duplex = "DuplexNoTumble";
|
||||
|
|
@ -83,8 +90,7 @@
|
|||
{
|
||||
description = "Samsung SCX-4623 Series";
|
||||
name = "samsung-SCX-4623";
|
||||
deviceUri =
|
||||
"usb://Samsung/SCX-4623%20Series?serial=Z2TYBFFZC01007W&interface=1";
|
||||
deviceUri = "usb://Samsung/SCX-4623%20Series?serial=Z2TYBFFZC01007W&interface=1";
|
||||
model = "samsung/SCX-4623FW.ppd";
|
||||
ppdOptions = {
|
||||
PageSize = "A4";
|
||||
|
|
@ -93,7 +99,7 @@
|
|||
}
|
||||
];
|
||||
|
||||
services.udev.packages = [ ];
|
||||
services.udev.packages = [];
|
||||
hardware.sane = {
|
||||
enable = true;
|
||||
snapshot = true;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
{ config, pkgs, ... }: {
|
||||
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
console.keyMap = "pl2";
|
||||
imports = [ ./tailscale ];
|
||||
imports = [./tailscale];
|
||||
services = {
|
||||
udev.packages = [ pkgs.android-udev-rules ];
|
||||
udev.packages = [pkgs.android-udev-rules];
|
||||
ratbagd.enable = true;
|
||||
|
||||
fwupd = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,11 @@
|
|||
{ config, pkgs, lib, inputs, nixpkgs-nixos-unstable-and-unfree, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
nixpkgs-nixos-unstable-and-unfree,
|
||||
...
|
||||
}: let
|
||||
stateVersion = "23.05";
|
||||
username = "cyryl";
|
||||
in {
|
||||
|
|
@ -54,10 +60,9 @@ in {
|
|||
shell = pkgs.zsh;
|
||||
};
|
||||
|
||||
networking.nameservers =
|
||||
[ "9.9.9.9" "2620:fe::fe" "149.112.112.112" "2620:fe::9" ];
|
||||
networking.nameservers = ["9.9.9.9" "2620:fe::fe" "149.112.112.112" "2620:fe::9"];
|
||||
|
||||
networking.hosts = { "10.11.99.1" = [ "remarkable" ]; };
|
||||
networking.hosts = {"10.11.99.1" = ["remarkable"];};
|
||||
|
||||
programs.light.enable = true;
|
||||
programs.adb.enable = true;
|
||||
|
|
@ -74,13 +79,13 @@ in {
|
|||
enable = true;
|
||||
autoPrune.enable = true;
|
||||
daemon.settings = {
|
||||
"insecure-registries" = [ "vpsfree1.raptor-carp.ts.net:5000" ];
|
||||
"insecure-registries" = ["vpsfree1.raptor-carp.ts.net:5000"];
|
||||
};
|
||||
};
|
||||
|
||||
fonts.fontconfig = {
|
||||
enable = true;
|
||||
defaultFonts.monospace = [ "BerkeleyMono Nerd Font" ];
|
||||
defaultFonts.monospace = ["BerkeleyMono Nerd Font"];
|
||||
};
|
||||
|
||||
fonts.fonts = with pkgs; [
|
||||
|
|
@ -106,7 +111,7 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
system = { inherit stateVersion; };
|
||||
system = {inherit stateVersion;};
|
||||
system.activationScripts.diff = ''
|
||||
${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,21 +1,25 @@
|
|||
{ config, pkgs, ... }: {
|
||||
nix.buildMachines = [{
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
nix.buildMachines = [
|
||||
{
|
||||
hostName = "bolty";
|
||||
sshUser = "nix-builder";
|
||||
sshKey = "/home/cyryl/.ssh/id_ed25519";
|
||||
systems = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
|
||||
systems = ["i686-linux" "x86_64-linux" "aarch64-linux"];
|
||||
maxJobs = 2;
|
||||
speedFactor = 1;
|
||||
supportedFeatures = [ "kvm" "big-parallel" ];
|
||||
mandatoryFeatures = [ ];
|
||||
}];
|
||||
supportedFeatures = ["kvm" "big-parallel"];
|
||||
mandatoryFeatures = [];
|
||||
}
|
||||
];
|
||||
|
||||
nix.extraOptions = ''
|
||||
builders-use-substitutes = true
|
||||
'';
|
||||
nix.distributedBuilds = true;
|
||||
nix.settings.substituters =
|
||||
[ "https://cache.nixos.org/" "ssh://nix-ssh@bolty.raptor-carp.ts.net" ];
|
||||
nix.settings.trusted-public-keys =
|
||||
[ "cyplodev-store-key:a/+PEufePs7giWqYyRqy+TgUKLMbY+RQuJQu2aUjdl8=" ];
|
||||
nix.settings.substituters = ["https://cache.nixos.org/" "ssh://nix-ssh@bolty.raptor-carp.ts.net"];
|
||||
nix.settings.trusted-public-keys = ["cyplodev-store-key:a/+PEufePs7giWqYyRqy+TgUKLMbY+RQuJQu2aUjdl8="];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,14 @@
|
|||
{ config, pkgs, ... }: {
|
||||
services = { };
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
services = {};
|
||||
|
||||
xsession = { enable = false; };
|
||||
xsession = {enable = false;};
|
||||
|
||||
home.packages = (with pkgs; [ gnome-usage gnome3.gnome-tweaks ])
|
||||
home.packages =
|
||||
(with pkgs; [gnome-usage gnome3.gnome-tweaks])
|
||||
++ (with pkgs.gnomeExtensions; [
|
||||
caffeine
|
||||
clipboard-indicator
|
||||
|
|
@ -13,7 +18,7 @@
|
|||
dconf.settings = {
|
||||
"org/gnome/mutter" = {
|
||||
# https://github.com/NixOS/nixpkgs/issues/114514#issuecomment-1177709271
|
||||
experimental-features = [ "scale-monitor-framebuffer" ];
|
||||
experimental-features = ["scale-monitor-framebuffer"];
|
||||
};
|
||||
"org/gnome/shell" = {
|
||||
disable-user-extensions = false;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ config, pkgs, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
displayManager.gdm.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,18 @@
|
|||
{ config, pkgs, discord, inputs, nixpkgs-nixos-stable-and-unfree
|
||||
, nixpkgs-nixos-unstable-and-unfree, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
discord,
|
||||
inputs,
|
||||
nixpkgs-nixos-stable-and-unfree,
|
||||
nixpkgs-nixos-unstable-and-unfree,
|
||||
...
|
||||
}: let
|
||||
unstable = inputs.nixpkgs-nixos-unstable.legacyPackages.${pkgs.system};
|
||||
nixpkgs-master = inputs.nixpkgs-master.legacyPackages.${pkgs.system};
|
||||
in {
|
||||
security.chromiumSuidSandbox.enable = true;
|
||||
|
||||
home-manager.users.cyryl = { ... }: {
|
||||
home-manager.users.cyryl = {...}: {
|
||||
gtk = {
|
||||
enable = true;
|
||||
iconTheme = {
|
||||
|
|
@ -21,7 +27,7 @@ in {
|
|||
style.package = pkgs.adwaita-qt;
|
||||
};
|
||||
|
||||
imports = [ ];
|
||||
imports = [];
|
||||
|
||||
programs.chromium.enable = true;
|
||||
programs.firefox.enable = true;
|
||||
|
|
@ -81,7 +87,9 @@ in {
|
|||
yubikey-manager-qt
|
||||
yubikey-personalization
|
||||
yubikey-personalization-gui
|
||||
] ++ (with unstable; [ glaxnimate gnucash kicad thunderbird ]) ++ [
|
||||
]
|
||||
++ (with unstable; [glaxnimate gnucash kicad thunderbird])
|
||||
++ [
|
||||
nixpkgs-nixos-stable-and-unfree.discord
|
||||
nixpkgs-nixos-unstable-and-unfree.hopper
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
{ config, pkgs, inputs, ... }: {
|
||||
home.packages = with pkgs;
|
||||
[
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
home.packages = with pkgs; [
|
||||
(vscode-with-extensions.override {
|
||||
vscodeExtensions = with vscode-extensions;
|
||||
[
|
||||
|
|
@ -14,13 +18,13 @@
|
|||
name = "vadimcn.vscode-lldb-1.6.10";
|
||||
src = fetchurl {
|
||||
name = "vadimcn.vscode-lldb.zip";
|
||||
url =
|
||||
"https://github.com/vadimcn/vscode-lldb/releases/download/v1.6.10/codelldb-${pkgs.system}.vsix";
|
||||
url = "https://github.com/vadimcn/vscode-lldb/releases/download/v1.6.10/codelldb-${pkgs.system}.vsix";
|
||||
sha256 = "sha256-QWbpe6ofacjrTCyWSKljwHDWWeHGmKNqi7cpw8Qy5Tw=";
|
||||
};
|
||||
buildInputs = with pkgs; [ llvm lldb python38 autoPatchelfHook ];
|
||||
buildInputs = with pkgs; [llvm lldb python38 autoPatchelfHook];
|
||||
})
|
||||
] ++ vscode-utils.extensionsFromVscodeMarketplace [
|
||||
]
|
||||
++ vscode-utils.extensionsFromVscodeMarketplace [
|
||||
{
|
||||
publisher = "bierner";
|
||||
name = "markdown-mermaid";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ config, pkgs, inputs, system, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
system,
|
||||
...
|
||||
}: {
|
||||
home.packages = with pkgs; [
|
||||
(pass.withExtensions (ext: [
|
||||
ext.pass-otp
|
||||
|
|
|
|||
|
|
@ -1,5 +1,11 @@
|
|||
{ config, pkgs, inputs, lib, ... }:
|
||||
let username = "cyryl";
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
username = "cyryl";
|
||||
in {
|
||||
home.sessionVariables = {
|
||||
LC_ALL = "en_GB.UTF-8";
|
||||
|
|
@ -9,7 +15,7 @@ in {
|
|||
|
||||
news.display = "show";
|
||||
|
||||
home.packages = with pkgs; [ ];
|
||||
home.packages = with pkgs; [];
|
||||
|
||||
home.username = username;
|
||||
home.homeDirectory = lib.mkDefault "/home/${username}";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ config, pkgs, inputs, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
pinentryFlavor = "curses";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ config, pkgs, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
programs = {
|
||||
home-manager.enable = true;
|
||||
|
||||
|
|
@ -11,7 +15,7 @@
|
|||
|
||||
gpg = {
|
||||
enable = true;
|
||||
settings = { };
|
||||
settings = {};
|
||||
};
|
||||
|
||||
taskwarrior.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,16 +1,22 @@
|
|||
{ config, pkgs, ... }: {
|
||||
home.sessionVariables = { TERMINAL = "alacritty"; };
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.sessionVariables = {TERMINAL = "alacritty";};
|
||||
|
||||
programs.alacritty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
window.decorations = "none";
|
||||
|
||||
mouse_bindings = [{
|
||||
mouse_bindings = [
|
||||
{
|
||||
mouse = "Middle";
|
||||
mode = "~Vi";
|
||||
action = "None";
|
||||
}];
|
||||
}
|
||||
];
|
||||
scrolling = {
|
||||
history = 32000;
|
||||
multiplier = 3;
|
||||
|
|
|
|||
|
|
@ -9,10 +9,18 @@
|
|||
alejandra = lib.getExe inputs.alejandra.packages.${system}.default;
|
||||
nil = lib.getExe inputs.nil.packages.${system}.default;
|
||||
in {
|
||||
|
||||
home.sessionVariables = { EDITOR = "vim"; VISUAL="vim"; };
|
||||
programs.zsh.sessionVariables = { EDITOR = "vim"; VISUAL="vim"; };
|
||||
systemd.user.sessionVariables = { EDITOR = "vim"; VISUAL="vim"; };
|
||||
home.sessionVariables = {
|
||||
EDITOR = "vim";
|
||||
VISUAL = "vim";
|
||||
};
|
||||
programs.zsh.sessionVariables = {
|
||||
EDITOR = "vim";
|
||||
VISUAL = "vim";
|
||||
};
|
||||
systemd.user.sessionVariables = {
|
||||
EDITOR = "vim";
|
||||
VISUAL = "vim";
|
||||
};
|
||||
|
||||
programs.helix = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
{ config, pkgs, ... }: {
|
||||
home.sessionVariables = { TERMINAL = "kitty"; };
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.sessionVariables = {TERMINAL = "kitty";};
|
||||
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ config, pkgs, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
programs.ssh.extraConfig = ''
|
||||
Host vpsfree1 vpsfree1.cyplo.dev vpsfree1.raptor-carp.ts.net
|
||||
HostName vpsfree1
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
{ config, pkgs, ... }: {
|
||||
home.sessionVariables = { TERMINAL = "termite"; };
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.sessionVariables = {TERMINAL = "termite";};
|
||||
programs.termite = {
|
||||
enable = true;
|
||||
allowBold = true;
|
||||
|
|
|
|||
|
|
@ -1,28 +1,36 @@
|
|||
{ config, pkgs, ... }: {
|
||||
imports = [ ./autorandr.nix ./openweathermap-secrets.nix ];
|
||||
environment.systemPackages = with pkgs; [ dconf ];
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [./autorandr.nix ./openweathermap-secrets.nix];
|
||||
environment.systemPackages = with pkgs; [dconf];
|
||||
programs.dconf.enable = true;
|
||||
|
||||
security.sudo.extraRules = [
|
||||
{
|
||||
users = [ "cyryl" ];
|
||||
commands = [{
|
||||
users = ["cyryl"];
|
||||
commands = [
|
||||
{
|
||||
command = "${pkgs.i3}/bin/i3-msg";
|
||||
options = [ "NOPASSWD" ];
|
||||
}];
|
||||
options = ["NOPASSWD"];
|
||||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
users = [ "cyryl" ];
|
||||
commands = [{
|
||||
users = ["cyryl"];
|
||||
commands = [
|
||||
{
|
||||
command = "${pkgs.intel-gpu-tools}/bin/intel_gpu_top";
|
||||
options = [ "NOPASSWD" ];
|
||||
}];
|
||||
options = ["NOPASSWD"];
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-kde ];
|
||||
extraPortals = with pkgs; [xdg-desktop-portal-gtk xdg-desktop-portal-kde];
|
||||
};
|
||||
|
||||
services = {
|
||||
|
|
@ -32,7 +40,7 @@
|
|||
allowAnyUser = true;
|
||||
};
|
||||
|
||||
dbus = { packages = with pkgs; [ gnome2.GConf dconf ]; };
|
||||
dbus = {packages = with pkgs; [gnome2.GConf dconf];};
|
||||
|
||||
fractalart.enable = true;
|
||||
colord.enable = true;
|
||||
|
|
@ -42,8 +50,8 @@
|
|||
enableHidpi = true;
|
||||
};
|
||||
};
|
||||
home-manager.users.cyryl = { ... }: {
|
||||
imports = [ ./home.nix ];
|
||||
home.packages = with pkgs; [ ];
|
||||
home-manager.users.cyryl = {...}: {
|
||||
imports = [./home.nix];
|
||||
home.packages = with pkgs; [];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ config, pkgs, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
services.dunst = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,16 @@
|
|||
{ config, pkgs, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
programs.i3status = {
|
||||
enable = true;
|
||||
enableDefault = false;
|
||||
modules = {
|
||||
"load" = { position = 1; };
|
||||
"load" = {position = 1;};
|
||||
"disk /" = {
|
||||
position = 2;
|
||||
settings = { format = " %avail"; };
|
||||
settings = {format = " %avail";};
|
||||
};
|
||||
"memory" = {
|
||||
settings = {
|
||||
|
|
@ -27,7 +31,7 @@
|
|||
position = 3;
|
||||
};
|
||||
"time" = {
|
||||
settings = { format = "%a %d/%m %H:%M"; };
|
||||
settings = {format = "%a %d/%m %H:%M";};
|
||||
position = 9;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +1,11 @@
|
|||
{ config, pkgs, ... }:
|
||||
let mod = "Mod4";
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
mod = "Mod4";
|
||||
in {
|
||||
home.packages = with pkgs; [ font-awesome intel-gpu-tools ];
|
||||
home.packages = with pkgs; [font-awesome intel-gpu-tools];
|
||||
|
||||
xsession.windowManager.i3 = {
|
||||
enable = true;
|
||||
|
|
@ -23,8 +27,7 @@ in {
|
|||
notification = false;
|
||||
}
|
||||
{
|
||||
command =
|
||||
"exec xdg-mime default org.gnome.Evince.desktop application/pdf";
|
||||
command = "exec xdg-mime default org.gnome.Evince.desktop application/pdf";
|
||||
always = false;
|
||||
notification = false;
|
||||
}
|
||||
|
|
@ -42,18 +45,20 @@ in {
|
|||
};
|
||||
|
||||
workspaceLayout = "tabbed";
|
||||
bars = [{
|
||||
bars = [
|
||||
{
|
||||
statusCommand = "${pkgs.i3status}/bin/i3status";
|
||||
position = "top";
|
||||
colors.background = "#001e26";
|
||||
colors.statusline = "#708183";
|
||||
fonts = {
|
||||
names = [ "BerkeleyMono Nerd Font" ];
|
||||
names = ["BerkeleyMono Nerd Font"];
|
||||
size = 10.0;
|
||||
};
|
||||
|
||||
trayOutput = "primary";
|
||||
}];
|
||||
}
|
||||
];
|
||||
|
||||
modifier = mod;
|
||||
keybindings = {
|
||||
|
|
@ -64,25 +69,17 @@ in {
|
|||
"${mod}+Shift+l" = "exec physlock -d";
|
||||
"${mod}+Return" = "exec i3-sensible-terminal";
|
||||
|
||||
"XF86AudioRaiseVolume" =
|
||||
"exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%";
|
||||
"XF86AudioLowerVolume" =
|
||||
"exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%";
|
||||
"XF86AudioMute" =
|
||||
"exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle";
|
||||
"XF86AudioMicMute" =
|
||||
"exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
|
||||
"XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%";
|
||||
"XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%";
|
||||
"XF86AudioMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle";
|
||||
"XF86AudioMicMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
|
||||
|
||||
"XF86MonBrightnessUp" =
|
||||
"exec light -s sysfs/backlight/intel_backlight -A 5";
|
||||
"XF86MonBrightnessDown" =
|
||||
"exec light -s sysfs/backlight/intel_backlight -U 5";
|
||||
"XF86MonBrightnessUp" = "exec light -s sysfs/backlight/intel_backlight -A 5";
|
||||
"XF86MonBrightnessDown" = "exec light -s sysfs/backlight/intel_backlight -U 5";
|
||||
|
||||
"Print" =
|
||||
"exec ${pkgs.gnome3.gnome-screenshot}/bin/gnome-screenshot -i";
|
||||
"Print" = "exec ${pkgs.gnome3.gnome-screenshot}/bin/gnome-screenshot -i";
|
||||
|
||||
"${mod}+r" =
|
||||
"exec ${pkgs.rofi}/bin/rofi -show combi -combi-modi window#run#ssh -modi combi";
|
||||
"${mod}+r" = "exec ${pkgs.rofi}/bin/rofi -show combi -combi-modi window#run#ssh -modi combi";
|
||||
"${mod}+c" = "exec ${pkgs.clipmenu}/bin/clipmenu";
|
||||
"${mod}+q" = "kill";
|
||||
"${mod}+f" = "fullscreen toggle";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ config, pkgs, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
font = "BerkeleyMono Nerd Font 16";
|
||||
|
|
|
|||
|
|
@ -1,20 +1,21 @@
|
|||
{ config, pkgs, inputs, ... }:
|
||||
|
||||
{
|
||||
home-manager.users.cyryl = { ... }: {
|
||||
imports = [ ];
|
||||
home.packages =
|
||||
with inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux";
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
home-manager.users.cyryl = {...}: {
|
||||
imports = [];
|
||||
home.packages = with inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux";
|
||||
with gnuradio3_8Packages;
|
||||
[ gnuradio3_8 osmosdr gqrx audacity rtl-sdr inspectrum ] ++
|
||||
|
||||
(with pkgs; [ ]);
|
||||
[gnuradio3_8 osmosdr gqrx audacity rtl-sdr inspectrum]
|
||||
++ (with pkgs; []);
|
||||
};
|
||||
|
||||
users.extraUsers.cyryl.extraGroups = [ "plugdev" ];
|
||||
users.groups = { "plugdev" = { }; };
|
||||
users.extraUsers.cyryl.extraGroups = ["plugdev"];
|
||||
users.groups = {"plugdev" = {};};
|
||||
services.udev = {
|
||||
packages = [ pkgs.rtl-sdr ];
|
||||
packages = [pkgs.rtl-sdr];
|
||||
extraRules = ''
|
||||
# RTL2832U OEM vid/pid, e.g. ezcap EzTV668 (E4000), Newsky TV28T (E4000/R820T) etc.
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="2838", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"
|
||||
|
|
@ -22,5 +23,5 @@
|
|||
};
|
||||
|
||||
# dont load DVB-T modules automatically
|
||||
boot.blacklistedKernelModules = [ "dvb_usb_rtl28xxu" ];
|
||||
boot.blacklistedKernelModules = ["dvb_usb_rtl28xxu"];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
{ config, pkgs, ... }: {
|
||||
imports = [ ./server-security.nix ./tailscale ];
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [./server-security.nix ./tailscale];
|
||||
networking.nameservers = [
|
||||
"100.100.100.100"
|
||||
"9.9.9.9"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
{ config, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
authorizedKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEo4R+6J3h6Ix3xWpOMdU7Es1/YxFchHw0c+kcCOJxFb cyryl@foureighty"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDN/2C59i+ucvSa9FLCHlVPJp0zebLOcw0+hnBYwy0cY cyryl@skinnyv"
|
||||
|
|
@ -7,7 +10,7 @@ let
|
|||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBDa2qAxpUEFeBYl2wlzDa/x37TAAy5pOBHv50OXUrV5 cyryl@thinky"
|
||||
];
|
||||
in {
|
||||
imports = [ ./security.nix ];
|
||||
imports = [./security.nix];
|
||||
security.acme.defaults.email = "admin@cyplo.dev";
|
||||
security.acme.acceptTerms = true;
|
||||
|
||||
|
|
@ -27,7 +30,7 @@ in {
|
|||
openssh.authorizedKeys.keys = authorizedKeys;
|
||||
};
|
||||
|
||||
nix.settings.trusted-users = [ "root" "nix-builder" ];
|
||||
nix.settings.trusted-users = ["root" "nix-builder"];
|
||||
nix.sshServe.enable = true;
|
||||
nix.sshServe.keys = authorizedKeys;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,11 @@
|
|||
{ config, pkgs, ... }:
|
||||
let mod = "Mod4";
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
mod = "Mod4";
|
||||
in {
|
||||
services.dbus.packages = with pkgs; [ ];
|
||||
services.dbus.packages = with pkgs; [];
|
||||
programs.dconf.enable = true;
|
||||
systemd.defaultUnit = "graphical.target";
|
||||
security.polkit.enable = true;
|
||||
|
|
@ -13,10 +17,10 @@ in {
|
|||
fi
|
||||
'';
|
||||
|
||||
home-manager.users.cyryl = { ... }: {
|
||||
home-manager.users.cyryl = {...}: {
|
||||
programs.mako.enable = true;
|
||||
|
||||
imports = [ ./keybindings.nix ../home-manager/programs/alacritty.nix ];
|
||||
imports = [./keybindings.nix ../home-manager/programs/alacritty.nix];
|
||||
|
||||
home.pointerCursor = {
|
||||
name = "Adwaita";
|
||||
|
|
@ -73,16 +77,17 @@ in {
|
|||
titlebar = false;
|
||||
border = 0;
|
||||
};
|
||||
bars = [{
|
||||
bars = [
|
||||
{
|
||||
position = "top";
|
||||
command = "${pkgs.waybar}/bin/waybar";
|
||||
}];
|
||||
}
|
||||
];
|
||||
startup = [
|
||||
{
|
||||
command =
|
||||
"${pkgs.wl-clipboard}/bin/wl-paste -t text --watch ${pkgs.clipman}/bin/clipman store";
|
||||
command = "${pkgs.wl-clipboard}/bin/wl-paste -t text --watch ${pkgs.clipman}/bin/clipman store";
|
||||
}
|
||||
{ command = "${pkgs.clipman}/bin/clipman restore"; }
|
||||
{command = "${pkgs.clipman}/bin/clipman restore";}
|
||||
{
|
||||
command = ''
|
||||
swayidle -w timeout 300 'swaylock -f -c 000000' timeout 600 'swaymsg "output * dpms off" && systemctl suspend' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f -c 657b83'
|
||||
|
|
@ -94,7 +99,7 @@ in {
|
|||
xkb_layout = "pl";
|
||||
xkb_options = "caps:ctrl_modifier";
|
||||
};
|
||||
input."2:7:SynPS/2_Synaptics_TouchPad" = { tap = "enabled"; };
|
||||
input."2:7:SynPS/2_Synaptics_TouchPad" = {tap = "enabled";};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
{ config, pkgs, ... }:
|
||||
let mod = "Mod4";
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
mod = "Mod4";
|
||||
in {
|
||||
wayland.windowManager.sway.config.keybindings = {
|
||||
"${mod}+Shift+e" = "exit";
|
||||
|
|
@ -7,19 +11,13 @@ in {
|
|||
"${mod}+Shift+l" = "exec swaylock -c 657b83";
|
||||
"${mod}+Return" = "exec ${pkgs.alacritty}/bin/alacritty";
|
||||
|
||||
"XF86AudioRaiseVolume" =
|
||||
"exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%";
|
||||
"XF86AudioLowerVolume" =
|
||||
"exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%";
|
||||
"XF86AudioMute" =
|
||||
"exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle";
|
||||
"XF86AudioMicMute" =
|
||||
"exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
|
||||
"XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%";
|
||||
"XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%";
|
||||
"XF86AudioMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle";
|
||||
"XF86AudioMicMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
|
||||
|
||||
"XF86MonBrightnessUp" =
|
||||
"exec light -s sysfs/backlight/intel_backlight -A 5";
|
||||
"XF86MonBrightnessDown" =
|
||||
"exec light -s sysfs/backlight/intel_backlight -U 5";
|
||||
"XF86MonBrightnessUp" = "exec light -s sysfs/backlight/intel_backlight -A 5";
|
||||
"XF86MonBrightnessDown" = "exec light -s sysfs/backlight/intel_backlight -U 5";
|
||||
|
||||
"Print" = "exec ${pkgs.gnome3.gnome-screenshot}/bin/gnome-screenshot -i";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,11 @@
|
|||
{ config, pkgs, inputs, ... }:
|
||||
let
|
||||
workstations = [ "skinnyv" "foryog" "thinky" ];
|
||||
workstations_plus_phone = [ "OnePlus9" ] ++ workstations;
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
workstations = ["skinnyv" "foryog" "thinky"];
|
||||
workstations_plus_phone = ["OnePlus9"] ++ workstations;
|
||||
in {
|
||||
services.syncthing = {
|
||||
enable = true;
|
||||
|
|
@ -41,12 +45,12 @@ in {
|
|||
"/home/cyryl/vaults" = {
|
||||
id = "vaults";
|
||||
label = "vaults";
|
||||
devices = workstations_plus_phone ++ [ "hagath" ];
|
||||
devices = workstations_plus_phone ++ ["hagath"];
|
||||
};
|
||||
"/home/cyryl/Documents" = {
|
||||
id = "documents";
|
||||
label = "documents";
|
||||
devices = workstations_plus_phone ++ [ "hagath" ];
|
||||
devices = workstations_plus_phone ++ ["hagath"];
|
||||
};
|
||||
"/home/cyryl/camera" = {
|
||||
id = "camera";
|
||||
|
|
@ -71,7 +75,7 @@ in {
|
|||
"/home/cyryl/Photos" = {
|
||||
id = "photos";
|
||||
label = "photos";
|
||||
devices = workstations ++ [ "hagath" ];
|
||||
devices = workstations ++ ["hagath"];
|
||||
};
|
||||
"/home/cyryl/gopro" = {
|
||||
id = "gopro";
|
||||
|
|
@ -81,12 +85,12 @@ in {
|
|||
"/home/cyryl/Videos" = {
|
||||
id = "videos";
|
||||
label = "videos";
|
||||
devices = workstations ++ [ "hagath" ];
|
||||
devices = workstations ++ ["hagath"];
|
||||
};
|
||||
"/home/cyryl/rodzice_sync" = {
|
||||
id = "rodzice";
|
||||
label = "rodzice";
|
||||
devices = workstations ++ [ "hagath" "mama" "janusz" "danuta" ];
|
||||
devices = workstations ++ ["hagath" "mama" "janusz" "danuta"];
|
||||
};
|
||||
};
|
||||
extraOptions = {
|
||||
|
|
|
|||
|
|
@ -1,28 +1,34 @@
|
|||
{ config, pkgs, inputs, ... }:
|
||||
let
|
||||
inherit (inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux")
|
||||
tailscale;
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
inherit
|
||||
(inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux")
|
||||
tailscale
|
||||
;
|
||||
in {
|
||||
environment.systemPackages = [ tailscale ];
|
||||
environment.systemPackages = [tailscale];
|
||||
services.tailscale = {
|
||||
enable = true;
|
||||
package = tailscale;
|
||||
};
|
||||
|
||||
networking.firewall = {
|
||||
trustedInterfaces = [ "tailscale0" ];
|
||||
allowedUDPPorts = [ config.services.tailscale.port ];
|
||||
trustedInterfaces = ["tailscale0"];
|
||||
allowedUDPPorts = [config.services.tailscale.port];
|
||||
};
|
||||
sops.secrets."tailscale-key-${config.networking.hostName}" = {
|
||||
sopsFile = ./keys.sops.yaml;
|
||||
restartUnits = [ "tailscale-auth.service" ];
|
||||
restartUnits = ["tailscale-auth.service"];
|
||||
};
|
||||
systemd.services.tailscale-auth = {
|
||||
description = "Auth with tailscale";
|
||||
|
||||
after = [ "network-pre.target" "tailscale.service" ];
|
||||
wants = [ "network-pre.target" "tailscale.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = ["network-pre.target" "tailscale.service"];
|
||||
wants = ["network-pre.target" "tailscale.service"];
|
||||
wantedBy = ["multi-user.target"];
|
||||
|
||||
serviceConfig.Type = "oneshot";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{ config, pkgs, lib, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
programs.zsh.enable = true;
|
||||
|
||||
home-manager.users.cyryl = { ... }: { imports = [ ./home.nix ]; };
|
||||
home-manager.users.cyryl = {...}: {imports = [./home.nix];};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,30 @@
|
|||
{ config, pkgs, lib, inputs, system, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
system,
|
||||
...
|
||||
}: let
|
||||
unstablePackages = inputs.nixpkgs-nixos-unstable.legacyPackages."${system}";
|
||||
nil = inputs.nil.packages."${system}".default;
|
||||
cocPackage = unstablePackages.vimPlugins.coc-nvim;
|
||||
nvimPackage = unstablePackages.neovim-unwrapped;
|
||||
in {
|
||||
home.file.".vimrc".source = ../../.vimrc;
|
||||
home.packages = with pkgs; [ ripgrep ];
|
||||
home.sessionVariables = { EDITOR = "vim"; VISUAL="vim"; };
|
||||
programs.zsh.sessionVariables = { EDITOR = "vim"; VISUAL="vim"; };
|
||||
systemd.user.sessionVariables = { EDITOR = "vim"; VISUAL="vim"; };
|
||||
home.packages = with pkgs; [ripgrep];
|
||||
home.sessionVariables = {
|
||||
EDITOR = "vim";
|
||||
VISUAL = "vim";
|
||||
};
|
||||
programs.zsh.sessionVariables = {
|
||||
EDITOR = "vim";
|
||||
VISUAL = "vim";
|
||||
};
|
||||
systemd.user.sessionVariables = {
|
||||
EDITOR = "vim";
|
||||
VISUAL = "vim";
|
||||
};
|
||||
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
|
|
@ -26,8 +41,8 @@ in {
|
|||
languageserver = {
|
||||
nix = {
|
||||
command = "${nil}/bin/nil";
|
||||
rootPatterns = [ "flake.nix" ];
|
||||
filetypes = [ "nix" ];
|
||||
rootPatterns = ["flake.nix"];
|
||||
filetypes = ["nix"];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ config, pkgs, lib, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
programs.zsh.enable = true;
|
||||
home-manager.users.cyryl = { ... }: { imports = [ ./home.nix ]; };
|
||||
home-manager.users.cyryl = {...}: {imports = [./home.nix];};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ config, pkgs, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
programs.atuin.enableZshIntegration = true;
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
|
|
@ -15,7 +19,7 @@
|
|||
|
||||
oh-my-zsh = {
|
||||
enable = true;
|
||||
plugins = [ "vi-mode" "git" "python" "history-substring-search" "tmux" ];
|
||||
plugins = ["vi-mode" "git" "python" "history-substring-search" "tmux"];
|
||||
};
|
||||
|
||||
initExtra = ''
|
||||
|
|
@ -65,7 +69,7 @@
|
|||
programs.direnv = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
nix-direnv = { enable = true; };
|
||||
nix-direnv = {enable = true;};
|
||||
};
|
||||
|
||||
home.file.".config/starship.toml".text = ''
|
||||
|
|
|
|||
Loading…
Reference in a new issue