fix: error in nix version when updating flake

see: https://github.com/DeterminateSystems/update-flake-lock/issues/120

.github/workflows/update.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Add Nix Cache
         uses: DeterminateSystems/magic-nix-cache-action@v6
       - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v21
+        uses: DeterminateSystems/update-flake-lock@v23
         id: update
         with:
           pr-title: "Update flake.lock" # Title of PR to be created

flake.lock

@@ -87,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718662658,
+        "lastModified": 1719845423,
-        "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=",
+        "narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf",
+        "rev": "ec12b88104d6c117871fad55e931addac4626756",
         "type": "github"
       },
       "original": {
@@ -108,11 +108,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718846788,
+        "lastModified": 1719864345,
-        "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=",
+        "narHash": "sha256-e4Pw+30vFAxuvkSTaTypd9zYemB/QlWcH186dsGT+Ms=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e",
+        "rev": "544a80a69d6e2da04e4df7ec8210a858de8c7533",
         "type": "github"
       },
       "original": {
@@ -145,11 +145,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718930737,
+        "lastModified": 1719881223,
-        "narHash": "sha256-+nKJ/VP6X+hirXqRry3GzdNn4OJvOdB4nRnJY22ixFw=",
+        "narHash": "sha256-9eaxGGPw7hIuZ4OaqOyKec262t+TCie0p83tlzkMEpc=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "087919070dffc9798a8cb753e97babe287f06c25",
+        "rev": "407f201936424ec061d33aa687e7978ae7873b5c",
         "type": "github"
       },
       "original": {
@@ -267,11 +267,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718983978,
+        "lastModified": 1719827439,
-        "narHash": "sha256-lp6stESwTLBZUQ5GBivxwNehShmBp4jqeX/1xahM61w=",
+        "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c559542f0aa87971a7f4c1b3478fe33cc904b902",
+        "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
         "type": "github"
       },
       "original": {
@@ -304,55 +304,72 @@
         "type": "github"
       }
     },
+    "markview-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1719592662,
+        "narHash": "sha256-E1lHSjbnOOIeieaFJ+INvxJHCbfVS3mwbQ6wrlKeGSQ=",
+        "owner": "OXY2DEV",
+        "repo": "markview.nvim",
+        "rev": "f60219dce7283192d549f21847fcf8537bf6d260",
+        "type": "github"
+      },
+      "original": {
+        "owner": "OXY2DEV",
+        "repo": "markview.nvim",
+        "type": "github"
+      }
+    },
     "nextcloud-cookbook": {
       "flake": false,
       "locked": {
-        "lastModified": 1702545935,
+        "lastModified": 1719431638,
-        "narHash": "sha256-19LN1nYJJ0RMWj6DrYPvHzocTyhMfYdpdhBFch3fpHE=",
+        "narHash": "sha256-a8ekMnEzudHGiqHF53jPtgsVTOTc2QLuPg6YtTw5h68=",
         "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
+        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
+        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
       }
     },
     "nextcloud-external": {
       "flake": false,
       "locked": {
-        "lastModified": 1699624334,
+        "lastModified": 1710338675,
-        "narHash": "sha256-RCL2RP5twRDLxI/KfAX6QLYQOzqZmSWsfrC5ZQIwTD4=",
+        "narHash": "sha256-bJJ/dVmE1o04QCyrxD0sko0okRsnxJmT6sOTOmBiifs=",
         "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
       }
     },
     "nextcloud-news": {
       "flake": false,
       "locked": {
-        "lastModified": 1703426420,
+        "lastModified": 1718102703,
-        "narHash": "sha256-AENBJH/bEob5JQvw4WEi864mdLYJ5Mqe78HJH6ceCpI=",
+        "narHash": "sha256-XNGjf7SWgJYFdVNOh3ED0jxSG0GJwWImVQq4cJT1Lo4=",
         "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
+        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
+        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
       }
     },
     "nextcloud-snappymail": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-7oJEJ6t6iS/pcnSHashf1AkOEf+gKizpQHBy9XwY4Yo=",
