From 4d5b8c30656e4815fb00cd40bb71244b7702c9bf Mon Sep 17 00:00:00 2001 From: Peter Esselius Date: Sat, 2 Nov 2024 22:49:29 +0100 Subject: [PATCH] changes --- darwin-modules/linux-builder.nix | 6 ++++++ home-modules/neovim.nix | 8 +++++++- home-modules/profiles/tools/common.nix | 3 +++ nixos-configurations/vm.nix | 3 +++ nixos-modules/profiles/default.nix | 1 + nixos-modules/sysdig.nix | 3 +++ 6 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 nixos-modules/sysdig.nix diff --git a/darwin-modules/linux-builder.nix b/darwin-modules/linux-builder.nix index 1dca7f9..6247aea 100644 --- a/darwin-modules/linux-builder.nix +++ b/darwin-modules/linux-builder.nix @@ -4,6 +4,10 @@ maxJobs = 4; ephemeral = true; config = { + imports = [ + ../nixos-modules/user-peteresselius.nix + ../nixos-modules/sysdig.nix + ]; virtualisation = { darwin-builder = { diskSize = 100 * 1024; @@ -11,6 +15,8 @@ }; cores = 8; }; + + nixpkgs.config.allowUnsupportedSystem = true; }; }; } diff --git a/home-modules/neovim.nix b/home-modules/neovim.nix index f745c6a..1f847e7 100755 --- a/home-modules/neovim.nix +++ b/home-modules/neovim.nix @@ -37,6 +37,8 @@ in gitblame.enable = true; + gitgutter.enable = true; + indent-o-matic.enable = true; which-key.enable = true; @@ -75,6 +77,10 @@ in }; }; - colorschemes.catppuccin.enable = true; + colorschemes.gruvbox.enable = true; + }; + + programs.fish.shellAbbrs = { + vim = "nvim"; }; } diff --git a/home-modules/profiles/tools/common.nix b/home-modules/profiles/tools/common.nix index 53074ed..8b667aa 100644 --- a/home-modules/profiles/tools/common.nix +++ b/home-modules/profiles/tools/common.nix @@ -39,5 +39,8 @@ attic-server attic-client nmap + postgresql + killall + file ]; } diff --git a/nixos-configurations/vm.nix b/nixos-configurations/vm.nix index 3ebce3a..7098176 100644 --- a/nixos-configurations/vm.nix +++ b/nixos-configurations/vm.nix @@ -12,6 +12,7 @@ ezModules.hardware-vm ezModules.sshd ezModules.user-peteresselius + ezModules.sysdig ]; programs.nix-ld.enable = true; @@ -20,4 +21,6 @@ nix.settings.sandbox = "relaxed"; virtualisation.docker.enable = true; + + nixpkgs.config.allowUnsupportedSystem = true; } diff --git a/nixos-modules/profiles/default.nix b/nixos-modules/profiles/default.nix index f00ab65..0c2f218 100644 --- a/nixos-modules/profiles/default.nix +++ b/nixos-modules/profiles/default.nix @@ -1,6 +1,7 @@ { imports = [ ./auth.nix + ./ingress.nix ./monitoring.nix ./smarthome.nix ]; diff --git a/nixos-modules/sysdig.nix b/nixos-modules/sysdig.nix new file mode 100644 index 0000000..65864d2 --- /dev/null +++ b/nixos-modules/sysdig.nix @@ -0,0 +1,3 @@ +{ + programs.sysdig.enable = true; +}