Merge branch 'master' of git.mvl.sh:vleeuwenmenno/dotfiles

bin/actions/secrets.sh

@@ -14,12 +14,12 @@ else
     output=$(op item get "Dotfiles Secrets" --fields password)
 fi
 
-# Check if the password was found
+# Check if command was a success
-if [[ -z "$output" ]]; then
+if [[ $? -ne 0 ]]; then
-    printfe "%s\n" "red" "Password not found in 1Password, add a login item with the name 'Dotfiles Secrets' and give it a password."
+    printfe "%s\n" "red" "Failed to fetch password from 1Password."
-    exit 1
 fi
 
+
 token=$(echo "$output" | grep -oP "(?<=\[use 'op item get ).*(?= --)")
 printfe "%s\n" "cyan" "Got fetch token: $token"
 

bin/actions/update.sh

@@ -206,7 +206,7 @@ git_repos() {
 }
 
 homemanager() {
-  cd $HOME/dotfiles/config/home-manager && home-manager switch
+  cd $HOME/dotfiles/config/home-manager && NIXPKGS_ALLOW_UNFREE=1 home-manager switch
 }
 
 ensure_homemanager_installed() {

config/home-manager/home.nix

@@ -1,8 +1,9 @@
 { config, pkgs, ... }: {
   imports = [
-    ./vscode.nix
+    ./packages/vscode.nix
+    ./packages/go.nix
+    ./packages/kitty.nix
     ./fonts.nix
-    ./kitty.nix
     ./dconf.nix
     ./keyboard-shortcuts.nix
     ./virtualization.nix

config/home-manager/packages.nix

@@ -10,13 +10,13 @@
 
     # Package management
     pipx
+    devbox
 
     # Development SDKs/Toolkits
     gcc
     pkg-config
     gnumake
     stdenv.cc
-    go
     rustc
     cargo
     cargo-edit

config/home-manager/packages/go.nix

@@ -0,0 +1,20 @@
+{ config, pkgs, ... }:
+let
+  pinnedPkgs = import (fetchTarball {
+    url = "https://github.com/NixOS/nixpkgs/archive/d4f247e89f6e10120f911e2e2d2254a050d0f732.tar.gz";
+    # Update this SHA256 when a new version is required ^^^
+    # You can find them here: https://www.nixhub.io/packages/vscode
+  }) { };
+in
+{
+  # Use the pinned Go for the programs configuration
+  programs.go = {
+    enable = true;
+    package = pinnedPkgs.go;
+  };
+
+  home.sessionVariables = {
+    GOPATH = "${config.home.homeDirectory}/go";
+    GOBIN = "${config.home.homeDirectory}/go/bin";
+  };
+}

config/home-manager/packages/vscode.nix

@@ -0,0 +1,58 @@
+{ pkgs, ... }:
+let
+  pinnedPkgs = import (fetchTarball {
+    url = "https://github.com/NixOS/nixpkgs/archive/d4f247e89f6e10120f911e2e2d2254a050d0f732.tar.gz";
+    # Update this SHA256 when a new version is required ^^^
+    # You can find them here: https://www.nixhub.io/packages/vscode
+  }) { };
+in
+{
+  # Use the pinned VSCode for the programs.vscode configuration
+  programs.vscode = {
+    enable = true;
+    package = pinnedPkgs.vscode;
+    mutableExtensionsDir = true;
+    extensions = with pkgs.vscode-extensions; [
+      ms-azuretools.vscode-docker
+      ms-vscode-remote.remote-containers
+      ms-vscode-remote.remote-ssh
+      ms-vscode-remote.remote-ssh-edit
+      ms-vscode.makefile-tools
+      ms-vsliveshare.vsliveshare
+      bbenoist.nix
+      aaron-bond.better-comments
+      alexisvt.flutter-snippets
+      bmewburn.vscode-intelephense-client
+      christian-kohler.path-intellisense
+      dart-code.dart-code
+      dart-code.flutter
+      esbenp.prettier-vscode
+      foxundermoon.shell-format
+      github.vscode-github-actions
+      github.vscode-pull-request-github
+      usernamehw.errorlens
+      vincaslt.highlight-matching-tag
+      vscode-icons-team.vscode-icons
+      golang.go
+      davidanson.vscode-markdownlint
+      bbenoist.nix
+      brettm12345.nixfmt-vscode
+      yzhang.markdown-all-in-one
+      xdebug.php-debug
+      github.copilot
+      github.copilot-chat
+    ];
+    #   ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+    #     {
+    #       name = "warpnet.salt-lint";
+    #       publisher = "warpnet";
+    #       version = "latest";
+    #     }
+    #     {
+    #         name = "mguellsegarra.highlight-on-copy";
+    #         publisher = "mguellsegarra";
+    #         version = "latest";
+    #     }
+    #   ];
+  };
+}

config/home-manager/vscode.nix

@@ -1,53 +0,0 @@
-{ pkgs, ... }:
-{
-  programs = {
-    home-manager.enable = true;
-
-    vscode = {
-      enable = true;
-      mutableExtensionsDir = true; 
-      extensions = with pkgs.vscode-extensions; [
-        ms-azuretools.vscode-docker
-        ms-vscode-remote.remote-containers
-        ms-vscode-remote.remote-ssh
-        ms-vscode-remote.remote-ssh-edit
-        ms-vscode.makefile-tools
-        ms-vsliveshare.vsliveshare
-        bbenoist.nix
-        aaron-bond.better-comments
-        alexisvt.flutter-snippets
-        bmewburn.vscode-intelephense-client
-        christian-kohler.path-intellisense
-        dart-code.dart-code
-        dart-code.flutter
-        esbenp.prettier-vscode
-        foxundermoon.shell-format
-        github.vscode-github-actions
-        github.vscode-pull-request-github
-        usernamehw.errorlens
-        vincaslt.highlight-matching-tag
-        vscode-icons-team.vscode-icons
-        golang.go
-        davidanson.vscode-markdownlint
-        bbenoist.nix
-        brettm12345.nixfmt-vscode
-        yzhang.markdown-all-in-one
-        xdebug.php-debug
-        github.copilot
-        github.copilot-chat
-      ]; 
-    #   ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-    #     {
-    #       name = "warpnet.salt-lint";
-    #       publisher = "warpnet";
-    #       version = "latest";
-    #     }
-    #     {
-    #         name = "mguellsegarra.highlight-on-copy";
-    #         publisher = "mguellsegarra";
-    #         version = "latest";
-    #     }
-    #   ];
-    };
-  };
-}

config/nixos/configuration.nix

@@ -7,6 +7,7 @@
     ./virtualization.nix
     ./users.nix
     ./flatpak.nix
+    ./hosts.nix
   ];
 
   # Bootloader.

config/nixos/hosts.nix

@@ -0,0 +1,11 @@
+{ ... }:
+{
+  networking.extraHosts = ''
+    127.0.0.1 subsites.local
+    127.0.0.1 discountoffice.nl.local
+    127.0.0.1 discountoffice.be.local
+    127.0.0.1 fr.discountoffice.be.local
+    127.0.0.1 api.local
+    127.0.0.1 mailpit.local
+  '';
+}

config/nixos/virtualization.nix

@@ -4,6 +4,10 @@
   virtualisation = {
     docker = {
       enable = true;
+      autoPrune.enable = true;
+      daemon.settings = {
+        "live-restore" = false;
+      };
     };
 
     libvirtd = {

secrets/openai_api_key.secret.gpg

@@ -1,9 +1,9 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMKoynZX3wBvAj/0sAJAWbvGl//KUesv3/CJ0sEYRMunMgT6N4hhFh+YL7G
+jA0ECQMIGkUSNyEsjuH/0sALAet9kS0xOgaXyqLfnzCwi64UL0JQ0v82P2Hjp8rr
-f30+XuKqw7iqkcbWkTQd9tfGtQjlL1B6Z8d1aytFTa5C5qudDqll3JPh3dOlMqAb
+VrbeXvStejlhL26UOpWclt/QMlMmIR4Rep10xir0VSqWMZHwpxLu16vOwK3zqFue
-ajr5RZzSvamwxRwZVsfcZwch6CPNIb2oT7+33Vszz7U7ZYGOJoNXyAZ88GXT/SB5
+oU8OYWffDMZC8V6vEkkEUt49wjKYN1NSYuubg/pppO1p6uPkm5rEHH41PWmpuOCt
-BSfTuRNxRwL13BQEw84A34K5Z7jeO+w3of9sc1bnVhE7HiYi4iRZ8s/9Z25QQwNP
+OcIm3HTQYprwqpYW5d55yZkd9qO8F+BZmFSxH1FZ+DDY+yM4piJSzYnmAm5HTs3j
-zUU1vPiIr13OC7horCbLQibAkcheniY4xheg
+OyGWb01lCzPjcegZ2UG55P6RBK9iGPxKh322LFY=
-=LOVN
+=K6/A
 -----END PGP MESSAGE-----

secrets/ssh_config/dev.conf.gpg

@@ -1,12 +1,12 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMKkTq/rJ/LhLT/0sCRAW8S+L7VkMGcYTTE/r8+T6//sUoRPuKLgq3DmZzx
+jA0ECQMItoNYwTF6ZEr/0sCTAVkgeNCtPH223n04njPy1Dd4/XprIOp/rX6iv3rg
-BV97URPpwiokBiBr7o/fkJ/IXsYH8pYWd8AmOVwt0N6rkGGTg6TVU3ugPYuZ+pGV
+EkS/WqVWo5NNkL2/H6QJUxlVqBGpUgZ+V2sPhcLVZFVA9ZcNvx8LGSRvgUwsaKe6
-OMNR2tvG1K0boyE2No2Jj4JhuAskqMAqjKP47qAi+N9pahCwb/l1/CnO7AfeQ9lA
+bDAMhqk+tySiGdZhBLUynqhUzM3SqYIRVaezcURYGqVAg6t14WmcyIj2SW8GNJ63
-udJqxKlNNaabYeWbsSbzwZUq5BmkMROiNsC4nTvRJQi65BRNLljwTucMmeP40ZWF
+fELLvRuvdZX7+XvEMlJSRMA28cWy6hHyIlVBo/bq9gpOSlRo8t3NTIPprLcGg9wC
-IGoybJFeCoz4GcXu3G6A4xoja+EZH01CwHaDRectIxw1VFHPi9ZbxCFiFFR4QsaA
+xnTNRIOV4oLuM/0wnEn6ZHG6LdimHf2QDvF8q+lFo1dGlDUCdv/74cle42Jdki5G
-2+y3QUVsnQoRsBmiNiwPYC9s3IorOZ/bNiJc+LjjHOxQFaRp9L+KEMdpiFacUB/w
+3FOTRNM/l76wiKNX90H8xy5G+ze6Yjzwp4bq8W5sERaYxpyqhWU5wEWtHx9nV32C
-ZHo4fY5O8SqdmmWWRH/x3yPN5Db3P8PMKOUnxlHEHcC54t/ItSbi+IqdR5hM1CnS
+ANUCv42ItywohMNfYtjWOEjt8S3aCt4gtVoBUofSPC4f/AvfELhobTd9LzLXGffm
-9vHbvOzpndl2dsMKHfJDb0eVFg==
+c6U+rjMDS9QaX6bdggkl9dWFP7Cb
-=owYw
+=ehVH
 -----END PGP MESSAGE-----

secrets/ssh_config/personal.conf.gpg

@@ -1,11 +1,11 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMKbRefi4et/1T/0sBbAaB7hynuD/3PbWlMm4MgfGM2MwwqkYkov9ezeKKx
+jA0ECQMIr3309SR692H/0sBdAR8p3UqsDCSwoGFTb/XaYdj0V3fcPvRx3WSorDXv
-C7W4IHOHaJgUOcZQ0cCHC1SAcX/lM44rw7+lU3DkDAxGPifpRuRAdCGgElwxjZEy
+mTz70KI8MMw3R5Re/m4U/h34mHfi9rHC2wCsPbxQWqTZojONnwrsgPfQKqKcghb1
-m23teR7BsoNn/dgsWE0HxOHmcrk0wpPC6Zg5O5jrL/9BPSmyxVPqSmgcGYpHAUq9
+Jbaecf1Ft+NjrGwpY1Y0zIgkJeT5K9VJyZ492vXrIWlahi/f/W3dCyszcPNC5Efv
-ir+ttv7jGzTSOCazcZbDzXIjIUmhLnKypyXV0vCBBHzRzV6agWAWT9pXZkLgyRVG
+AsCaCWQC9TGz/7rbIsG8JR42sUwZ1b4XiogeMUqgbeiYqYIY6VlUCYFZryNwp4Zk
-tx4VUqzC0OT1qpXWkMxmhTFS5vHNltMRBQ5OzJpztXYeRdq3+2fdKrWBtFeF7GHE
+sj1mfmuptrl3w+psxEajTNYTMahyOC83zd8EFtPxmvEbodj+cjmn5S6gcefS62e6
-WEIoVBugsBhhwl+05auoLzQ4LrJaDKMlW9xt3Js1Fl4jgRgWCqhC6thTjdRfdrtl
+fDsLJhQYkTFQgTApjNP3TxTEZHkZLUeDW+KKRYUHp2KTKqieLR83Vu+ZC4tbMVzm
-w0553qkrogD0Vq9/hg==
+E+wOhfTOrdUzfD2cv0uw
-=nkFz
+=n+C/
 -----END PGP MESSAGE-----

secrets/ssh_config/prod.conf.gpg

@@ -1,12 +1,12 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMK4/iYhbHcAZD/0sB/AaFBcKC7WWo1kb0EQc41tQUtf80Sw1R1LB8EH2sV
+jA0ECQMIOYEuPqJHDbL/0sCAAehDOUC0rY1ZOyrLVGQsNVZiRWHDpgYvwsnSt4Tf
-aXK/YUnoMjkz3pU9cmOJjy3cywmldLakZZzYxQDROUDC483fzdKPjjHtTzG1/eqg
+/gjDi6mTw4usylH2AFQwYbcSIxgeJVdw4ia2fKZQnBEkKhWMwHO1FL3uUg2FJCec
-QIwBcdFvFJD1976pvS9CzQ/XRStZaWoVBTAkwVoUXRyBW6pMzkecy+lcqVdDR0DO
+IvEZBfCxbcHx79T5hPQHHdE8eNPDqk2IIX9cxyhsgV6VsVYXpfInbv2Th5Jh4ZE1
-VZNGR19zzZ4XvX0oMUBKEkS7wpzZabTTnTDmVHFdl5xU23Cj8F+CCyKEhSqVQZGk
+mum8yA075TiOckPsNrO7yAA9ncQYEiDb02VjkCEe3/xrNKrYR5mojRNOVDkISvfx
-VsWC5eD69f9kBm467jLizxnS8kjKzTX3o+N7BQB0DwAQcPw1XmTPXQwAoOrRomRa
+aAGoGWloiZY301p3cnbNWZPrdWAKN+yK8EPKRH0iCqYEsEFDOO8UMhFUhkkzuqYl
-EBR09mlBo62qJw0Jt8JAINGxopLcgRQqTsoqGItV9+Gx2oCxDXAnyQpGwvi0xOwb
+Ap96gc7ChBlG7wdpzMgW3kFUlcPNXwDSpmHce70kL2s6KOHMTPqeW9hVpmnHyQnp
-gLB6p2S6wX4dx7MEObiC+JR/59V/ZnAnjkJ9+U+31hmRfOwVGkmd8z8MhreqiN5w
+yPcKXYV7hBg4eFE93k2bxXTHDupz8Y2sjMPGqftACaK/lzbwGs20VJ1NJpHnd0K8
-1w==
+wAw=
-=xEm4
+=mlw+
 -----END PGP MESSAGE-----