+        "lastModified": 1720361351,
-        "type": "file",
+        "narHash": "sha256-HlqO7xlMSRGgBtwi0t5oz5v7iw0zTSHysc9wGVRwGZI=",
-        "url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz"
+        "type": "tarball",
+        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.36.4-nextcloud.tar.gz"
       },
       "original": {
-        "type": "file",
+        "type": "tarball",
-        "url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz"
+        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.36.4-nextcloud.tar.gz"
       }
     },
     "nix2vim": {
@@ -378,11 +395,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1712450863,
+        "lastModified": 1719708727,
-        "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=",
+        "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f",
+        "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6",
         "type": "github"
       },
       "original": {
@@ -399,11 +416,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718025593,
+        "lastModified": 1719841141,
-        "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=",
+        "narHash": "sha256-WOyohxFJJdfDvEB7N3eTcX44lNU2rZes1inHsyHL7mM=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3",
+        "rev": "140dcc2b9a0eb87ba5e9011076a1a7af19179ab1",
         "type": "github"
       },
       "original": {
@@ -414,11 +431,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1718895438,
+        "lastModified": 1719848872,
-        "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=",
+        "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3",
+        "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
         "type": "github"
       },
       "original": {
@@ -446,11 +463,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1719001822,
+        "lastModified": 1719925604,
-        "narHash": "sha256-rbEP1CTzYvdSAKf1a729De9t8GMIrZ5GmD+PdYCnrgg=",
+        "narHash": "sha256-cLmqi+P1sn+7497GS4fNWayoTDa0ZiJecjmEM4iQN9U=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "e7edcaeae9db01224266febe88eb7d3411055636",
+        "rev": "574405811547dcec59e912c5e82bfd224648bd5e",
         "type": "github"
       },
       "original": {
@@ -462,11 +479,11 @@
     "nvim-lint-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1717789608,
+        "lastModified": 1719415114,
-        "narHash": "sha256-LNYFxAM9lQNNOIOc+IgKgbSRp2U09B/9HivSCwMyUpQ=",
+        "narHash": "sha256-a9Mfoi1NzQ3b1w1VUqqJZddyCZYyacRnc128t5X3Wb0=",
         "owner": "mfussenegger",
         "repo": "nvim-lint",
-        "rev": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce",
+        "rev": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0",
         "type": "github"
       },
       "original": {
@@ -495,11 +512,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1717900986,
+        "lastModified": 1719107085,
-        "narHash": "sha256-7KO3wPW65IH4m0jEoyFScNiAVwrlNHU+p0H55AuwlWk=",
+        "narHash": "sha256-RfrbxYD7RYBEy/grSYnKKkWd4BHxGYEFeLiDB5OYGpg=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "2086e564c4d23fea714e8a6d63b881e551af2f41",
+        "rev": "8b2c5c678be4b49dff6a2df794877000113fd77b",
         "type": "github"
       },
       "original": {
@@ -511,11 +528,11 @@
     "nvim-treesitter-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1718957498,
+        "lastModified": 1719904131,
-        "narHash": "sha256-GEuKEAZxLGMkyjdJGzrIKNR1X10RHlACC6s1lNOq7aw=",
+        "narHash": "sha256-RbTBilXbgMFfwkbIyLMZuZw1DyzDol7g0V6uu4MaEh0=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter",
-        "rev": "b967bbc27b564001c3d3b8ea93444cf6d0b21d23",
+        "rev": "e0d6c7643dc953acc2e817d0cebfc2f1f8c008e1",
         "type": "github"
       },
       "original": {
@@ -570,6 +587,7 @@
         "hmts-nvim-src": "hmts-nvim-src",
         "home-manager": "home-manager",
         "mac-app-util": "mac-app-util",
+        "markview-nvim-src": "markview-nvim-src",
         "nextcloud-cookbook": "nextcloud-cookbook",
         "nextcloud-external": "nextcloud-external",
         "nextcloud-news": "nextcloud-news",
@@ -585,6 +603,7 @@
         "nvim-treesitter-src": "nvim-treesitter-src",
         "ren": "ren",
         "rep": "rep",
+        "stu": "stu",
         "telescope-nvim-src": "telescope-nvim-src",
         "telescope-project-nvim-src": "telescope-project-nvim-src",
         "toggleterm-nvim-src": "toggleterm-nvim-src",
@@ -600,6 +619,22 @@
         "zenyd-mpv-scripts": "zenyd-mpv-scripts"
       }
     },
