diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix
index b5b498f..00de886 100644
--- a/hosts/hermit/programs.nix
+++ b/hosts/hermit/programs.nix
@@ -9,6 +9,7 @@
alsa-utils
anki
asciinema
+ brave
cachix
calc
# calibre
@@ -52,6 +53,7 @@
ncmpcpp
neofetch
networkmanagerapplet
+ nextcloud-client
nicotine-plus
nil
nitch
diff --git a/modules/services/forgejo/module.nix b/modules/services/forgejo/module.nix
index 079441c..a09f987 100644
--- a/modules/services/forgejo/module.nix
+++ b/modules/services/forgejo/module.nix
@@ -33,9 +33,19 @@ in {
services.nginx = {
enable = true;
virtualHosts.${domain} = {
- addSSL = true;
- enableACME = true;
+ forceSSL = true;
+ # enableACME = true;
+ useACMEHost = domain;
+ inherit acmeRoot;
+ extraConfig = ''
+ # nginx defaults to a 1MB size limit for uploads, which
+ # *definitely* isn't enough for Git LFS.
+ # 'client_max_body_size 300m;' would set a limit of 300MB
+ # setting it to 0 means "no limit"
+ client_max_body_size 512M;
+ '';
locations."/" = {
+ recommendedProxySettings = true;
proxyPass = "http://localhost:${toString port}";
};
};
diff --git a/modules/services/nginx/module.nix b/modules/services/nginx/module.nix
index 67e958a..63fcef0 100644
--- a/modules/services/nginx/module.nix
+++ b/modules/services/nginx/module.nix
@@ -27,10 +27,6 @@ in {
recommendedProxySettings = true;
recommendedZstdSettings = true;
- # nginx defaults to a 1MB size limit for uploads, which
- # *definitely* isn't enough for Git LFS.
- # 'client_max_body_size 300m;' would set a limit of 300MB
- # setting it to 0 means "no limit"
clientMaxBodySize = mkDefault "512m";
};
};
diff --git a/modules/wms/wayland/hyprland/settings.nix b/modules/wms/wayland/hyprland/settings.nix
index bab7083..03314fd 100644
--- a/modules/wms/wayland/hyprland/settings.nix
+++ b/modules/wms/wayland/hyprland/settings.nix
@@ -35,7 +35,7 @@ in {
input = {
kb_layout = "us,ru";
kb_variant = ",phonetic_winkeys";
- kb_options = "grp:rctrl_rshift_toggle, compose:102";
+ kb_options = "grp:rctrl_rshift_toggle,";
follow_mouse = true;
@@ -57,8 +57,6 @@ in {
no_border_on_floating = true;
};
- ecosystem.no_update_news = true;
-
plugin = {
hyprsplit = {
num_workspaces = 10;
diff --git a/packages/helix.nix b/packages/helix.nix
index 763c8b0..eb91eb6 100644
--- a/packages/helix.nix
+++ b/packages/helix.nix
@@ -1,6 +1,7 @@
{
symlinkJoin,
makeWrapper,
+ helix,
alejandra,
basedpyright,
bash-language-server,
@@ -15,7 +16,6 @@
gdb,
golangci-lint-langserver,
gopls,
- helix,
lazygit,
lib,
lldb_19,
@@ -30,7 +30,6 @@
solargraph,
stdenv,
superhtml,
- taplo,
tinymist,
typescript-language-server,
vscode-langservers-extracted,
@@ -277,30 +276,38 @@
wrapped-helix = symlinkJoin {
name = "helix-wrapped";
paths = [
- # Bash
- bash-language-server
- # C/C++
- clang-tools
- clippy
- golangci-lint-langserver
- gopls
helix
- lldb_19
- # Markdown
- marksman
- # Nix
- nil
+
rust-analyzer
rustfmt
+ clippy
+ # typst lsp
+ tinymist
+
+ # C/C++
+ clang-tools
+
+ # Markdown
+ marksman
+
+ # Nix
+ nil
+ lldb_19
+ # Bash
+ bash-language-server
+
# Shell
shellcheck
- superhtml
- # toml
- taplo
- # typst
- tinymist
- # typst lsp
+
+ # ruby
+ solargraph
+
+ gopls
+ golangci-lint-langserver
+
vscode-langservers-extracted
+
+ superhtml
];
buildInputs = [makeWrapper];
postBuild = ''
diff --git a/packages/shell/packages.nix b/packages/shell/packages.nix
index b5c7abf..7d31b6b 100644
--- a/packages/shell/packages.nix
+++ b/packages/shell/packages.nix
@@ -51,7 +51,6 @@ builtins.attrValues {
onefetch
wget
cpufetch
- watchman
yt-dlp
tealdeer
hyperfine
diff --git a/website/blog/01-BGP.txt b/website/blog/01-BGP.txt
deleted file mode 100644
index 72b0dea..0000000
--- a/website/blog/01-BGP.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-
-TODO:
-eBGP/iBGP session
-Graphs
-
-/**********************************************/
-/* A no-bullshit guide to a bullshit protocol */
-/**********************************************/
- We can think of the Internet as a network of networks which are all connected in some way. We will refer to these networks as Autonomous Systems(AS) in this article.
-
-Now, how do we connect these AS's in a sane way? This is where BGP comes in. BGP, which stands for `Border Gateway Protocol`, enables different AS's to exchange information with each other, e.g. communicating with each other.
-
-There are three main challenges BGP has to solve:
- - Scalability: The Internet is BIG. BGP needs to scale well to be feasible in a large scale.
- - Privacy: Networks don't want to divulge internal topologies (topology = how a network is structured)
- - Policy enforcement: The Networks themselves need to have control over where to send and recieve traffic.
-
-Other protocols, like Link-Sate routing, do not solve these challenges.
-
-BGP's key concept, which it revolves about, is called *path-vector routing*, where it adertises the entire AS-level path.
-Now, what is an AS-level path? We'll get to that in a minute.
-
-Before that, why do we need even BGP? The problem is that sending data over the internet costs money. If we want to minimize the costs of sending data, we need to find routes which cost as little as possible. This is also why BGP is a "follow the money" protocol. Different ASes only connect with each other if they can save money that way.
-
-There are two policies we can use to define this routing:
- - Selection: Which path to use (only relevant for outbound traffic)
- - Export: Which path to advertise (only relevant for inbount traffic)
-
-TODO: add graphs here
-
-===============================================
- eBGP and iBGP
-===============================================
-
-BGP comes in two flavors: eBGP and iBGP.
-The e/i stands for external/internal
-
-External BGP sessions connect border routers in different ASes. These are therefore use to learn routes to external destinatons
-
-TODO: add graph
-
-Internal BGP sessions connect the routers in the same AS. These are used to split up externally-learned routes internally. These are tehn announces exernally(to other ASes) again, using eBGP sessions.
-
-BGP itself is a pretty simple protocol composed of four basic messages:
- - open: establish a BGP session (using TCP)
- - notification: report unusual conditions
- - update: inform neighbor of a new best route
- - can be a change or a removal of a best route
- - keepalive: inform neighbor that connection is alive
-
-update messages carry an IP prefix together with a set of attributes:
-/*********************/
-/* IP prefix */
-/*********************/
-/* Attributes */
-/* */
-/* */
-/* */
-/* */
-/*********************/
-
-There are four types of different attributes:
- - NEXT-HOP
- - AS-PATH
- - LOCAL-PREF
- - MED
diff --git a/website/blog/posts/01.html b/website/blog/posts/01.html
deleted file mode 100644
index c3d56ad..0000000
--- a/website/blog/posts/01.html
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- TODO:
- eBGP/iBGP session
- Graphs
-
- /**********************************************/
- /* A no-bullshit guide to a bullshit protocol */
- /**********************************************/
- We can think of the Internet as a network of networks which are all connected in some way. We will refer to
- these networks as Autonomous Systems(AS) in this article.
-
- Now, how do we connect these AS's in a sane way? This is where BGP comes in. BGP, which stands for `Border
- Gateway Protocol`, enables different AS's to exchange information with each other, e.g. communicating with each
- other.
-
- There are three main challenges BGP has to solve:
- - Scalability: The Internet is BIG. BGP needs to scale well to be feasible in a large scale.
- - Privacy: Networks don't want to divulge internal topologies (topology = how a network is structured)
- - Policy enforcement: The Networks themselves need to have control over where to send and recieve traffic.
-
- Other protocols, like Link-Sate routing, do not solve these challenges.
-
- BGP's key concept, which it revolves about, is called *path-vector routing*, where it adertises the entire
- AS-level path.
- Now, what is an AS-level path? We'll get to that in a minute.
-
- Before that, why do we need even BGP? The problem is that sending data over the internet costs money. If we want
- to minimize the costs of sending data, we need to find routes which cost as little as possible. This is also why
- BGP is a "follow the money" protocol. Different ASes only connect with each other if they can save money that
- way.
-
- There are two policies we can use to define this routing:
- - Selection: Which path to use (only relevant for outbound traffic)
- - Export: Which path to advertise (only relevant for inbount traffic)
-
- TODO: add graphs here
-
- ===============================================
- eBGP and iBGP
- ===============================================
-
- BGP comes in two flavors: eBGP and iBGP.
- The e/i stands for external/internal
-
- External BGP sessions connect border routers in different ASes. These are therefore use to learn routes to
- external destinatons
-
- TODO: add graph
-
- Internal BGP sessions connect the routers in the same AS. These are used to split up externally-learned routes
- internally. These are tehn announces exernally(to other ASes) again, using eBGP sessions.
-
- BGP itself is a pretty simple protocol composed of four basic messages:
- - open: establish a BGP session (using TCP)
- - notification: report unusual conditions
- - update: inform neighbor of a new best route
- - can be a change or a removal of a best route
- - keepalive: inform neighbor that connection is alive
-
- update messages carry an IP prefix together with a set of attributes:
- /*********************/
- /* IP prefix */
- /*********************/
- /* Attributes */
- /* */
- /* */
- /* */
- /* */
- /*********************/
-
- There are four types of different attributes:
- - NEXT-HOP
- - AS-PATH
- - LOCAL-PREF
- - MED
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/website/blog/posts/02.html b/website/blog/posts/02.html
deleted file mode 100644
index 499aefa..0000000
--- a/website/blog/posts/02.html
+++ /dev/null
@@ -1 +0,0 @@
-JJ is is a new version control system, made to be compatible with git and _much_ less painful than it.
\ No newline at end of file
diff --git a/website/index.html b/website/index.html
index ff6e4f0..6f1ec77 100644
--- a/website/index.html
+++ b/website/index.html
@@ -2,21 +2,10 @@
-
+
+
My Website
-
-
My Website
-
- Welcome to my website. Here I share some heartfelt ramblings about different things.
-