From a0bf3340520137aa194b7287464fab1dede9a6d0 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 20 Jun 2024 22:02:57 -0500 Subject: [PATCH 01/20] Enable backend connection to Minio --- hosts/jeremiah/default.nix | 11 +++++++++-- hosts/jeremiah/minio.nix | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 hosts/jeremiah/minio.nix diff --git a/hosts/jeremiah/default.nix b/hosts/jeremiah/default.nix index c992675..584b31c 100644 --- a/hosts/jeremiah/default.nix +++ b/hosts/jeremiah/default.nix @@ -9,6 +9,7 @@ [ # Include the results of the hardware scan. ./ceph.nix ./hardware-configuration.nix + ./minio.nix ]; # Bootloader. @@ -22,6 +23,12 @@ address = " 10.42.1.1"; interface = "enp68s0"; }; + vlans = { + san = { + id = 616; + interface = "enp67s0"; + }; + }; interfaces = { enp68s0 = { ipv4.addresses = [ { @@ -32,10 +39,10 @@ prefixLength = 16; } ]; }; - enp67s0 = { + san = { ipv4.addresses = [ { address = "10.201.1.2"; - prefixLength = 16; + prefixLength = 24; } ]; }; }; diff --git a/hosts/jeremiah/minio.nix b/hosts/jeremiah/minio.nix new file mode 100644 index 0000000..522498f --- /dev/null +++ b/hosts/jeremiah/minio.nix @@ -0,0 +1,32 @@ +{ config, pkgs, ... }: + +let + minioPort = 9000; + minioConsolePort = 9001; +in { + environment.systemPackages = with pkgs; [ + minio-client + xfsprogs + ]; + + greg.proxies."minio-02.thehellings.lan".target = "http://localhost:9000"; + + fileSystems."/data/1" = { + device = "/dev/disk/by-id/ata-ST12000NM0558_ZHZ5YSXW-part1"; + fsType = "xfs"; + }; + + networking.firewall.allowedTCPPorts = [ + minioPort + minioConsolePort + ]; + + age.secrets.minio.file = ../../secrets/minio.age; + + services.minio = { + enable = true; + dataDir = [ "/data/1/minio" ]; + rootCredentialsFile = config.age.secrets.minio.path; + browser = true; + }; +} From bb7277b524f129e990d161d850d144aa173843cd Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 20 Jun 2024 22:04:26 -0500 Subject: [PATCH 02/20] Add backend Minio connection --- hosts/myself/default.nix | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/hosts/myself/default.nix b/hosts/myself/default.nix index d2047c0..c9b5bc7 100644 --- a/hosts/myself/default.nix +++ b/hosts/myself/default.nix @@ -31,20 +31,28 @@ address = " 10.42.1.1"; interface = "enp38s0"; }; - interfaces.enp38s0 = { - ipv4.addresses = [ { - address = "10.42.1.6"; - prefixLength = 16; - } { - address = "10.42.100.1"; - prefixLength = 16; - } ]; + vlans = { + san = { + id = 616; + interface = "enp39s0"; + }; }; - interfaces.enp39s0 = { - ipv4.addresses = [ { - address = "10.201.1.1"; - prefixLength = 24; - } ]; + interfaces = { + enp38s0 = { + ipv4.addresses = [ { + address = "10.42.1.6"; + prefixLength = 16; + } { + address = "10.42.100.1"; + prefixLength = 16; + } ]; + }; + san = { + ipv4.addresses = [ { + address = "10.201.1.1"; + prefixLength = 24; + } ]; + }; }; nameservers = [ "10.42.1.5" From f94103e8562d590356bb172ae8cebf077dab8e7a Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 20 Jun 2024 22:12:38 -0500 Subject: [PATCH 03/20] Add locally hosted S3 cache --- secrets/gitlab/myself-qemu-runner-reg.age | Bin 1954 -> 1950 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/secrets/gitlab/myself-qemu-runner-reg.age b/secrets/gitlab/myself-qemu-runner-reg.age index 463a49f264252b92f99dfd9df206ba219841039a..b5813264d8f0614c01c363eac284104c0cc8dc4d 100644 GIT binary patch literal 1950 zcmZA1Z_wKW9S3kxwrM$#ak|4}jygE+k@%1%P11%9Bx%z&O`D``+9m-#(=rIoiE^MG?AWtA#+c$b*og{w;yF3p4v`yEd|vnM@6G4F zci-<%F|O8v;o*7!L1_@0$WL}Hesp~CkQM*yIb3lbGqvH;#AxYS7a)!W0 zo+l5KDJhMcYR4&YMJW~PZYQqfRbB0IRH3iryL6FN^hiu<$q*XZekbTdI8Ka7dtM_N z106EbiP&)`I6L+fcx==rY89Z{By2Y$z1yi5D*-i}&fGGUOcFaKGGGz&8jj(IL@^57x%|fXRzYPLZmVfuS7{NeVJZ83ftGaylWHKx1Aj_iIL> zkw&^2qpT!-2A&;`By<=L){3V%1?-6B(gA z&5BSvM%`d4SS7PAb^|E}Ad8sSrd$QAG}4+0xDbWpz1hesCSIXo$I`GwsPZ)GWSNrh zOBh+B@m#m;r7|2(4QbG9idaq+y`a;9NdrsTY*LYyudqBp8aa&*g`PLBl}58rZ=^+( z5O}FA_oE;-P!uk30^LMii*|TC=uvQ45L~Qd;WC^_IY@@_V8D?TdK3>8SsizCS)uHe z;g-$e=!~YcJj%IaQZSL(l4=+DfMZ-QYwWOG0Ig8IXe=2Ift80 zmp3FP2nBE&OPTrX7m29KBC{c@!x3bFn<8d)1NtTtD1#WZ5lyKhC)C?WWD~?}6XEba>tEhd$i#m*;kHe>)AG zIPssm+xy;GfBUWrz->pW_op5>`_i|c56@iaeh$3)r&nB@!TxmSJn@MdzS5u7P^5$on5&|IB5Ze>q;g z=C^z9|J?~-Vb6mnH}f}7-jr|c-y)w|TFZx()pxabA3C%?(oq4T=m8UPlxP$H5cX>qKciZ##eAd3{j`ttD z`y+MR&$dZIWBZH$0v^)(tN;7KsYAr~o>+QleQMLnRp-;KM^B!(<=v-VS<;aQE^mJN zQ3Wl&cI~sjIQiVfS-SCt^Vk(T_p;B1#~){}JpQXSPoLlL>nj^;uFijxc>Cq!Xa5g? CnYpn5 literal 1954 zcmZY7{m3zCVK<0`7m1cE9B(apw(kxr% z+a#TfV3qMQh%>29BSG>7TJ{Ar&}h;&W(wJ*R%=?>mD}UAE9ix>mUxUYK1_7~YM7xZ#AZe5#2pk~fNcJL6&y zqE3`yF`x`v)x~jr!vRmQVi@(w4kBxMwab)LCG5;1 zsms=JAk(Ar7LbW+#MDSN1fQNlEZ`~$NH8=3P#KspVNRYIMvWFF6VBHm?-*`9$1k4{}s$<}eOun;nb6yGh@oYk{b-IX7&Flo5-D4wG(SP^ychc!S26Rl6vq zC)}vr9L(yDE7uY(fyrn*24We^2@o|@X`6>~ArTW{w$G(tSuBwG92GPyM;SY)Ic*~y z)9aH1WDGD_77Ux&3dd;mX0*C37T7E+rK9GsUN3Q#EbfoXnLYyX7Ug21EpYXA*$>+} zm~zl=F)=+gMVBZLv%zqRCY64}8Bn84xhO>uX7%H&j#{OxAVd>_tP$91jSgptC8ejF z=h}6M>+_lN)J&ux8Ceto6D_orM>^VMJoWKx3myYKDpg`?PS>KV6ej1pUg);MvC@Pi z9&N)e)ke{3c?{A)j9EovwdR>(GLzC_(xIaPYm;tI5rzfArDs{dEJ|RY;9OAyg92L7 zngyfO2vWpg)CnTG2Q->AFw5tHOn|mWIXTih!c5h>oG=dkAt}dsZnYNl{bu;-li`d< zT#LqXO4q~4X`niuTY(vNW|*=TR=e2(NXocQd0dLAQ;NloD?X$rol)$Ed4y1%8ir+^ zcB=`+0>WvABcj;ohD(ZlhXm~OQ0M`AwbC+bEwDK14y1-OE)x07$SAl((Sm)^r~%WS z+nSbAjS;K_In}o<0QY3L3WJ`?oBCjedv#5gQ5fc|x{;M#3Qx_=&7}uJ6G!vmiGw$+OYUz#h2W~>%#P|N_?Sl{R`C$3QbKg20NcSFo z>5hk9`rYwgTwH(k;Ddj@`CUEP z4oB6;kY`^#k$>)xMho*lZvX2Da%n?-ZS>v8&HLpoli!oG#goz*=2d9>WJ#XfjBfqq zt?#vueS3a$>e3bA$`9`N%&xV~b?+Qo_}SkVNApYHys#d-_VWF^7I!MAF5;}j{`|n} z`!;_3{q4?`pWJ!R}$uCK1~jvZM1-o5@aTbPd*&MmKbROueNCCeO|jnZ#DJba;bYIv5svi98k4}pKI z{CmyU*SfbI-+b!)E1S|!e?@<8|A#L;_R*Q;USI;c*FG_Fk-ul!v_o?^) za(e5g(ofNUe);`t7w@V(zULe41N?7pUpT$6uX6P8Koc&Um#%&FmUHCOugyPl{r}@= B!3zKY From 8cfd27d6ca58d9991fdcaf8ba63992c7ae82f42a Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 20 Jun 2024 22:37:14 -0500 Subject: [PATCH 04/20] Update cache for vbox runner --- secrets/gitlab/myself-vbox-runner-reg.age | Bin 1908 -> 1919 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/secrets/gitlab/myself-vbox-runner-reg.age b/secrets/gitlab/myself-vbox-runner-reg.age index f34653263057e8abe7b115b8f23c422fbbbc5f94..5093d14a6b28c479df2924609d9a14129a227604 100644 GIT binary patch literal 1919 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 A5dZ)H From cc42575bc2ccaa0f667f32f5d10824976fbffbd9 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 20 Jun 2024 23:27:00 -0500 Subject: [PATCH 05/20] Add gitlab restart alias --- home/xonsh_footer.xsh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/xonsh_footer.xsh b/home/xonsh_footer.xsh index 019831e..26baea5 100644 --- a/home/xonsh_footer.xsh +++ b/home/xonsh_footer.xsh @@ -15,6 +15,10 @@ def bw_unlock(): $BW_SESSION = token return token +def _glrestart(args): + sudo nixos-container run gitlab -- systemctl restart gitlab + sudo nixos-container run gitlab -- systemctl restart nginx + def _cfetch(args): bw_unlock() $CIRCLECI_CLI_TOKEN=$(bw get password CircleCI) @@ -68,6 +72,7 @@ def _bake(args): git clone src:greg/copier-templates.git ~/.copier-templates copier copy @(str(templates / args[0])) . +aliases['glrestart'] = _glrestart aliases['cfetch'] = _cfetch aliases['bake'] = _bake aliases['rebuild'] = _rebuild From d9af805f607ffdfe442f6074578e1c0abc9d91a4 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 21 Jun 2024 01:27:03 -0500 Subject: [PATCH 06/20] Aim to new minio cluster --- hosts/myself/container-git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/myself/container-git.nix b/hosts/myself/container-git.nix index a704b51..2b57a0d 100644 --- a/hosts/myself/container-git.nix +++ b/hosts/myself/container-git.nix @@ -106,7 +106,7 @@ in { proxy_download = false; # Tell them to reach out to object storage themselves! connection = { provider = "AWS"; - endpoint = "http://s3.thehellings.lan:9000"; + endpoint = "http://minio-01.thehellings.lan:9000"; region = "us-east-1"; aws_access_key_id = { _secret = config.age.secrets.minio_access_key_id.path; }; aws_secret_access_key = { _secret = config.age.secrets.minio_secret_access_key.path; }; From d80b7cb098c954464d86dbfa4e44b5fd169fa2b5 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 21 Jun 2024 13:02:13 -0500 Subject: [PATCH 07/20] Add Jeremiah runner --- hosts/jeremiah/default.nix | 65 ++++++++++++++++++++++++- secrets/gitlab/jeremiah-runner-reg.age | Bin 0 -> 1919 bytes secrets/secrets.nix | 1 + 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 secrets/gitlab/jeremiah-runner-reg.age diff --git a/hosts/jeremiah/default.nix b/hosts/jeremiah/default.nix index 584b31c..dc4a199 100644 --- a/hosts/jeremiah/default.nix +++ b/hosts/jeremiah/default.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { imports = @@ -56,6 +56,19 @@ }; environment.systemPackages = with pkgs; [ btrfs-progs + curl + gawk + git + p7zip + packer + pup + gregpy + shellcheck + unzip + xonsh + xorriso + vagrant + wget ]; fileSystems = { @@ -70,4 +83,54 @@ device = "/dev/nvme0n1p1"; }; }; + + ##################################################################################### + #################### Virtualbox Runner ############################################## + ##################################################################################### + services = { + gitlab-runner = { + enable = true; + settings.concurrent = 1; + services = { + shell = { + executor = "shell"; + limit = 5; + registrationConfigFile = config.age.secrets.runner-reg.path; + environmentVariables = { + EFI_DIR = "${pkgs.OVMF.fd}/FV/"; + }; + }; + }; + }; + }; + age.secrets.runner-reg.file = ../../secrets/gitlab/jeremiah-runner-reg.age; + virtualisation.virtualbox.host = { + enable = true; + enableExtensionPack = true; + enableHardening = false; + headless = true; + }; + + systemd.services."gitlab-runner" = { + after = [ + "network.target" + "network-online.target" + "systemd-resolved.service" + ]; + wants = [ + "network-online.target" + "systemd-resolved.service" + ]; + preStart = builtins.concatStringsSep "\n" [ + "${pkgs.kmod}/bin/modprobe vboxdrv" + "${pkgs.kmod}/bin/modprobe vboxnetadp" + "${pkgs.kmod}/bin/modprobe vboxnetflt" + ]; + postStop = "${pkgs.kmod}/bin/rmmod vboxnetadp vboxnetflt vboxdrv"; + serviceConfig = { + DevicePolicy = lib.mkForce "auto"; + User = "root"; + DynamicUser = lib.mkForce false; + }; + }; } diff --git a/secrets/gitlab/jeremiah-runner-reg.age b/secrets/gitlab/jeremiah-runner-reg.age new file mode 100644 index 0000000000000000000000000000000000000000..0636c77251c250d5b5a60e46cf82944ea478ed49 GIT binary patch literal 1919 zcmZY8{qNia9l&wIHZ~6s2bze4aT-ZB%hz6e*Iv&Au$Sb>^|{w; zk1v8S83rbc2n$9wABa3loEbwgZ1W*Y*dS~!J^^ua_zf^X$(C)z8Qjm`{ROXlKJU** zHHHgAXAq=bG;*D8!*6Dj@4h6`8*q-X7-vK$*Va6d=#@Uiz)x!xQqGiz+ zy2~}2wK?6$cHwq1tm7flwi#T47>^aJNef6g(^ep$s9I$KDu8^OuHqTM5J@*boN|>q zQer$X5HW1)?fSy*UT{f3hFu;p5}F%tS0X6w%LU{fjKxKo3`d@8wS(49tJ z4YeC?m5J0!&+EV7~J%$Ob8I?$rXo-$pX|zhP;WtWRdnQRLYG7XKjRwm# zwF~14o<-1^+Bb4Q(Uqxkm)Dwo)0nh~sGghYZgGU0<58XP9oKKyGjMmKY7_<5m zYKQqMP5Bdn$uv!?T~$z19Ep9L=aJBf64o3iO}QEAAe`6y9L|lM$fN4ZH(AwagXFVb zEExI8sN4bixw;4XVx$eqCe(J4v1L>UoNa+}14J1ht!FwVC*Wp$wV9)8DiP#o5{t0) zI@Y3tq}VIkI$4}2hK?ncwOotX8d&4AK`u6HI-K++Cz+2tyDpV*rc`OEXmjWf3sr4@#eA4XN{CB z2pClu6y!MSP)f0>0zb$4X5f zB@_Ybff20p6abJIn|GIMmd3?%K3ncPql%3H)(~eo$105m1xKUt0HyUVqq&vPq-8=A z^L#DLgv!)}I3lSzHH*;Hd^~^#uHe-KyHlUZQwt00L})6~Fke`%xsI)PMizra(3!+K zMW*otNQ&~9${CPYq-~6C&?ccVxdv7l7CgS2@omEiVaso5aY)&yJZ735xDz}1QKeKL zxsqFG{p3%uM^LbD?2oVPPRFQl@v|g47xu@&eQb zTTY~gI2JR?bc%@a-0p;PyGQh8ZIJnvyVU!^*PcB0MeMmRZOuOteem4}SFZpb33hEy z3h&>iYoAu0QLZ`9J$&w8pJ?sNe}8P>HGd>-UU~oe{ilBO*q)dE{mRNyJ?B;9)Hj|^ zo|JbUI`huE2Mm0}$$O5zcl!BHj&I!h`*~ literal 0 HcmV?d00001 diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 583093c..684783b 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -57,6 +57,7 @@ in # Then pipe the resulting files to agenix -e "gitlab/key.age".publicKeys = everyone; "gitlab/cert.age".publicKeys = everyone; + "gitlab/jeremiah-runner-reg.age".publicKeys = everyone; "gitlab/myself-qemu-runner-reg.age".publicKeys = everyone; "gitlab/myself-vbox-runner-reg.age".publicKeys = everyone; "gitlab/myself-podman-runner-reg.age".publicKeys = everyone; From 77f8dec208ca5161989a77aeada8b45a5262f4e8 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 21 Jun 2024 13:08:42 -0500 Subject: [PATCH 08/20] Add STORAGE_URL --- hosts/jeremiah/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/jeremiah/default.nix b/hosts/jeremiah/default.nix index dc4a199..b82896d 100644 --- a/hosts/jeremiah/default.nix +++ b/hosts/jeremiah/default.nix @@ -98,6 +98,7 @@ registrationConfigFile = config.age.secrets.runner-reg.path; environmentVariables = { EFI_DIR = "${pkgs.OVMF.fd}/FV/"; + STORAGE_URL = "http://localhost:9000"; }; }; }; From eb88be91167c53099d63f8a7ac9bf6e9d0fb2a52 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 21 Jun 2024 17:06:25 -0500 Subject: [PATCH 09/20] Setup MinIO in runner --- hosts/myself/container-runner.nix | 2 ++ hosts/myself/git.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/hosts/myself/container-runner.nix b/hosts/myself/container-runner.nix index 440d547..2656eff 100644 --- a/hosts/myself/container-runner.nix +++ b/hosts/myself/container-runner.nix @@ -31,6 +31,7 @@ lib.attrsets.recursiveUpdate { curl gawk git + minio-client p7zip packer pup @@ -67,6 +68,7 @@ lib.attrsets.recursiveUpdate { registrationConfigFile = config.age.secrets.runner-reg.path; environmentVariables = { EFI_DIR = "${pkgs.OVMF.fd}/FV/"; + STORAGE_URL = "http://localhost:9000"; }; }; }; diff --git a/hosts/myself/git.nix b/hosts/myself/git.nix index a88a930..c6d6901 100644 --- a/hosts/myself/git.nix +++ b/hosts/myself/git.nix @@ -120,6 +120,7 @@ in { registrationConfigFile = config.age.secrets.runner-qemu.path; environmentVariables = { EFI_DIR = "${pkgs.OVMF.fd}/FV/"; + STORAGE_URL = "http://localhost:9000"; }; }; }; @@ -132,6 +133,7 @@ in { curl gawk git + minio-client p7zip packer pup From 7448bf91f4aa3b2f4f44bf705d943fd530ec8caf Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 24 Jun 2024 16:04:48 -0400 Subject: [PATCH 10/20] Better vim usage Move to better settings for fzf Go back to NERDTree, as the others are very annoying --- home/vim.nix | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/home/vim.nix b/home/vim.nix index 4524ede..91e0dbd 100644 --- a/home/vim.nix +++ b/home/vim.nix @@ -33,10 +33,6 @@ in globals = { indent_guides_enable_on_vim_startup = 1; nix_recommended_style = 0; - netrw_liststyle = 3; - netrw_browse_split = 4; - netrw_altv = 1; - netrw_winsize = 25; }; opts = { background = "dark"; @@ -75,11 +71,7 @@ in } { mode = "n"; key = ""; - action = ":Lex"; - } { - mode = "n"; - key = ""; - action = ":GFiles?"; + action = ":NERDTreeToggle"; } (winMove "h") (winMove "j") @@ -87,25 +79,43 @@ in (winMove "l") ]; plugins = { - airline = { - enable = true; - settings.theme = "gruvbox"; - }; + airline.enable = true; + cmp.enable = true; + direnv.enable = true; gitgutter.enable = true; fugitive.enable = true; + fzf-lua = { + enable = true; + iconsEnabled = true; + keymaps = { + "" = { + action = "files"; + settings = { + previewers.cat.cmd = "${pkgs.coreutils}/bin/cat"; + winopts.height = 0.5; + }; + }; + "" = { + action = "git_files"; + settings = { + previewers.cat.cmd = "${pkgs.coreutils}/bin/cat"; + winopts.height = 0.5; + }; + }; + }; + profile = "fzf-vim"; + }; notify.enable = true; }; extraConfigLua = builtins.replaceStrings [ "@git@" ] [ "${pkgs.git}/bin/git" ] (builtins.readFile ./vim/extra.lua); extraConfigVim = builtins.readFile ./vim/extra.vimrc; extraPlugins = with pkgs.vimPlugins; [ bufexplorer - gruvbox - nvim-cmp + nerdtree + nvim-web-devicons # Be sure to install Hack Nerd Font and set it to your term default: https://gist.github.com/matthewjberger/7dd7e079f282f8138a9dc3b045ebefa0 packer-nvim context-vim - direnv-vim - fzf-vim vim-flake8 vim-indent-guides vim-xonsh From a23546b20c3c2f884bb16336d86c1df73148d86f Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 24 Jun 2024 23:34:05 -0500 Subject: [PATCH 11/20] Add STORAGE_URL to Hosea --- hosts/hosea/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/hosea/default.nix b/hosts/hosea/default.nix index f4620e1..51236c9 100644 --- a/hosts/hosea/default.nix +++ b/hosts/hosea/default.nix @@ -67,6 +67,7 @@ in registrationConfigFile = config.age.secrets.runner-reg.path; environmentVariables = { EFI_DIR = "${pkgs.OVMF.fd}/FV/"; + STORAGE_URL = "http://minio-01.thehellings.lan:9000"; }; }; }; From c06c78c112c56a1ed0621d09e93447a30f462826 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 12 Jul 2024 20:17:52 -0500 Subject: [PATCH 12/20] Ignore vlan --- hosts/jeremiah/default.nix | 8 +------- hosts/myself/default.nix | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/hosts/jeremiah/default.nix b/hosts/jeremiah/default.nix index b82896d..1c8c1b2 100644 --- a/hosts/jeremiah/default.nix +++ b/hosts/jeremiah/default.nix @@ -23,12 +23,6 @@ address = " 10.42.1.1"; interface = "enp68s0"; }; - vlans = { - san = { - id = 616; - interface = "enp67s0"; - }; - }; interfaces = { enp68s0 = { ipv4.addresses = [ { @@ -39,7 +33,7 @@ prefixLength = 16; } ]; }; - san = { + enp67s0 = { ipv4.addresses = [ { address = "10.201.1.2"; prefixLength = 24; diff --git a/hosts/myself/default.nix b/hosts/myself/default.nix index c9b5bc7..2c20592 100644 --- a/hosts/myself/default.nix +++ b/hosts/myself/default.nix @@ -31,12 +31,6 @@ address = " 10.42.1.1"; interface = "enp38s0"; }; - vlans = { - san = { - id = 616; - interface = "enp39s0"; - }; - }; interfaces = { enp38s0 = { ipv4.addresses = [ { @@ -47,7 +41,7 @@ prefixLength = 16; } ]; }; - san = { + enp39s0 = { ipv4.addresses = [ { address = "10.201.1.1"; prefixLength = 24; From dd8cb9cb48e425193cb9970f816a3844d27f75cb Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 12 Jul 2024 22:07:03 -0500 Subject: [PATCH 13/20] Restore the VLAN --- hosts/jeremiah/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hosts/jeremiah/default.nix b/hosts/jeremiah/default.nix index 1c8c1b2..b82896d 100644 --- a/hosts/jeremiah/default.nix +++ b/hosts/jeremiah/default.nix @@ -23,6 +23,12 @@ address = " 10.42.1.1"; interface = "enp68s0"; }; + vlans = { + san = { + id = 616; + interface = "enp67s0"; + }; + }; interfaces = { enp68s0 = { ipv4.addresses = [ { @@ -33,7 +39,7 @@ prefixLength = 16; } ]; }; - enp67s0 = { + san = { ipv4.addresses = [ { address = "10.201.1.2"; prefixLength = 24; From 3073a2cebea513fdfa90055f64e78942437060e4 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 12 Jul 2024 23:00:01 -0500 Subject: [PATCH 14/20] Allow Jeremiah more parallel --- hosts/jeremiah/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/jeremiah/default.nix b/hosts/jeremiah/default.nix index b82896d..569b607 100644 --- a/hosts/jeremiah/default.nix +++ b/hosts/jeremiah/default.nix @@ -90,7 +90,7 @@ services = { gitlab-runner = { enable = true; - settings.concurrent = 1; + settings.concurrent = 7; services = { shell = { executor = "shell"; From 0da0374b5861a0f273c2d6da3f3c826321e5a1da Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 12 Jul 2024 23:01:07 -0500 Subject: [PATCH 15/20] Set VLAN on Isaiah --- hosts/myself/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hosts/myself/default.nix b/hosts/myself/default.nix index 2c20592..c9b5bc7 100644 --- a/hosts/myself/default.nix +++ b/hosts/myself/default.nix @@ -31,6 +31,12 @@ address = " 10.42.1.1"; interface = "enp38s0"; }; + vlans = { + san = { + id = 616; + interface = "enp39s0"; + }; + }; interfaces = { enp38s0 = { ipv4.addresses = [ { @@ -41,7 +47,7 @@ prefixLength = 16; } ]; }; - enp39s0 = { + san = { ipv4.addresses = [ { address = "10.201.1.1"; prefixLength = 24; From d095a967a9838a2c8fda72a1e4988c213c310da7 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 13 Jul 2024 02:37:17 -0500 Subject: [PATCH 16/20] Create module for vmdev --- hosts/exodus/default.nix | 4 +++ hosts/jude/virt.nix | 34 +----------------- modules/nixos/default.nix | 1 + modules/nixos/vmdev.nix | 73 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 33 deletions(-) create mode 100644 modules/nixos/vmdev.nix diff --git a/hosts/exodus/default.nix b/hosts/exodus/default.nix index fe06c2a..00e0556 100644 --- a/hosts/exodus/default.nix +++ b/hosts/exodus/default.nix @@ -16,5 +16,9 @@ home = true; gnome.enable = true; tailscale.enable = true; + vmdev = { + enable = true; + system = "intel"; + }; }; } diff --git a/hosts/jude/virt.nix b/hosts/jude/virt.nix index 4cd286d..26fcc46 100644 --- a/hosts/jude/virt.nix +++ b/hosts/jude/virt.nix @@ -1,41 +1,13 @@ { pkgs, config, ... }: { - environment.systemPackages = with pkgs; [ - dmidecode - guestfs-tools - libguestfs - OVMFFull - packer - virt-manager - vmware-workstation - vmfs-tools - xorriso - ]; - - # Give my user access to the libvirtd process - users.users.greg.extraGroups = [ "libvirtd" ]; + greg.vmdev.enable = true; virtualisation = { - libvirtd = { - enable = true; - onBoot = "ignore"; # Do not auto-restart VMs on boot, unless they are marked autostart - qemu.ovmf.enable = true; - }; - - virtualbox.host = { - enable = true; - enableExtensionPack = true; - }; - waydroid.enable = false; lxd.enable = false; }; - users.extraGroups.vboxusers.members = [ "greg" ]; - - boot.extraModprobeConfig = "options kvm_amd nested=1"; - systemd.services = { gitlab-runner = { conflicts = [ "libvirtd.service" ]; @@ -47,10 +19,6 @@ wantedBy = pkgs.lib.mkForce []; serviceConfig.User = "root"; }; - libvirtd = { - preStart = "${pkgs.kmod}/bin/modprobe kvm_amd"; - postStop = "${pkgs.kmod}/bin/rmmod kvm_amd kvm"; - }; }; age.secrets.runner-reg.file = ../../secrets/gitlab/myself-vbox-runner-reg.age; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 1e42e83..bc4610f 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -17,6 +17,7 @@ ./rpi4.nix ./sway.nix ./tailscale.nix + ./vmdev.nix ]; environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/vmdev.nix b/modules/nixos/vmdev.nix new file mode 100644 index 0000000..b41acbd --- /dev/null +++ b/modules/nixos/vmdev.nix @@ -0,0 +1,73 @@ +{ pkgs, lib, config, ... }: + +let + cfg = config.greg.vmdev; +in with lib; +{ + options = { + greg.vmdev = { + enable = mkEnableOption "Enable this system for VM development work"; + user = mkOption { + default = "greg"; + type = types.str; + description = "The user who will be doing VM dev"; + }; + system = mkOption { + default = "amd"; + type = types.str; + description = "Kernel module type to install - amd, intel, etc"; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + dmidecode + guestfs-tools + libguestfs + OVMFFull + packer + virt-manager + xorriso + ]; + + users.users."${cfg.user}".extraGroups = [ "libvirtd" ]; + + # Enable the virtualisation services + virtualisation = { + libvirtd = { + enable = true; + onBoot = "ignore"; # Do not auto-restart VMs on boot, unless they are marked autostart + qemu.ovmf.enable = true; + }; + + virtualbox.host = { + enable = true; + enableExtensionPack = true; + }; + }; + + # Configuration for vbox user performance + users.extraGroups.vboxusers.members = [ cfg.user ]; + + boot.extraModprobeConfig = "options kvm_${cfg.system} nested=1"; + + # Configure the services more + systemd.services = { + libvirtd = { + preStart = "${pkgs.kmod}/bin/modprobe kvm_${cfg.system}"; + postStop = "${pkgs.kmod}/bin/rmmod kvm_${cfg.system} kvm"; + conflicts = [ "vbox.service" ]; + }; + vbox = { + preStart = "${pkgs.kmod}/bin/modprobe vboxdrv vboxnetadp vboxnetflt"; + postStop = "${pkgs.kmod}/bin/rmmod vboxnetadp vboxnetflt vboxdrv"; + conflicts = [ "libvirtd.service" ]; + unitConfig = { + Type = "oneshot"; + RemainAfterExit = "yes"; + }; + }; + }; + }; +} From f9652d77e5ace57d5da71262bf92e1fe7b8e7031 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 15 Jul 2024 14:38:57 -0500 Subject: [PATCH 17/20] Add freetube --- home/modules/gui.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/gui.nix b/home/modules/gui.nix index 0d2e7ec..7933be2 100644 --- a/home/modules/gui.nix +++ b/home/modules/gui.nix @@ -25,6 +25,7 @@ in { [ cdrtools fluffychat + freetube cinny-desktop qpwgraph vlc From 73739228fb74dc66bd5f3bfff94ca7b283bcba36 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 15 Jul 2024 15:27:23 -0500 Subject: [PATCH 18/20] Update packages and xonsh --- flake.lock | 6 +++--- home/home.nix | 4 ++-- home/modules/xonsh.nix | 2 +- hosts/hosea/default.nix | 1 - hosts/jeremiah/default.nix | 1 - hosts/myself/container-runner.nix | 1 - hosts/myself/default.nix | 1 - hosts/myself/git.nix | 1 - modules/nixos/default.nix | 5 ++++- overlays/default.nix | 2 +- 10 files changed, 11 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 5ef373b..aa4c5fa 100644 --- a/flake.lock +++ b/flake.lock @@ -413,11 +413,11 @@ }, "nixunstable": { "locked": { - "lastModified": 1717786204, - "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index f35e327..22b6a45 100644 --- a/home/home.nix +++ b/home/home.nix @@ -24,10 +24,10 @@ in programs.tmux = { enable = true; keyMode = "vi"; - shell = "${pkgs.xonsh}/bin/xonsh"; + shell = "${pkgs.myxonsh}/bin/xonsh"; terminal = "xterm-256color"; customPaneNavigationAndResize = true; - #"set-option -g default-command ${pkgs.xonsh}/bin/xonsh" + #"set-option -g default-command ${pkgs.myxonsh}/bin/xonsh" extraConfig = (lib.strings.concatStringsSep "\n" [ "bind P paste-buffer" ]); diff --git a/home/modules/xonsh.nix b/home/modules/xonsh.nix index 348612c..2b82c53 100644 --- a/home/modules/xonsh.nix +++ b/home/modules/xonsh.nix @@ -81,7 +81,7 @@ in with lib; { in mkIf cfg.enable { - home.packages = [ pkgs.xonsh ]; + home.packages = [ pkgs.myxonsh ]; home.file.".xonshrc".text = '' ${cfg.configHeader} diff --git a/hosts/hosea/default.nix b/hosts/hosea/default.nix index 51236c9..1ed4a13 100644 --- a/hosts/hosea/default.nix +++ b/hosts/hosea/default.nix @@ -121,7 +121,6 @@ in gregpy shellcheck unzip - xonsh xorriso vagrant wget diff --git a/hosts/jeremiah/default.nix b/hosts/jeremiah/default.nix index 569b607..cd562f1 100644 --- a/hosts/jeremiah/default.nix +++ b/hosts/jeremiah/default.nix @@ -65,7 +65,6 @@ gregpy shellcheck unzip - xonsh xorriso vagrant wget diff --git a/hosts/myself/container-runner.nix b/hosts/myself/container-runner.nix index 2656eff..f272df1 100644 --- a/hosts/myself/container-runner.nix +++ b/hosts/myself/container-runner.nix @@ -38,7 +38,6 @@ lib.attrsets.recursiveUpdate { py shellcheck unzip - xonsh xorriso vagrant wget diff --git a/hosts/myself/default.nix b/hosts/myself/default.nix index c9b5bc7..b012ab1 100644 --- a/hosts/myself/default.nix +++ b/hosts/myself/default.nix @@ -15,7 +15,6 @@ tmux tree vim - xonsh xorriso ]; diff --git a/hosts/myself/git.nix b/hosts/myself/git.nix index c6d6901..1207e1e 100644 --- a/hosts/myself/git.nix +++ b/hosts/myself/git.nix @@ -142,7 +142,6 @@ in { qemu_kvm shellcheck unzip - xonsh xorriso vagrant wget diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index bc4610f..3fa92fe 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -44,7 +44,10 @@ }; programs = { - xonsh.enable = true; + xonsh = { + enable = true; + package = pkgs.myxonsh; + }; }; # Enable the OpenSSH daemon for remote control diff --git a/overlays/default.nix b/overlays/default.nix index 74258a4..d8f7454 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -83,7 +83,7 @@ in rec { }; pipenv-ivr = prev.callPackage ./pipenv.nix { }; - xonsh = (prev.xonsh.override { + myxonsh = (prev.xonsh-unwrapped.passthru.wrapper.override { extraPackages = (ps: with ps; [ xonsh-apipenv xonsh-direnv From 7d882d161e601092bc94c7a92c0adc38f7600aad Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 17 Jul 2024 11:15:09 -0500 Subject: [PATCH 19/20] Add poetry to IVR --- home/hosts/ivr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/hosts/ivr/default.nix b/home/hosts/ivr/default.nix index 9f38b22..8beaa6a 100644 --- a/home/hosts/ivr/default.nix +++ b/home/hosts/ivr/default.nix @@ -25,6 +25,7 @@ in { home-manager insomnia pipenv-ivr + poetry ]; file.".pip/pip.conf".text = (lib.strings.concatStringsSep "\n" [ "[global]" From 09d840031233002a3d154760639d1ead3775a66c Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 17 Jul 2024 12:05:21 -0500 Subject: [PATCH 20/20] Add vpn alias for Xonsh Adding a set of aliases to my Xonsh work to start up a VPN that uses BitWarden for OTP storage Changed my Linux to specifically use Python 3.12 because the flag for NamedTemporaryFile is introduced in 3.12 --- home/xonsh_footer.xsh | 32 +++++++++++++++++++++++++++----- overlays/default.nix | 2 +- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/home/xonsh_footer.xsh b/home/xonsh_footer.xsh index 26baea5..2009a22 100644 --- a/home/xonsh_footer.xsh +++ b/home/xonsh_footer.xsh @@ -1,5 +1,7 @@ # vim: set ft=python : +from tempfile import NamedTemporaryFile + def bw_unlock(): """Unlocks the BitWarden CLI and adds the resulting session code to the current environment variables. Also returns the code for them.""" @@ -15,6 +17,24 @@ def bw_unlock(): $BW_SESSION = token return token +def vpn(con, bwname): + bw_unlock() + base=$(bw get password @(bwname)) + secret=$(bw get totp @(bwname)) + #echo vpn.secrets.password:${base}$(oathtool -b -d "${digits}" -s "${period}" --totp "${secret}") > "${f}" + + with NamedTemporaryFile(delete_on_close=False) as fp: + secret = f"vpn.secrets.password:{base}{secret}" + fp.write(secret.encode("utf-8")) + fp.close() + nmcli c up @(con) passwd-file @(fp.name) + +def _unlock(args): + bw_unlock() + +def _ivr(args): + vpn("350Main", "IVR Technology") + def _glrestart(args): sudo nixos-container run gitlab -- systemctl restart gitlab sudo nixos-container run gitlab -- systemctl restart nginx @@ -73,16 +93,18 @@ def _bake(args): copier copy @(str(templates / args[0])) . aliases['glrestart'] = _glrestart -aliases['cfetch'] = _cfetch aliases['bake'] = _bake -aliases['rebuild'] = _rebuild -aliases['yaml2json'] = _yaml2json +aliases['unlock'] = _unlock +aliases['cfetch'] = _cfetch +aliases['ivr'] = _ivr +aliases['newdock'] = _newdock +aliases['pip_extras'] = _pip_extras aliases['py2env'] = _py2env aliases['py3env'] = _py3env +aliases['rebuild'] = _rebuild aliases['rundock'] = _rundock -aliases['newdock'] = _newdock aliases['unknown_host'] = _unknown_host -aliases['pip_extras'] = _pip_extras +aliases['yaml2json'] = _yaml2json ### # # Other random nice-to-have things diff --git a/overlays/default.nix b/overlays/default.nix index d8f7454..ce58c26 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -18,7 +18,7 @@ let virtualenv ]; - myPython = prev.python3.withPackages myPackages; + myPython = prev.python312.withPackages myPackages; macOver = file: og: if prev.stdenv.isDarwin then (prev.callPackage file {}) else