+    "stu": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1720424134,
+        "narHash": "sha256-c6nLQOhwztwnUfKLx69Le9pCHE0GtruqKMnvYpGyr+0=",
+        "owner": "lusingander",
+        "repo": "stu",
+        "rev": "279edc8d63c04b42773434bf8c6f2744a66d71a8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lusingander",
+        "repo": "stu",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -835,11 +870,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718710563,
+        "lastModified": 1719220171,
-        "narHash": "sha256-O4rrM0Bkh3IRe8D600iniQ52QTmlnuTSp2KyXV7C2jE=",
+        "narHash": "sha256-xywM6JoGT8AwfoOFJBTv8GRlvNu8LYqqqMS/OQ6uCgE=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "2fb93bea657ad99a7005ef601c67cb2820560a41",
+        "rev": "269411cfed6aab694e46f719277c972de96177bb",
         "type": "github"
       },
       "original": {

flake.nix

@@ -127,6 +127,10 @@
       url = "github:mfussenegger/nvim-lint";
       flake = false;
     };
+    markview-nvim-src = {
+      url = "github:OXY2DEV/markview.nvim";
+      flake = false;
+    };
 
     # Tree-Sitter Grammars
     tree-sitter-bash = {
@@ -174,26 +178,33 @@
       flake = false;
     };
 
+    # Stu - TUI for S3
+    stu = {
+      url = "github:lusingander/stu";
+      flake = false;
+    };
+
     # Nextcloud Apps
     nextcloud-news = {
       # https://github.com/nextcloud/news/releases
-      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz";
+      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz";
       flake = false;
     };
     nextcloud-external = {
       # https://github.com/nextcloud-releases/external/releases
-      url = "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz";
+      url = "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz";
       flake = false;
     };
     nextcloud-cookbook = {
       # https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
-      url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz";
+      url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz";
       flake = false;
     };
     nextcloud-snappymail = {
       # https://github.com/the-djmaze/snappymail/releases
       # https://snappymail.eu/repository/nextcloud
-      url = "file+https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz";
+      url = "https://snappymail.eu/repository/nextcloud/snappymail-2.36.4-nextcloud.tar.gz";
+      # url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
       flake = false;
     };
   };
@@ -248,6 +259,7 @@
         (import ./overlays/betterlockscreen.nix)
         (import ./overlays/gh-collaborators.nix)
         (import ./overlays/ren-rep.nix inputs)
+        (import ./overlays/stu.nix inputs)
       ];
 
       # System types to support.

modules/common/applications/kitty.nix

@@ -34,10 +34,13 @@
       programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux (lib.mkDefault "${pkgs.kitty}/bin/kitty");
 
       # Display images in the terminal
