cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix check items

Browse source
This commit is contained in:
Cyryl Płotnicki 2022-12-04 12:33:54 +00:00
parent 1fc78fc965
commit 6a8b1eae71
7 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

@ -37,6 +37,7 @@
imports = imports =
[ ./nixos/home-manager ./nixos/home-manager/linux.nix ]; [ ./nixos/home-manager ./nixos/home-manager/linux.nix ];
_module.args.inputs = inputs; _module.args.inputs = inputs;
_module.args.system = system;
}; };
} }
@ -120,14 +121,13 @@
skinnyv = mkWorkstation nixpkgs-stable "x86_64-linux" "skinnyv"; skinnyv = mkWorkstation nixpkgs-stable "x86_64-linux" "skinnyv";
thinky = mkWorkstation nixpkgs-stable "x86_64-linux" "thinky"; thinky = mkWorkstation nixpkgs-stable "x86_64-linux" "thinky";
bolty = mkServer nixpkgs-stable "x86_64-linux" "bolty"; bolty = mkServer nixpkgs-stable "x86_64-linux" "bolty";
vultr1 = mkServer nixpkgs-stable "x86_64-linux" "vultr1";
vpsfree1 = mkServer nixpkgs-stable "x86_64-linux" "vpsfree1"; vpsfree1 = mkServer nixpkgs-stable "x86_64-linux" "vpsfree1";
yoga = mkKiosk nixpkgs-stable "x86_64-linux" "yoga"; yoga = mkKiosk nixpkgs-stable "x86_64-linux" "yoga";
homescreen = mkRaspi nixpkgs-stable "homescreen"; homescreen = mkRaspi nixpkgs-stable "homescreen";
bootstrap = nixpkgs-stable.lib.nixosSystem rec { bootstrap = nixpkgs-stable.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ (./. + "/nixos/boxes/bootstrap") ]; modules = [ (./. + "/nixos/boxes/bootstrap") sops.nixosModules.sops ];
specialArgs = { specialArgs = {
inherit inputs system; inherit inputs system;
nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable { nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {

6
nixos/boxes/bootstrap/hardware-configuration.nix
View file

@ -26,6 +26,8 @@
swapDevices = [ ]; swapDevices = [ ];
nix.maxJobs = 2; nix.settings = {
nix.buildCores = 6; max-jobs = "auto";
cores = 0;
};
} }

2
nixos/boxes/homescreen/default.nix
View file

@ -57,7 +57,7 @@
system.stateVersion = "22.05"; system.stateVersion = "22.05";
nix = { nix = {
autoOptimiseStore = true; settings.auto-optimise-store = true;
gc = { gc = {
automatic = true; automatic = true;
dates = "weekly"; dates = "weekly";

6
nixos/boxes/thinky/hardware-configuration.nix
View file

@ -28,6 +28,8 @@
swapDevices = [ ]; swapDevices = [ ];
nix.maxJobs = 2; nix.settings = {
nix.buildCores = 2; max-jobs = 2;
cores = 2;
};
} }

7
nixos/boxes/yoga/default.nix
View file

@ -1,4 +1,5 @@
{ config, pkgs, inputs, lib, nixpkgs-nixos-unstable-and-unfree, ... }: { { config, pkgs, inputs, lib, system, nixpkgs-nixos-unstable-and-unfree, ... }: {
networking.hostName = "yoga"; networking.hostName = "yoga";
imports = [ ./hardware-configuration.nix ../../boot.nix ../../git ]; imports = [ ./hardware-configuration.nix ../../boot.nix ../../git ];
@ -10,7 +11,7 @@
services.fprintd = { enable = true; }; services.fprintd = { enable = true; };
home-manager.users.cyryl = { _ }: { home-manager.users.cyryl = { lib, ... }: {
home.packages = with pkgs; [ firefox vim gnome3.gedit git ]; home.packages = with pkgs; [ firefox vim gnome3.gedit git ];
}; };
@ -65,7 +66,7 @@
systemd.services."autovt@tty1".enable = false; systemd.services."autovt@tty1".enable = false;
nix = { nix = {
autoOptimiseStore = true; settings.auto-optimise-store = true;
gc.automatic = true; gc.automatic = true;
optimise.automatic = true; optimise.automatic = true;
package = pkgs.nixUnstable; package = pkgs.nixUnstable;

1
nixos/server-security.nix
View file

@ -4,7 +4,6 @@ let
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEo4R+6J3h6Ix3xWpOMdU7Es1/YxFchHw0c+kcCOJxFb cyryl@foureighty" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEo4R+6J3h6Ix3xWpOMdU7Es1/YxFchHw0c+kcCOJxFb cyryl@foureighty"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDN/2C59i+ucvSa9FLCHlVPJp0zebLOcw0+hnBYwy0cY cyryl@skinnyv" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDN/2C59i+ucvSa9FLCHlVPJp0zebLOcw0+hnBYwy0cY cyryl@skinnyv"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJwZ4M6lT2yzg8iarCzsLADAuXS4BUkLTt1+mKCECczk nix-builder@brix" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJwZ4M6lT2yzg8iarCzsLADAuXS4BUkLTt1+mKCECczk nix-builder@brix"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALNEUIxbENTdhSWzYupGFn/q+AGe0diBOTMyiZAmv7F nix-builder@vultr1"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBDa2qAxpUEFeBYl2wlzDa/x37TAAy5pOBHv50OXUrV5 cyryl@thinky" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBDa2qAxpUEFeBYl2wlzDa/x37TAAy5pOBHv50OXUrV5 cyryl@thinky"
]; ];
in { in {

5
nixos/tailscale/keys.sops.yaml
View file

@ -3,6 +3,7 @@ tailscale-key-bolty: ENC[AES256_GCM,data:Qu2MijnJvIM5I937EBIb8EXlcmNuoxUCVJl5h/K
tailscale-key-vpsfree1: ENC[AES256_GCM,data:SMNNQlEQ27ftahZMVQXRj4manCxofl44mgCO0A5BKVXHbZw9xxhbWSg=,iv:S99ZR3sRxV7On/zaldg41GL3RpaO17i94GDSOmzlsvU=,tag:X7F0E+gqIvqUoMCZ5Xzx2g==,type:str] tailscale-key-vpsfree1: ENC[AES256_GCM,data:SMNNQlEQ27ftahZMVQXRj4manCxofl44mgCO0A5BKVXHbZw9xxhbWSg=,iv:S99ZR3sRxV7On/zaldg41GL3RpaO17i94GDSOmzlsvU=,tag:X7F0E+gqIvqUoMCZ5Xzx2g==,type:str]
tailscale-key-vultr1: ENC[AES256_GCM,data:8YNSlIKi4ssvH0XNLs3e5ee5624wGm1guaYQLWQ0KWMiXW/8jeeCDw==,iv:QsKL4NqOUTCWSIxlaXqXbfzhFcAbJTkYXjkc1eCJv8M=,tag:qhod5l9qupdHGxvbRNuIiw==,type:str] tailscale-key-vultr1: ENC[AES256_GCM,data:8YNSlIKi4ssvH0XNLs3e5ee5624wGm1guaYQLWQ0KWMiXW/8jeeCDw==,iv:QsKL4NqOUTCWSIxlaXqXbfzhFcAbJTkYXjkc1eCJv8M=,tag:qhod5l9qupdHGxvbRNuIiw==,type:str]
tailscale-key-thinky: ENC[AES256_GCM,data:xRaCvVaGgLxIn1dhA+SNUIeljTnOiJryrUy/wK09t4gTMQA2h0kj9wg=,iv:b8iw5se4Lucmfi7N0B+RFUAl4tUYGFqtHZ0IxVfCHXE=,tag:dJyVuzbTm/hGalx2H0XjRA==,type:str] tailscale-key-thinky: ENC[AES256_GCM,data:xRaCvVaGgLxIn1dhA+SNUIeljTnOiJryrUy/wK09t4gTMQA2h0kj9wg=,iv:b8iw5se4Lucmfi7N0B+RFUAl4tUYGFqtHZ0IxVfCHXE=,tag:dJyVuzbTm/hGalx2H0XjRA==,type:str]
tailscale-key-fixme: ENC[AES256_GCM,data:GfuoFnJBO7RYe0e5vUrHCHgGO+G5rH/WedjG2sEk61tzjUfKoHpt1Mw=,iv:/j2MxHG025lc8z3elehxwvMXN3YEcaKuGmDdWKEsJmI=,tag:h8A9Wt1VAUR8EtAR8Jtr5w==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
@ -99,8 +100,8 @@ sops:
Vkc0MGZmNFdmYUJvKys5YVZsOWtURm8Ky4sDGX7Inn7+aQxgU92mcUT+te5sya3s Vkc0MGZmNFdmYUJvKys5YVZsOWtURm8Ky4sDGX7Inn7+aQxgU92mcUT+te5sya3s
dDqfr1pp2Gbt337kCmvBpwulvYXC/iKtrp3Dh1omWET+39cI1Hfw0w== dDqfr1pp2Gbt337kCmvBpwulvYXC/iKtrp3Dh1omWET+39cI1Hfw0w==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2022-10-02T12:32:56Z" lastmodified: "2022-12-04T11:59:28Z"
mac: ENC[AES256_GCM,data:RFqvMDJUd7lA+bwDeB31N1v0LN/oIrS92+GvLyhy/GvrewfVNNynDqHt+cmU6ybWqCS7LVTyTIKhLpR/xfHo8iESKNHZEV1Ksmr71PmR4+GdRkma7zKeu4KC7mmapjUw2G7F4y4ZuPlATdImOgNVj2a7VzbGUM2ccW7G1ZGY1QU=,iv:f7dCbrDxdD3LEq5uwKjUT+7pWYKt6PwwqAUdUnhMurs=,tag:0wyeelqGnh0r0DM6gQB/Mg==,type:str] mac: ENC[AES256_GCM,data:Cubm2qdUd6bP0pRJ18GIM+kfo8PF66MZXao7eQga0gPn4fyavDu7zgabjFRd7dCHd69Wz71Y1hTtkoA18JIps5dqQXyqaY3OABIqPnCt5bYBo9XDJTTX+/FPz3UYH+a2k5HKh7IHZNaabcRTSNPahEq4YITGt1cPH0nyd2h860o=,iv:ATRjQ/JnQeojrQXHnMJF+R1HosDyUFwuborFtvx/u7w=,tag:guQpB9wakj+M3FJOFgz+Bw==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.7.3 version: 3.7.3