diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..3550a30
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.gitignore b/.gitignore
index 9c7a426..2585357 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+.direnv/
/.pre-commit-config.yaml
/result
diff --git a/config/default.nix b/config/default.nix
index 667ccdb..c107d5c 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -21,4 +21,5 @@
};
# enabled for VSCode remote server
programs.nix-ld.enable = true;
+ programs.direnv.enable = true;
}
diff --git a/config/games/default.nix b/config/games/default.nix
index 920e354..c27bf49 100644
--- a/config/games/default.nix
+++ b/config/games/default.nix
@@ -1,5 +1,5 @@
{
imports = [
- ./valheim.nix
+ # ./valheim.nix
];
}
diff --git a/config/services/default.nix b/config/services/default.nix
index d69cb2a..9886b8a 100644
--- a/config/services/default.nix
+++ b/config/services/default.nix
@@ -8,7 +8,7 @@
./invidious.nix
./libreddit.nix
./nginx.nix
- ./nitter.nix
+ ./nitter
./postgres.nix
./wakapi.nix
];
diff --git a/config/services/gitea.nix b/config/services/gitea.nix
index ad0d26d..4fc01cc 100644
--- a/config/services/gitea.nix
+++ b/config/services/gitea.nix
@@ -62,7 +62,7 @@ in {
(["auto"]
++ (map (name: lib.removePrefix "theme-" (lib.removeSuffix ".css" name))
(builtins.attrNames (builtins.readDir theme))));
- DEFAULT_THEME = "catppuccin-mocha-pink";
+ DEFAULT_THEME = "catppuccin-frappe-pink";
};
};
};
@@ -74,9 +74,9 @@ in {
inherit (config.services.gitea) stateDir;
in
lib.mkAfter ''
- rm -rf ${stateDir}/custom/public
- mkdir -p ${stateDir}/custom/public
- ln -sf ${theme} ${stateDir}/custom/public/css
+ rm -rf ${stateDir}/custom/public/assets
+ mkdir -p ${stateDir}/custom/public/assets
+ ln -sf ${theme} ${stateDir}/custom/public/assets/css
'';
};
diff --git a/config/services/nitter.nix b/config/services/nitter.nix
deleted file mode 100644
index b0f8585..0000000
--- a/config/services/nitter.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- config,
- pkgs,
- ...
-}: {
- services.nitter = {
- enable = true;
- package = pkgs.unstable.nitter;
- server = {
- address = "127.0.0.1";
- port = 12419;
- };
- };
-
- services.nginx.virtualHosts."nr.winston.sh" = {
- forceSSL = true;
- enableACME = false;
- useACMEHost = "winston.sh";
-
- locations."/" = with config.services.nitter.server; {
- proxyPass = "http://${address}:${toString port}";
- };
- };
-}
diff --git a/config/services/nitter/default.nix b/config/services/nitter/default.nix
new file mode 100644
index 0000000..556267c
--- /dev/null
+++ b/config/services/nitter/default.nix
@@ -0,0 +1,13 @@
+{
+ config,
+ pkgs,
+ ...
+}: {
+ services.nginx.virtualHosts."nr.winston.sh" = {
+ forceSSL = true;
+ enableACME = false;
+ useACMEHost = "winston.sh";
+
+ locations."/".root = ./www;
+ };
+}
diff --git a/config/services/nitter/www/index.html b/config/services/nitter/www/index.html
new file mode 100644
index 0000000..0968876
--- /dev/null
+++ b/config/services/nitter/www/index.html
@@ -0,0 +1,18 @@
+
+
+
+
+
+ [inactive] nitter
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 7d581d2..3fc98c8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1703433843,
- "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=",
+ "lastModified": 1707830867,
+ "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "417caa847f9383e111d1397039c9d4337d024bf0",
+ "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
"type": "github"
},
"original": {
@@ -44,11 +44,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1704982712,
- "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=",
+ "lastModified": 1706830856,
+ "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "07f6395285469419cf9d078f59b5b49993198c00",
+ "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
"type": "github"
},
"original": {
@@ -103,11 +103,11 @@
]
},
"locked": {
- "lastModified": 1688141737,
- "narHash": "sha256-qHrNMYWukOKmKVf6wXOGKj1xxUnOGjvTRbt/PLLXuBE=",
+ "lastModified": 1708891350,
+ "narHash": "sha256-VOQrKK7Df/IVuNki+NshVuGkTa/Tw0GigPjWcZff6kk=",
"owner": "matthewcroughan",
"repo": "nixinate",
- "rev": "7902ae845e6cc5bd450e510cdf5e009a6e4a44d9",
+ "rev": "452f33c60df5b72ad0858f5f2cf224bdf1f17746",
"type": "github"
},
"original": {
@@ -118,11 +118,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1706098335,
- "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=",
+ "lastModified": 1708979614,
+ "narHash": "sha256-FWLWmYojIg6TeqxSnHkKpHu5SGnFP5um1uUjH+wRV6g=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
+ "rev": "b7ee09cf5614b02d289cd86fcfa6f24d4e078c2a",
"type": "github"
},
"original": {
@@ -135,11 +135,11 @@
"nixpkgs-lib": {
"locked": {
"dir": "lib",
- "lastModified": 1703961334,
- "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=",
+ "lastModified": 1706550542,
+ "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9",
+ "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
"type": "github"
},
"original": {
@@ -152,11 +152,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1706191920,
- "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=",
+ "lastModified": 1708984720,
+ "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "ae5c332cbb5827f6b1f02572496b141021de335f",
+ "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538",
"type": "github"
},
"original": {
@@ -179,11 +179,11 @@
]
},
"locked": {
- "lastModified": 1705757126,
- "narHash": "sha256-Eksr+n4Q8EYZKAN0Scef5JK4H6FcHc+TKNHb95CWm+c=",
+ "lastModified": 1708018599,
+ "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "f56597d53fd174f796b5a7d3ee0b494f9e2285cc",
+ "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431",
"type": "github"
},
"original": {
+ R.I.P. nitter
+