-      programs.fish.shellAliases = {
+      programs.fish.interactiveShellInit = # fish
-        icat = "kitty +kitten icat";
+        ''
-        ssh = "kitty +kitten ssh";
+          if test "$TERM" = "xterm-kitty"
-      };
+              alias icat="kitty +kitten icat"
+              alias ssh="kitty +kitten ssh"
+          end
+        '';
 
       programs.kitty = {
         enable = true;

modules/common/neovim/config/misc.nix

@@ -10,7 +10,7 @@
     pkgs.vimPlugins.vim-eunuch # File manipulation commands
     pkgs.vimPlugins.vim-fugitive # Git commands
     pkgs.vimPlugins.vim-repeat # Better repeat using .
-    pkgs.vimPlugins.glow-nvim # Markdown preview popup
+    pkgs.vimPlugins.markview-nvim # Markdown preview
     pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
     pkgs.vimPlugins.which-key-nvim # Keybind helper
   ];
@@ -21,7 +21,7 @@
       names = false;
     };
   };
-  setup.glow = { };
+  setup.markview = { };
   setup.which-key = { };
 
   vim.o = {
@@ -57,8 +57,8 @@
 
   # Better backup, swap and undo storage
   vim.o.backup = true; # Easier to recover and more secure
-  vim.bo.swapfile = false; # Instead of swaps, create backups
+  vim.opt.undofile = true; # Keeps undos after quit
-  vim.bo.undofile = true; # Keeps undos after quit
+  vim.opt.swapfile = false; # Instead of swaps, create backups
   vim.o.backupdir = dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/backup//")'';
   vim.o.undodir = dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/undo//")'';
 

modules/common/neovim/config/toggleterm.nix

@@ -14,11 +14,6 @@
     open_mapping = dsl.rawLua "[[<c-\\>]]";
     hide_numbers = true;
     direction = "float";
-    float_opts = {
-      width = dsl.rawLua "vim.o.columns - 4";
-      height = dsl.rawLua "vim.o.lines - 4";
-      row = 0;
-    };
   };
 
   lua = ''

modules/common/neovim/lua/keybinds.lua

@@ -71,8 +71,8 @@ key("n", "co", ":copen<CR>")
 key("n", "cq", ":cclose<CR>")
 
 -- Other
-key("n", "<A-CR>", ":noh<CR>", { silent = true })           --- Clear search in VimWiki
+key("n", "<A-CR>", ":noh<CR>", { silent = true }) --- Clear search in VimWiki
-key("n", "Y", "y$")                                         --- Copy to end of line
+key("n", "Y", "y$") --- Copy to end of line
 key("v", "<C-r>", "y<Esc>:%s/<C-r>+//gc<left><left><left>") --- Substitute selected
-key("v", "D", "y'>gp")                                      --- Duplicate selected
+key("v", "D", "y'>gp") --- Duplicate selected
-key("x", "<Leader>p", '"_dP')                               --- Paste but keep register
+key("x", "<Leader>p", '"_dP') --- Paste but keep register

modules/darwin/utilities.nix

@@ -27,12 +27,14 @@
       pkgs.awscli2
       pkgs.ssm-session-manager-plugin
       pkgs.awslogs
+      pkgs.stu # TUI for AWS S3
       pkgs.google-cloud-sdk
       pkgs.vault-bin
       pkgs.consul
       pkgs.noti # Create notifications programmatically
       pkgs.ipcalc # Make IP network calculations
       pkgs.teams
+      pkgs.cloudflared # Allow connecting to Cloudflare tunnels
       (pkgs.writeShellApplication {
         name = "ocr";
         runtimeInputs = [ pkgs.tesseract ];

modules/nixos/hardware/mouse.nix

@@ -21,5 +21,15 @@
       accelProfile = "flat";
       accelSpeed = "1.15";
     };
+
+    # Cursor
+    home-manager.users.${config.user}.home.pointerCursor = {
+      name = "Adwaita";
+      package = pkgs.gnome3.adwaita-icon-theme;
+      size = 24;
+      gtk.enable = true;
+      x11.enable = true;
+    };
+
   };
 }

modules/nixos/services/caddy.nix

@@ -91,8 +91,16 @@
       );
     };
 
-    # Allows Caddy to serve lower ports (443, 80)
+    systemd.services.caddy.serviceConfig = {
-    systemd.services.caddy.serviceConfig.AmbientCapabilities = "CAP_NET_BIND_SERVICE";
+
+      # Allows Caddy to serve lower ports (443, 80)
+      AmbientCapabilities = "CAP_NET_BIND_SERVICE";
+
+      # Prevent flooding of logs by rate-limiting
+      LogRateLimitIntervalSec = "5s"; # Limit period
+      LogRateLimitBurst = 100; # Limit threshold
+
+    };
 
     # Required for web traffic to reach this machine
     networking.firewall.allowedTCPPorts = [

modules/nixos/services/grafana.nix

@@ -885,6 +885,28 @@ in
                               }
                             ];
                           }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:8086";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "InfluxDB";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.influxdb}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
                           {
                             matcher = {
                               id = "byName";
@@ -929,6 +951,28 @@ in
                               }
                             ];
                           }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:9000";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "The Lounge";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.irc}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
                           {
                             matcher = {
                               id = "byName";
@@ -2321,7 +2365,7 @@ in
                       datasourceUid = promUid;
                       model = {
                         editorMode = "code";
-                        expr = ''systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active"}'';
+                        expr = ''systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active", job!="tempest"}'';
                         hide = false;
                         instant = true;
                         intervalMs = 1000;
@@ -2418,7 +2462,7 @@ in
                   execErrState = "Error";
                   for = "5m";
                   annotations = {
-                    description = "Cloudflare Tunnel for {{ $job }}.";
+                    description = "Cloudflare Tunnel for {{ index $labels \"job\" }}.";
                     summary = "Cloudflare Tunnel is down.";
                   };
                   isPaused = false;

modules/nixos/services/nextcloud.nix

@@ -26,6 +26,8 @@
         trusted_domains = [ config.hostnames.content ];
         trusted_proxies = [ "127.0.0.1" ];
         maintenance_window_start = 4; # Run jobs at 4am UTC
+        log_type = "file";
+        loglevel = 1; # Include all actions in the log
       };
       extraAppsEnable = true;
       extraApps = {

modules/nixos/services/victoriametrics.nix

@@ -38,6 +38,10 @@ in
 
   config = {
 
+    services.victoriametrics.extraOptions = [
+      "-promscrape.config=${(pkgs.formats.yaml { }).generate "scrape.yml" prometheusConfig}"
+    ];
+
     systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable {
       description = "VictoriaMetrics basic auth proxy";
       after = [ "network.target" ];

modules/nixos/system/journald.nix

@@ -4,7 +4,10 @@
   # How long to keep journalctl entries
   # This helps to make sure log disk usage doesn't grow too unwieldy
   services.journald.extraConfig = ''
-    SystemMaxUse=100M
+    SystemMaxUse=4G
+    SystemKeepFree=10G
+    SystemMaxFileSize=128M
+    SystemMaxFiles=500
     MaxFileSec=1month
     MaxRetentionSec=2month
   '';

overlays/neovim-plugins.nix

@@ -38,5 +38,6 @@ in
     base16-nvim = plugin "base16-nvim" inputs.base16-nvim-src;
     baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
     hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src;
+    markview-nvim = plugin "markview-nvim" inputs.markview-nvim-src;
   };
 }

overlays/stu.nix

@@ -0,0 +1,17 @@
+inputs: _final: prev: {
+
+  stu = prev.rustPlatform.buildRustPackage {
+    pname = "stu";
+    version = "0.5.0";
+    src = inputs.stu;
+    cargoHash = "sha256-gUolS7HXkTddxDWDGir4YC+2tJjgB/CCQC49SSRaR6U=";
+    buildInputs =
+      if prev.stdenv.isDarwin then
+        [
+          prev.darwin.apple_sdk.frameworks.CoreGraphics
+          prev.darwin.apple_sdk.frameworks.AppKit
+        ]
+      else
+        [ ];
+  };
+}