Compare commits
1 commit
master
...
test/git-c
| Author | SHA1 | Date | |
|---|---|---|---|
4a5f1965cb
|
119 changed files with 789 additions and 2609 deletions
16
.github/workflows/cachix.yml
vendored
16
.github/workflows/cachix.yml
vendored
|
|
@ -5,6 +5,20 @@ on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
check:
|
||||||
|
name: Check flake
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- uses: cachix/install-nix-action@v31
|
||||||
|
- uses: cachix/cachix-action@v14
|
||||||
|
with:
|
||||||
|
name: lava
|
||||||
|
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
||||||
|
- run: nix flake check --keep-going --verbose
|
||||||
|
|
||||||
build:
|
build:
|
||||||
name: Build linux-lava for x86_64-linux
|
name: Build linux-lava for x86_64-linux
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
@ -21,7 +35,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- uses: cachix/install-nix-action@v31
|
- uses: cachix/install-nix-action@v31
|
||||||
- uses: cachix/cachix-action@v16
|
- uses: cachix/cachix-action@v14
|
||||||
with:
|
with:
|
||||||
name: lava
|
name: lava
|
||||||
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
||||||
|
|
|
||||||
|
|
@ -1,47 +0,0 @@
|
||||||
{ lib, pkgs, ... }: {
|
|
||||||
system.stateVersion = "23.11";
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d /persist/transmission 755 transmission transmission"
|
|
||||||
"d /persist/transmission/.config/transmission-daemon 750 transmission transmission"
|
|
||||||
"d /persist/transmission/.incomplete 750 transmission transmission"
|
|
||||||
"d /persist/transmission/Downloads 755 transmission transmission"
|
|
||||||
"d /persist/transmission/watchdir 755 transmission transmission"
|
|
||||||
];
|
|
||||||
networking.wg-quick.interfaces.wg0 = {
|
|
||||||
configFile = "/persist/vpn.conf";
|
|
||||||
preUp = ''
|
|
||||||
# Try to access the DNS for up to 300s
|
|
||||||
for i in {1..60}; do
|
|
||||||
${pkgs.iputils}/bin/ping -c1 'google.com' && break
|
|
||||||
echo "Attempt $i: DNS still not available"
|
|
||||||
sleep 5s
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/258793
|
|
||||||
systemd.services.transmission.serviceConfig = {
|
|
||||||
BindReadOnlyPaths = lib.mkForce [ builtins.storeDir "/etc" ];
|
|
||||||
RootDirectoryStartOnly = lib.mkForce false;
|
|
||||||
RootDirectory = lib.mkForce "";
|
|
||||||
PrivateMounts = lib.mkForce false;
|
|
||||||
PrivateUsers = lib.mkForce false;
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 9091 ];
|
|
||||||
services.transmission = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.transmission_4;
|
|
||||||
downloadDirPermissions = "775";
|
|
||||||
openFirewall = true;
|
|
||||||
home = "/persist/transmission";
|
|
||||||
settings = {
|
|
||||||
ratio-limit-enabled = true;
|
|
||||||
rpc-bind-address = "0.0.0.0";
|
|
||||||
rpc-enabled = true;
|
|
||||||
rpc-port = 9091;
|
|
||||||
rpc-host-whitelist-enabled = false;
|
|
||||||
rpc-whitelist-enabled = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
27
containers/amethyst/flake.lock
generated
27
containers/amethyst/flake.lock
generated
|
|
@ -1,27 +0,0 @@
|
||||||
{
|
|
||||||
"nodes": {
|
|
||||||
"nixpkgs": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1773282481,
|
|
||||||
"narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": "root",
|
|
||||||
"version": 7
|
|
||||||
}
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
||||||
{
|
|
||||||
inputs = {
|
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
|
||||||
};
|
|
||||||
outputs = { nixpkgs, ... }: {
|
|
||||||
nixosConfigurations.container = nixpkgs.lib.nixosSystem {
|
|
||||||
modules = [ ./configuration.nix ];
|
|
||||||
};
|
|
||||||
nixosModule = { ... }:
|
|
||||||
let
|
|
||||||
name = "amethyst";
|
|
||||||
fqdn = "amethyst.lava.moe";
|
|
||||||
subnet = "1";
|
|
||||||
in {
|
|
||||||
networking.nat = {
|
|
||||||
enable = true;
|
|
||||||
enableIPv6 = true;
|
|
||||||
internalInterfaces = [ "ve-${name}" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."${fqdn}" = {
|
|
||||||
useACMEHost = "lava.moe";
|
|
||||||
forceSSL = true;
|
|
||||||
#locations."/".proxyPass = "http://[fd0d:1::${subnet}:2]:9091";
|
|
||||||
locations."/".proxyPass = "http://10.30.${subnet}.2:9091";
|
|
||||||
listenAddresses = [ "10.0.0.1" "[fd0d::1]" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [ "d /persist/containers/${name} 755 root users" ];
|
|
||||||
containers.${name} = {
|
|
||||||
autoStart = true;
|
|
||||||
privateNetwork = true;
|
|
||||||
hostAddress = "10.30.${subnet}.1";
|
|
||||||
localAddress = "10.30.${subnet}.2";
|
|
||||||
hostAddress6 = "fd0d:1::${subnet}:1";
|
|
||||||
localAddress6 = "fd0d:1::${subnet}:2";
|
|
||||||
# privateUsers = "pick";
|
|
||||||
nixpkgs = nixpkgs;
|
|
||||||
ephemeral = true;
|
|
||||||
config = { imports = [ ./configuration.nix ]; };
|
|
||||||
|
|
||||||
bindMounts."persist" = {
|
|
||||||
hostPath = "/persist/containers/${name}";
|
|
||||||
mountPoint = "/persist";
|
|
||||||
isReadOnly = false;
|
|
||||||
};
|
|
||||||
# flake = "path:" + ./.;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
{ ... }: {
|
|
||||||
system.stateVersion = "25.11";
|
|
||||||
fileSystems."/var/lib/private" = {
|
|
||||||
device = "/persist";
|
|
||||||
fsType = "none";
|
|
||||||
options = [ "bind" ];
|
|
||||||
};
|
|
||||||
networking.firewall.allowedTCPPorts = [ 6167 ];
|
|
||||||
networking.firewall.allowedUDPPorts = [ 6167 ];
|
|
||||||
# TODO: this should be generically set
|
|
||||||
networking.useHostResolvConf = false;
|
|
||||||
networking.nameservers = [ "8.8.8.8" ];
|
|
||||||
|
|
||||||
services.matrix-continuwuity = {
|
|
||||||
enable = true;
|
|
||||||
settings.global = {
|
|
||||||
# TODO: link this with outer container's address
|
|
||||||
address = [ "10.30.2.2" ];
|
|
||||||
server_name = "lava.moe";
|
|
||||||
rocksdb_recovery_mode = 2;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
27
containers/beryllium/flake.lock
generated
27
containers/beryllium/flake.lock
generated
|
|
@ -1,27 +0,0 @@
|
||||||
{
|
|
||||||
"nodes": {
|
|
||||||
"nixpkgs": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1773282481,
|
|
||||||
"narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": "root",
|
|
||||||
"version": 7
|
|
||||||
}
|
|
||||||
|
|
@ -1,69 +0,0 @@
|
||||||
{
|
|
||||||
inputs = {
|
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
|
||||||
};
|
|
||||||
outputs = { nixpkgs, ... }: {
|
|
||||||
nixosConfigurations.container = nixpkgs.lib.nixosSystem {
|
|
||||||
modules = [ ./configuration.nix ];
|
|
||||||
};
|
|
||||||
nixosModule = { ... }:
|
|
||||||
let
|
|
||||||
name = "beryllium";
|
|
||||||
fqdn = "beryllium.lava.moe";
|
|
||||||
subnet = "2";
|
|
||||||
in {
|
|
||||||
networking.nat = {
|
|
||||||
enable = true;
|
|
||||||
enableIPv6 = true;
|
|
||||||
internalInterfaces = [ "ve-${name}" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."${fqdn}" = {
|
|
||||||
useACMEHost = "lava.moe";
|
|
||||||
forceSSL = true;
|
|
||||||
locations."/".extraConfig = "return 302 'https://lava.moe';";
|
|
||||||
locations."/_matrix".proxyPass = "http://10.30.${subnet}.2:6167";
|
|
||||||
locations."/_conduwuit".proxyPass = "http://10.30.${subnet}.2:6167";
|
|
||||||
locations."/_continuwuity".proxyPass = "http://10.30.${subnet}.2:6167";
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."lava.moe" = {
|
|
||||||
locations."= /.well-known/matrix/server".extraConfig =
|
|
||||||
let
|
|
||||||
server = { "m.server" = "${fqdn}:443"; };
|
|
||||||
in ''
|
|
||||||
add_header Content-Type application/json;
|
|
||||||
return 200 '${builtins.toJSON server}';
|
|
||||||
'';
|
|
||||||
locations."= /.well-known/matrix/client".extraConfig =
|
|
||||||
let
|
|
||||||
client = {
|
|
||||||
"m.homeserver" = { "base_url" = "https://${fqdn}"; };
|
|
||||||
# "m.identity_server" = { "base_url" = "https://vector.im"; };
|
|
||||||
};
|
|
||||||
in ''
|
|
||||||
add_header Content-Type application/json;
|
|
||||||
add_header Access-Control-Allow-Origin *;
|
|
||||||
return 200 '${builtins.toJSON client}';
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [ "d /persist/containers/${name} 755 root users" ];
|
|
||||||
containers.${name} = {
|
|
||||||
autoStart = true;
|
|
||||||
privateNetwork = true;
|
|
||||||
hostAddress = "10.30.${subnet}.1";
|
|
||||||
localAddress = "10.30.${subnet}.2";
|
|
||||||
nixpkgs = nixpkgs;
|
|
||||||
ephemeral = true;
|
|
||||||
config = { imports = [ ./configuration.nix ]; };
|
|
||||||
|
|
||||||
bindMounts."persist" = {
|
|
||||||
hostPath = "/persist/containers/${name}";
|
|
||||||
mountPoint = "/persist";
|
|
||||||
isReadOnly = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,53 +0,0 @@
|
||||||
{ config, fqdn, lib, ... }: {
|
|
||||||
system.stateVersion = "25.11";
|
|
||||||
networking.firewall.allowedTCPPorts = [ 22 3000 ];
|
|
||||||
networking.firewall.allowedUDPPorts = [ 22 3000 ];
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"L+ /persist/forgejo/custom/templates - - - - ${./templates}"
|
|
||||||
];
|
|
||||||
|
|
||||||
services.forgejo = {
|
|
||||||
enable = true;
|
|
||||||
lfs.enable = true;
|
|
||||||
settings = {
|
|
||||||
DEFAULT.APP_NAME = "cilly's botanical laboratory";
|
|
||||||
server = {
|
|
||||||
DOMAIN = fqdn;
|
|
||||||
ROOT_URL = "https://${fqdn}/";
|
|
||||||
HTTP_PORT = 3000;
|
|
||||||
START_SSH_SERVER = true;
|
|
||||||
BUILTIN_SSH_SERVER_USER = "git";
|
|
||||||
SSH_DOMAIN = "git.lava.moe";
|
|
||||||
SSH_SERVER_KEY_EXCHANGES = "mlkem768x25519-sha256,sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com,curve25519-sha256,curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256";
|
|
||||||
};
|
|
||||||
ui = lib.mkForce {
|
|
||||||
DEFAULT_THEME = "catppuccin-maroon-auto";
|
|
||||||
THEMES = lib.strings.concatMapStringsSep "," (x: "${x}-auto") [
|
|
||||||
"catppuccin-pink"
|
|
||||||
"catppuccin-maroon"
|
|
||||||
"catppuccin-flamingo"
|
|
||||||
"catppuccin-rosewater"
|
|
||||||
"forgejo"
|
|
||||||
"gitea"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
api.ENABLE_SWAGGER = false;
|
|
||||||
other.SHOW_FOOTER_TEMPLATE_LOAD_TIME = false;
|
|
||||||
repository.ENABLE_PUSH_CREATE_USER = true;
|
|
||||||
repository.ENABLE_PUSH_CREATE_ORG = true;
|
|
||||||
service.DISABLE_REGISTRATION = true;
|
|
||||||
};
|
|
||||||
stateDir = "/persist/forgejo";
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services.forgejo.serviceConfig = {
|
|
||||||
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
|
|
||||||
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
|
|
||||||
PrivateUsers = lib.mkForce false;
|
|
||||||
};
|
|
||||||
|
|
||||||
catppuccin.forgejo.enable = true;
|
|
||||||
|
|
||||||
environment.systemPackages = [ config.services.forgejo.package ];
|
|
||||||
}
|
|
||||||
62
containers/citrine/flake.lock
generated
62
containers/citrine/flake.lock
generated
|
|
@ -1,62 +0,0 @@
|
||||||
{
|
|
||||||
"nodes": {
|
|
||||||
"catppuccin": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1773403535,
|
|
||||||
"narHash": "sha256-47MZaFrHxNO8tVUAmtVnerXUw2WWVluBOiU9MulN/yM=",
|
|
||||||
"owner": "catppuccin",
|
|
||||||
"repo": "nix",
|
|
||||||
"rev": "d45b5665cc638bad1b794350de02f4dd41b0bb47",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "catppuccin",
|
|
||||||
"repo": "nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1773122722,
|
|
||||||
"narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1773282481,
|
|
||||||
"narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
|
||||||
"inputs": {
|
|
||||||
"catppuccin": "catppuccin",
|
|
||||||
"nixpkgs": "nixpkgs_2"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": "root",
|
|
||||||
"version": 7
|
|
||||||
}
|
|
||||||
|
|
@ -1,68 +0,0 @@
|
||||||
{
|
|
||||||
inputs = {
|
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
|
||||||
catppuccin.url = "github:catppuccin/nix";
|
|
||||||
};
|
|
||||||
outputs = { nixpkgs, catppuccin, ... }:
|
|
||||||
let
|
|
||||||
name = "citrine";
|
|
||||||
fqdn = "lab.lava.moe";
|
|
||||||
subnetId = "3";
|
|
||||||
|
|
||||||
subnet = x: "fd0d:1::${subnetId}:${toString x}";
|
|
||||||
host = subnet 1;
|
|
||||||
client = subnet 2;
|
|
||||||
|
|
||||||
subnet4 = x: "10.30.${subnetId}.${toString x}";
|
|
||||||
host4 = subnet4 1;
|
|
||||||
client4 = subnet4 2;
|
|
||||||
|
|
||||||
modules = [
|
|
||||||
./configuration.nix
|
|
||||||
catppuccin.nixosModules.catppuccin
|
|
||||||
{
|
|
||||||
networking.useHostResolvConf = false;
|
|
||||||
networking.nameservers = [ host ];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
in {
|
|
||||||
nixosConfigurations.container = nixpkgs.lib.nixosSystem {
|
|
||||||
inherit modules;
|
|
||||||
};
|
|
||||||
nixosModule = { ... }: {
|
|
||||||
networking.nat = {
|
|
||||||
enable = true;
|
|
||||||
enableIPv6 = true;
|
|
||||||
internalInterfaces = [ "ve-${name}" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."${fqdn}" = {
|
|
||||||
useACMEHost = "lava.moe";
|
|
||||||
forceSSL = true;
|
|
||||||
locations."/".proxyPass = "http://[${client}]:3000";
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [ "d /persist/containers/${name} 755 root users" ];
|
|
||||||
containers.${name} = {
|
|
||||||
autoStart = true;
|
|
||||||
privateNetwork = true;
|
|
||||||
hostAddress = host4;
|
|
||||||
localAddress = client4;
|
|
||||||
hostAddress6 = host;
|
|
||||||
localAddress6 = client;
|
|
||||||
# privateUsers = "pick";
|
|
||||||
nixpkgs = nixpkgs;
|
|
||||||
ephemeral = true;
|
|
||||||
config = { imports = modules; };
|
|
||||||
specialArgs = { inherit fqdn; };
|
|
||||||
|
|
||||||
bindMounts."persist" = {
|
|
||||||
hostPath = "/persist/containers/${name}";
|
|
||||||
mountPoint = "/persist";
|
|
||||||
isReadOnly = false;
|
|
||||||
};
|
|
||||||
# flake = "path:" + ./.;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
<footer class="page-footer" role="group" aria-label="{{ctx.Locale.Tr "aria.footer"}}">
|
|
||||||
<div class="left-links" role="contentinfo" aria-label="{{ctx.Locale.Tr "aria.footer.software"}}">
|
|
||||||
{{if ShowFooterPoweredBy}}
|
|
||||||
<a target="_blank" rel="noopener noreferrer" href="https://forgejo.org">Forgejo</a>
|
|
||||||
{{end}}
|
|
||||||
{{if (or .ShowFooterVersion .PageIsAdmin)}}
|
|
||||||
{{if .IsAdmin}}
|
|
||||||
<a href="{{AppSubUrl}}/admin/config">{{AppVerNoMetadata}}</a>
|
|
||||||
{{else}}
|
|
||||||
{{AppVerNoMetadata}}
|
|
||||||
{{end}}
|
|
||||||
{{end}}
|
|
||||||
{{if and .TemplateLoadTimes ShowFooterTemplateLoadTime}}
|
|
||||||
{{ctx.Locale.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong>
|
|
||||||
{{ctx.Locale.Tr "template"}}{{if .TemplateName}} {{.TemplateName}}{{end}}: <strong>{{call .TemplateLoadTimes}}</strong>
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
<div class="right-links" role="group" aria-label="{{ctx.Locale.Tr "aria.footer.links"}}">
|
|
||||||
<div class="ui dropdown upward language">
|
|
||||||
<span class="flex-text-inline">{{svg "octicon-globe" 14}} {{ctx.Locale.LangName}}</span>
|
|
||||||
<div class="menu language-menu">
|
|
||||||
{{range .AllLangs}}
|
|
||||||
<a lang="{{.Lang}}" data-url="{{AppSubUrl}}/?lang={{.Lang}}" class="item {{if eq ctx.Locale.Lang .Lang}}active selected{{end}}">{{.Name}}</a>
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<a href="{{AssetUrlPrefix}}/licenses.txt">{{ctx.Locale.Tr "licenses"}}</a>
|
|
||||||
{{if .EnableSwagger}}<a href="{{AppSubUrl}}/api/swagger">API</a>{{end}}
|
|
||||||
{{template "custom/extra_links_footer" .}}
|
|
||||||
</div>
|
|
||||||
</footer>
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
{{template "base/head" .}}
|
|
||||||
{{if not .IsSigned}}
|
|
||||||
<script>window.location.href = "/explore/repos";</script>
|
|
||||||
{{end}}
|
|
||||||
<div role="main" aria-label="{{if .IsSigned}}{{ctx.Locale.Tr "dashboard"}}{{else}}{{ctx.Locale.Tr "home"}}{{end}}" class="page-content home">
|
|
||||||
<div class="tw-mb-8 tw-px-8">
|
|
||||||
<div class="center">
|
|
||||||
<img class="logo" width="220" height="220" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{ctx.Locale.Tr "logo"}}">
|
|
||||||
<div class="hero">
|
|
||||||
<h1 class="ui icon header title">
|
|
||||||
{{AppDisplayName}}
|
|
||||||
</h1>
|
|
||||||
<h2>{{ctx.Locale.Tr "startpage.app_desc"}}</h2>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{template "home_forgejo" .}}
|
|
||||||
</div>
|
|
||||||
{{template "base/footer" .}}
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
{ fqdn, ... }: {
|
|
||||||
system.stateVersion = "25.11";
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d /persist/vaultwarden 755 vaultwarden vaultwarden"
|
|
||||||
];
|
|
||||||
fileSystems."/var/lib/vaultwarden" = {
|
|
||||||
device = "/persist/vaultwarden";
|
|
||||||
fsType = "none";
|
|
||||||
options = [ "bind" ];
|
|
||||||
};
|
|
||||||
networking.firewall.allowedTCPPorts = [ 8000 ];
|
|
||||||
networking.firewall.allowedUDPPorts = [ 8000 ];
|
|
||||||
|
|
||||||
services.vaultwarden = {
|
|
||||||
enable = true;
|
|
||||||
domain = fqdn;
|
|
||||||
config = {
|
|
||||||
DOMAIN = "https://${fqdn}";
|
|
||||||
ROCKET_ADDRESS = "::";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
27
containers/diamond/flake.lock
generated
27
containers/diamond/flake.lock
generated
|
|
@ -1,27 +0,0 @@
|
||||||
{
|
|
||||||
"nodes": {
|
|
||||||
"nixpkgs": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1773282481,
|
|
||||||
"narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": "root",
|
|
||||||
"version": 7
|
|
||||||
}
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
||||||
{
|
|
||||||
inputs = {
|
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
|
||||||
};
|
|
||||||
outputs = { nixpkgs, ... }:
|
|
||||||
let
|
|
||||||
name = "diamond";
|
|
||||||
fqdn = "astransia.lava.moe";
|
|
||||||
subnetId = "4";
|
|
||||||
|
|
||||||
subnet = x: "fd0d:1::${subnetId}:${toString x}";
|
|
||||||
host = subnet 1;
|
|
||||||
client = subnet 2;
|
|
||||||
|
|
||||||
modules = [
|
|
||||||
./configuration.nix
|
|
||||||
];
|
|
||||||
in {
|
|
||||||
nixosConfigurations.container = nixpkgs.lib.nixosSystem {
|
|
||||||
inherit modules;
|
|
||||||
};
|
|
||||||
nixosModule = { ... }: {
|
|
||||||
services.nginx.virtualHosts."${fqdn}" = {
|
|
||||||
useACMEHost = "lava.moe";
|
|
||||||
forceSSL = true;
|
|
||||||
locations."/".proxyPass = "http://[${client}]:8000";
|
|
||||||
listenAddresses = [ "10.0.0.1" "[fd0d::1]" "100.67.1.1" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [ "d /persist/containers/${name} 755 root users" ];
|
|
||||||
containers.${name} = {
|
|
||||||
autoStart = true;
|
|
||||||
privateNetwork = true;
|
|
||||||
hostAddress6 = host;
|
|
||||||
localAddress6 = client;
|
|
||||||
# privateUsers = "pick";
|
|
||||||
nixpkgs = nixpkgs;
|
|
||||||
ephemeral = true;
|
|
||||||
config = { imports = modules; };
|
|
||||||
specialArgs = { inherit fqdn; };
|
|
||||||
|
|
||||||
bindMounts."persist" = {
|
|
||||||
hostPath = "/persist/containers/${name}";
|
|
||||||
mountPoint = "/persist";
|
|
||||||
isReadOnly = false;
|
|
||||||
};
|
|
||||||
# flake = "path:" + ./.;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
{ fqdn, shareFqdn, ... }: {
|
|
||||||
system.stateVersion = "25.11";
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d /persist/navidrome 755 navidrome navidrome"
|
|
||||||
];
|
|
||||||
networking.firewall.allowedTCPPorts = [ 4533 ];
|
|
||||||
networking.firewall.allowedUDPPorts = [ 4533 ];
|
|
||||||
|
|
||||||
services.navidrome = {
|
|
||||||
enable = true;
|
|
||||||
environmentFile = "/binds/navidrome_env";
|
|
||||||
settings = {
|
|
||||||
Port = 4533;
|
|
||||||
Address = "[::]";
|
|
||||||
BaseUrl = "https://${fqdn}/";
|
|
||||||
ShareURL = "https://${shareFqdn}";
|
|
||||||
EnableSharing = true;
|
|
||||||
DataFolder = "/persist/navidrome";
|
|
||||||
MusicFolder = "/binds/music/main";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
systemd.services.navidrome.serviceConfig.BindReadOnlyPaths = ["/binds/music"];
|
|
||||||
}
|
|
||||||
27
containers/emerald/flake.lock
generated
27
containers/emerald/flake.lock
generated
|
|
@ -1,27 +0,0 @@
|
||||||
{
|
|
||||||
"nodes": {
|
|
||||||
"nixpkgs": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1773282481,
|
|
||||||
"narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": "root",
|
|
||||||
"version": 7
|
|
||||||
}
|
|
||||||
|
|
@ -1,78 +0,0 @@
|
||||||
{
|
|
||||||
inputs = {
|
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
|
||||||
};
|
|
||||||
outputs = { nixpkgs, ... }:
|
|
||||||
let
|
|
||||||
name = "emerald";
|
|
||||||
fqdn = "navia.lava.moe";
|
|
||||||
shareFqdn = "muse.lava.moe";
|
|
||||||
subnetId = "5";
|
|
||||||
|
|
||||||
subnet = x: "fd0d:2::${subnetId}:${toString x}";
|
|
||||||
host = subnet 1;
|
|
||||||
client = subnet 2;
|
|
||||||
|
|
||||||
subnet4 = x: "10.32.${subnetId}.${toString x}";
|
|
||||||
host4 = subnet4 1;
|
|
||||||
client4 = subnet4 2;
|
|
||||||
|
|
||||||
modules = [
|
|
||||||
./configuration.nix
|
|
||||||
{
|
|
||||||
networking.useHostResolvConf = false;
|
|
||||||
networking.nameservers = [ host ];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
in {
|
|
||||||
nixosConfigurations.container = nixpkgs.lib.nixosSystem {
|
|
||||||
inherit modules;
|
|
||||||
};
|
|
||||||
nixosModule = { config, ... }: {
|
|
||||||
networking.nat = {
|
|
||||||
enable = true;
|
|
||||||
enableIPv6 = true;
|
|
||||||
internalInterfaces = [ "ve-${name}" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."${fqdn}" = {
|
|
||||||
useACMEHost = "lava.moe";
|
|
||||||
forceSSL = true;
|
|
||||||
locations."/".proxyPass = "http://[${client}]:4533";
|
|
||||||
listenAddresses = [ "100.67.2.1" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [ "d /persist/containers/${name} 755 root users" ];
|
|
||||||
containers.${name} = {
|
|
||||||
autoStart = true;
|
|
||||||
privateNetwork = true;
|
|
||||||
hostAddress = host4;
|
|
||||||
localAddress = client4;
|
|
||||||
hostAddress6 = host;
|
|
||||||
localAddress6 = client;
|
|
||||||
# privateUsers = "pick";
|
|
||||||
nixpkgs = nixpkgs;
|
|
||||||
ephemeral = true;
|
|
||||||
config = { imports = modules; };
|
|
||||||
specialArgs = { inherit fqdn shareFqdn; };
|
|
||||||
|
|
||||||
bindMounts."persist" = {
|
|
||||||
hostPath = "/persist/containers/${name}";
|
|
||||||
mountPoint = "/persist";
|
|
||||||
isReadOnly = false;
|
|
||||||
};
|
|
||||||
bindMounts."music" = {
|
|
||||||
hostPath = "/flower/media/music";
|
|
||||||
mountPoint = "/binds/music";
|
|
||||||
isReadOnly = true;
|
|
||||||
};
|
|
||||||
bindMounts."navidrome_env" = {
|
|
||||||
hostPath = config.age.secrets.navidrome_env.path;
|
|
||||||
mountPoint = "/binds/navidrome_env";
|
|
||||||
isReadOnly = true;
|
|
||||||
};
|
|
||||||
# flake = "path:" + ./.;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
{ ... }: {
|
|
||||||
system.stateVersion = "25.11";
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d /persist/slskd/Downloads 755 slskd slskd"
|
|
||||||
];
|
|
||||||
fileSystems."/var/lib/slskd" = {
|
|
||||||
device = "/persist/slskd";
|
|
||||||
fsType = "none";
|
|
||||||
options = [ "bind" ];
|
|
||||||
};
|
|
||||||
networking.firewall.allowedTCPPorts = [ 5030 50300 ];
|
|
||||||
networking.firewall.allowedUDPPorts = [ 5030 50300 ];
|
|
||||||
|
|
||||||
services.slskd = {
|
|
||||||
enable = true;
|
|
||||||
domain = null;
|
|
||||||
environmentFile = "/binds/slskd_env";
|
|
||||||
settings = {
|
|
||||||
shares.directories = [ "/binds/music/" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
27
containers/fluorite/flake.lock
generated
27
containers/fluorite/flake.lock
generated
|
|
@ -1,27 +0,0 @@
|
||||||
{
|
|
||||||
"nodes": {
|
|
||||||
"nixpkgs": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1773282481,
|
|
||||||
"narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": "root",
|
|
||||||
"version": 7
|
|
||||||
}
|
|
||||||
|
|
@ -1,89 +0,0 @@
|
||||||
{
|
|
||||||
inputs = {
|
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
|
||||||
};
|
|
||||||
outputs = { nixpkgs, ... }:
|
|
||||||
let
|
|
||||||
name = "fluorite";
|
|
||||||
fqdn = "fluorite.lava.moe";
|
|
||||||
subnetId = "6";
|
|
||||||
|
|
||||||
subnet = x: "fd0d:1::${subnetId}:${toString x}";
|
|
||||||
host = subnet 1;
|
|
||||||
client = subnet 2;
|
|
||||||
|
|
||||||
subnet4 = x: "10.30.${subnetId}.${toString x}";
|
|
||||||
host4 = subnet4 1;
|
|
||||||
client4 = subnet4 2;
|
|
||||||
|
|
||||||
modules = [
|
|
||||||
./configuration.nix
|
|
||||||
{
|
|
||||||
networking.useHostResolvConf = false;
|
|
||||||
networking.nameservers = [ host ];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
in {
|
|
||||||
nixosConfigurations.container = nixpkgs.lib.nixosSystem {
|
|
||||||
inherit modules;
|
|
||||||
};
|
|
||||||
nixosModule = { config, ... }: {
|
|
||||||
networking.nat = {
|
|
||||||
enable = true;
|
|
||||||
enableIPv6 = true;
|
|
||||||
internalInterfaces = [ "ve-${name}" ];
|
|
||||||
};
|
|
||||||
networking.firewall.allowedTCPPorts = [ 50300 ];
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."${fqdn}" = {
|
|
||||||
useACMEHost = "lava.moe";
|
|
||||||
forceSSL = true;
|
|
||||||
locations."/".proxyPass = "http://[${client}]:5030";
|
|
||||||
listenAddresses = [ "10.0.0.1" "[fd0d::1]" "100.67.1.1" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d /persist/containers/${name} 755 root users"
|
|
||||||
"d /persist/media/music 075 nobody users"
|
|
||||||
];
|
|
||||||
containers.${name} = {
|
|
||||||
autoStart = true;
|
|
||||||
privateNetwork = true;
|
|
||||||
hostAddress = host4;
|
|
||||||
localAddress = client4;
|
|
||||||
hostAddress6 = host;
|
|
||||||
localAddress6 = client;
|
|
||||||
# privateUsers = "pick";
|
|
||||||
nixpkgs = nixpkgs;
|
|
||||||
ephemeral = true;
|
|
||||||
config = { imports = modules; };
|
|
||||||
specialArgs = { inherit fqdn; };
|
|
||||||
|
|
||||||
forwardPorts = [
|
|
||||||
{
|
|
||||||
containerPort = 50300;
|
|
||||||
hostPort = 50300;
|
|
||||||
protocol = "tcp";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
bindMounts."persist" = {
|
|
||||||
hostPath = "/persist/containers/${name}";
|
|
||||||
mountPoint = "/persist";
|
|
||||||
isReadOnly = false;
|
|
||||||
};
|
|
||||||
bindMounts."music" = {
|
|
||||||
hostPath = "/persist/media/music";
|
|
||||||
mountPoint = "/binds/music";
|
|
||||||
isReadOnly = true;
|
|
||||||
};
|
|
||||||
bindMounts."slskd_env" = {
|
|
||||||
hostPath = config.age.secrets.slskd_env.path;
|
|
||||||
mountPoint = "/binds/slskd_env";
|
|
||||||
isReadOnly = true;
|
|
||||||
};
|
|
||||||
# flake = "path:" + ./.;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
{ ... }: {
|
|
||||||
system.stateVersion = "25.11";
|
|
||||||
fileSystems."/var/lib/opencloud" = {
|
|
||||||
device = "/flower/data";
|
|
||||||
fsType = "none";
|
|
||||||
options = [ "bind" ];
|
|
||||||
};
|
|
||||||
fileSystems."/etc/opencloud" = {
|
|
||||||
device = "/persist/cfg";
|
|
||||||
fsType = "none";
|
|
||||||
options = [ "bind" ];
|
|
||||||
};
|
|
||||||
# TODO: hardcoded address
|
|
||||||
networking.extraHosts = ''
|
|
||||||
100.67.2.1 cloud.lava.moe
|
|
||||||
'';
|
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 9200 ];
|
|
||||||
networking.firewall.allowedUDPPorts = [ 9200 ];
|
|
||||||
|
|
||||||
environment.etc."opencloud-admin-pass".text = ''
|
|
||||||
IDM_ADMIN_PASSWORD=supersillysecure
|
|
||||||
'';
|
|
||||||
services.opencloud = {
|
|
||||||
enable = true;
|
|
||||||
url = "https://cloud.lava.moe";
|
|
||||||
address = "10.30.7.2";
|
|
||||||
port = 9200;
|
|
||||||
environment = {
|
|
||||||
PROXY_TLS = "false";
|
|
||||||
IDP_ACCESS_TOKEN_EXPIRATION = "2592000";
|
|
||||||
IDP_ID_TOKEN_EXPIRATION = "2592000";
|
|
||||||
};
|
|
||||||
environmentFile = "/etc/opencloud-admin-pass";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
27
containers/garnet/flake.lock
generated
27
containers/garnet/flake.lock
generated
|
|
@ -1,27 +0,0 @@
|
||||||
{
|
|
||||||
"nodes": {
|
|
||||||
"nixpkgs": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1779560665,
|
|
||||||
"narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": "root",
|
|
||||||
"version": 7
|
|
||||||
}
|
|
||||||
|
|
@ -1,84 +0,0 @@
|
||||||
{
|
|
||||||
inputs = {
|
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
|
||||||
};
|
|
||||||
outputs = { nixpkgs, ... }:
|
|
||||||
let
|
|
||||||
name = "garnet";
|
|
||||||
fqdn = "cloud.lava.moe";
|
|
||||||
subnetId = "7";
|
|
||||||
|
|
||||||
subnet = x: "fd0d:1::${subnetId}:${toString x}";
|
|
||||||
host = subnet 1;
|
|
||||||
client = subnet 2;
|
|
||||||
|
|
||||||
subnet4 = x: "10.30.${subnetId}.${toString x}";
|
|
||||||
host4 = subnet4 1;
|
|
||||||
client4 = subnet4 2;
|
|
||||||
|
|
||||||
modules = [
|
|
||||||
./configuration.nix
|
|
||||||
{
|
|
||||||
networking.useHostResolvConf = false;
|
|
||||||
networking.nameservers = [ host ];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
in {
|
|
||||||
nixosConfigurations.container = nixpkgs.lib.nixosSystem {
|
|
||||||
inherit modules;
|
|
||||||
};
|
|
||||||
nixosModule = { config, ... }: {
|
|
||||||
networking.nat = {
|
|
||||||
enable = true;
|
|
||||||
enableIPv6 = true;
|
|
||||||
internalInterfaces = [ "ve-${name}" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."${fqdn}" = {
|
|
||||||
useACMEHost = "lava.moe";
|
|
||||||
forceSSL = true;
|
|
||||||
locations."/" = {
|
|
||||||
proxyPass = "http://${client4}:9200";
|
|
||||||
proxyWebsockets = true;
|
|
||||||
};
|
|
||||||
extraConfig = ''
|
|
||||||
proxy_read_timeout 3600s;
|
|
||||||
proxy_send_timeout 3600s;
|
|
||||||
keepalive_requests 100000;
|
|
||||||
keepalive_timeout 5m;
|
|
||||||
http2_max_concurrent_streams 512;
|
|
||||||
'';
|
|
||||||
# TODO: hardcoded address
|
|
||||||
listenAddresses = [ "100.67.2.1" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d /persist/containers/${name} 755 root users"
|
|
||||||
];
|
|
||||||
containers.${name} = {
|
|
||||||
autoStart = true;
|
|
||||||
privateNetwork = true;
|
|
||||||
hostAddress = host4;
|
|
||||||
localAddress = client4;
|
|
||||||
hostAddress6 = host;
|
|
||||||
localAddress6 = client;
|
|
||||||
# privateUsers = "pick";
|
|
||||||
nixpkgs = nixpkgs;
|
|
||||||
ephemeral = true;
|
|
||||||
config = { imports = modules; };
|
|
||||||
specialArgs = { inherit fqdn; };
|
|
||||||
|
|
||||||
bindMounts."persist" = {
|
|
||||||
hostPath = "/persist/containers/${name}";
|
|
||||||
mountPoint = "/persist";
|
|
||||||
isReadOnly = false;
|
|
||||||
};
|
|
||||||
bindMounts."content" = {
|
|
||||||
hostPath = "/flower/opencloud";
|
|
||||||
mountPoint = "/flower";
|
|
||||||
isReadOnly = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
729
flake.lock
generated
729
flake.lock
generated
File diff suppressed because it is too large
Load diff
27
flake.nix
27
flake.nix
|
|
@ -2,27 +2,24 @@
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
home-manager.url = "github:nix-community/home-manager";
|
home-manager.url = "github:nix-community/home-manager";
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
neovim-nightly.url = "github:nix-community/neovim-nightly-overlay";
|
||||||
|
|
||||||
agenix.url = "github:ryantm/agenix";
|
agenix.url = "github:ryantm/agenix";
|
||||||
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
aagl.url = "github:ezKEa/aagl-gtk-on-nix";
|
aagl.url = "github:ezKEa/aagl-gtk-on-nix";
|
||||||
|
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
catppuccin.url = "github:catppuccin/nix/8eada392fd6571a747e1c5fc358dd61c14c8704e";
|
catppuccin.url = "github:catppuccin/nix/8eada392fd6571a747e1c5fc358dd61c14c8704e";
|
||||||
catppuccin.inputs.nixpkgs.follows = "nixpkgs";
|
catppuccin.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
catppuccin-palette = { url = "github:catppuccin/palette"; flake = false; };
|
catppuccin-palette = { url = "github:catppuccin/palette"; flake = false; };
|
||||||
neovim-nightly.url = "github:nix-community/neovim-nightly-overlay";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
neovim-nightly.inputs.nixpkgs.follows = "nixpkgs";
|
neovim-nightly.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
nix-gaming.url = "github:fufexan/nix-gaming";
|
nix-gaming.url = "github:fufexan/nix-gaming";
|
||||||
nix-index-database.url = "github:nix-community/nix-index-database";
|
|
||||||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
spicetify-nix.url = "github:Gerg-L/spicetify-nix";
|
spicetify-nix.url = "github:Gerg-L/spicetify-nix";
|
||||||
spicetify-nix.inputs.nixpkgs.follows = "nixpkgs";
|
spicetify-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
# services
|
# services
|
||||||
pastel.url = "github:cillynder/pastel";
|
# hosts-blocklists = { url = "github:notracking/hosts-blocklists"; flake = false; };
|
||||||
stevenblack-hosts = { url = "github:StevenBlack/hosts"; flake = false; };
|
# website = { url = "github:LavaDesu/lavadesu.github.io/master"; flake = false; };
|
||||||
website = { url = "github:cillynder/lavadesu.github.io/master"; flake = false; };
|
|
||||||
|
|
||||||
# zsh plugins
|
# zsh plugins
|
||||||
zsh-abbr = { url = "git+https://github.com/olets/zsh-abbr?submodules=1"; flake = false; };
|
zsh-abbr = { url = "git+https://github.com/olets/zsh-abbr?submodules=1"; flake = false; };
|
||||||
|
|
@ -36,15 +33,6 @@
|
||||||
spotify-adblock = { url = "github:abba23/spotify-adblock"; flake = false; };
|
spotify-adblock = { url = "github:abba23/spotify-adblock"; flake = false; };
|
||||||
tree-sitter-jsonc = { url = "gitlab:WhyNotHugo/tree-sitter-jsonc"; flake = false; };
|
tree-sitter-jsonc = { url = "gitlab:WhyNotHugo/tree-sitter-jsonc"; flake = false; };
|
||||||
wine-discord-ipc-bridge = { url = "github:0e4ef622/wine-discord-ipc-bridge"; flake = false; };
|
wine-discord-ipc-bridge = { url = "github:0e4ef622/wine-discord-ipc-bridge"; flake = false; };
|
||||||
|
|
||||||
# containers
|
|
||||||
c-amethyst.url = "path:./containers/amethyst";
|
|
||||||
c-beryllium.url = "path:./containers/beryllium";
|
|
||||||
c-citrine.url = "path:./containers/citrine";
|
|
||||||
c-diamond.url = "path:./containers/diamond";
|
|
||||||
c-emerald.url = "path:./containers/emerald";
|
|
||||||
c-fluorite.url = "path:./containers/fluorite";
|
|
||||||
c-garnet.url = "path:./containers/garnet";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, agenix, catppuccin, nixpkgs, ... } @ inputs:
|
outputs = { self, agenix, catppuccin, nixpkgs, ... } @ inputs:
|
||||||
|
|
@ -76,14 +64,11 @@
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
modules = import ./modules { lib = nixpkgs.lib; };
|
modules = import ./modules { lib = nixpkgs.lib; };
|
||||||
gcSecrets = builtins.fromJSON (builtins.readFile "${self}/secrets.gcrypt/shared.json");
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixosConfigurations."alyssum" = mkSystem nixpkgs "alyssum" "x86_64-linux" [];
|
|
||||||
nixosConfigurations."anemone" = mkSystem nixpkgs "anemone" "x86_64-linux" [];
|
nixosConfigurations."anemone" = mkSystem nixpkgs "anemone" "x86_64-linux" [];
|
||||||
nixosConfigurations."dandelion" = mkSystem nixpkgs "dandelion" "aarch64-linux" [];
|
|
||||||
nixosConfigurations."hyacinth" = mkSystem nixpkgs "hyacinth" "x86_64-linux" [];
|
nixosConfigurations."hyacinth" = mkSystem nixpkgs "hyacinth" "x86_64-linux" [];
|
||||||
|
|
||||||
packages."x86_64-linux" =
|
packages."x86_64-linux" =
|
||||||
|
|
|
||||||
|
|
@ -1,45 +0,0 @@
|
||||||
{ inputs, lib, modules, modulesPath, ... }: {
|
|
||||||
networking.hostName = "alyssum";
|
|
||||||
system.stateVersion = "25.11";
|
|
||||||
time.timeZone = "Australia/Melbourne";
|
|
||||||
|
|
||||||
age.secrets = {
|
|
||||||
acme_dns.file = ../../secrets/acme_dns.age;
|
|
||||||
passwd.file = ../../secrets/passwd.age;
|
|
||||||
navidrome_env.file = ../../secrets/navidrome_env.age;
|
|
||||||
wpa_conf = {
|
|
||||||
file = ../../secrets/wpa_conf.age;
|
|
||||||
path = "/etc/wpa_supplicant/imperative.conf";
|
|
||||||
symlink = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
imports = with modules.system; [
|
|
||||||
(modulesPath + "/profiles/qemu-guest.nix")
|
|
||||||
home-manager
|
|
||||||
|
|
||||||
base
|
|
||||||
kernel
|
|
||||||
nix-stable
|
|
||||||
packages
|
|
||||||
security
|
|
||||||
tailscale
|
|
||||||
|
|
||||||
modules.services.nginx
|
|
||||||
modules.services.syncthing
|
|
||||||
|
|
||||||
inputs.c-emerald.nixosModule
|
|
||||||
inputs.c-garnet.nixosModule
|
|
||||||
|
|
||||||
./filesystem.nix
|
|
||||||
./kernel.nix
|
|
||||||
./networking.nix
|
|
||||||
./home.syncthing.nix
|
|
||||||
./samba.nix
|
|
||||||
|
|
||||||
../../users/hana
|
|
||||||
];
|
|
||||||
|
|
||||||
me.environment = "headless";
|
|
||||||
services.syncthing.user = lib.mkForce "hana";
|
|
||||||
}
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
{ ... }:
|
|
||||||
let
|
|
||||||
bind = src: {
|
|
||||||
depends = [ "/nix" ];
|
|
||||||
device = src;
|
|
||||||
fsType = "none";
|
|
||||||
neededForBoot = true;
|
|
||||||
options = [ "bind" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
mkLabelMount = label: type: {
|
|
||||||
device = "/dev/disk/by-label/${label}";
|
|
||||||
fsType = type;
|
|
||||||
options = [ "defaults" "relatime" ];
|
|
||||||
};
|
|
||||||
mkBtrfsMount = name: subvol: atime: mkLabelMount name "btrfs" // {
|
|
||||||
options = [ "autodefrag" "compress=zstd:3" "defaults" "discard=async" "space_cache=v2" "ssd" "subvol=${subvol}" (if atime then "relatime" else "noatime") ];
|
|
||||||
};
|
|
||||||
submount = mkBtrfsMount "alyssum";
|
|
||||||
in {
|
|
||||||
fileSystems = {
|
|
||||||
"/" = {
|
|
||||||
device = "rootfs";
|
|
||||||
fsType = "tmpfs";
|
|
||||||
options = [ "defaults" "size=8G" "mode=755" ];
|
|
||||||
};
|
|
||||||
"/boot" = mkLabelMount "stem" "vfat";
|
|
||||||
|
|
||||||
"/flower" = mkBtrfsMount "myosotis" "/@" true;
|
|
||||||
"/nix" = submount "/@/nix" false;
|
|
||||||
"/persist" = (submount "/@/persist" true) // { neededForBoot = true; };
|
|
||||||
"/persist/.snapshots" = submount "/snap/persist" false;
|
|
||||||
"/var/log/journal" = bind "/persist/journal";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
{ config, lib, ... }:
|
|
||||||
let
|
|
||||||
configOn = user: port: {
|
|
||||||
me.binds."/home/${user}/.config/syncthing" = "${user}/syncthing/config";
|
|
||||||
me.binds."/home/${user}/.local/state/syncthing" = "${user}/syncthing/state";
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [ "d /flower/syncthing/${user} 700 ${user} users" ];
|
|
||||||
|
|
||||||
users.users.${user} = {
|
|
||||||
hashedPasswordFile = config.age.secrets.passwd.path;
|
|
||||||
isNormalUser = true;
|
|
||||||
linger = true;
|
|
||||||
};
|
|
||||||
home-manager.users.${user} = { ... }: {
|
|
||||||
home = {
|
|
||||||
username = "${user}";
|
|
||||||
homeDirectory = "/home/${user}";
|
|
||||||
stateVersion = "26.05";
|
|
||||||
};
|
|
||||||
services.syncthing = {
|
|
||||||
enable = true;
|
|
||||||
guiAddress = "[::]:${toString port}";
|
|
||||||
overrideDevices = false;
|
|
||||||
overrideFolders = false;
|
|
||||||
settings = {
|
|
||||||
options.listenAddresses = [
|
|
||||||
"tcp://0.0.0.0:2${toString port}"
|
|
||||||
"quic://0.0.0.0:2${toString port}"
|
|
||||||
"dynamic+https://relays.syncthing.net/endpoint"
|
|
||||||
];
|
|
||||||
defaults.folder.path = "/flower/syncthing/${user}";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in lib.mkMerge [
|
|
||||||
(configOn "kujira" 8385)
|
|
||||||
(configOn "cilly" 8386)
|
|
||||||
]
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
{ config, lib, ... }: {
|
|
||||||
boot = {
|
|
||||||
loader = {
|
|
||||||
efi.canTouchEfiVariables = true;
|
|
||||||
systemd-boot.enable = true;
|
|
||||||
};
|
|
||||||
initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
|
|
||||||
initrd.kernelModules = [ ];
|
|
||||||
kernelModules = [ "kvm-amd" ];
|
|
||||||
};
|
|
||||||
hardware.cpu.amd.updateMicrocode = true;
|
|
||||||
}
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
{ config, ... }: {
|
|
||||||
networking = {
|
|
||||||
useDHCP = true;
|
|
||||||
wireless.enable = true;
|
|
||||||
|
|
||||||
interfaces.wlp1s0.useDHCP = false;
|
|
||||||
interfaces.wlp1s0.ipv4.addresses = [{
|
|
||||||
address = "192.168.1.167";
|
|
||||||
prefixLength = 24;
|
|
||||||
}];
|
|
||||||
|
|
||||||
defaultGateway = "192.168.1.1";
|
|
||||||
nameservers = [ "8.8.8.8" "8.8.4.4" ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
{ pkgs, ... }: {
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
git
|
|
||||||
htop
|
|
||||||
jq
|
|
||||||
neovim
|
|
||||||
rsync
|
|
||||||
sshfs
|
|
||||||
wget
|
|
||||||
|
|
||||||
kitty.terminfo
|
|
||||||
];
|
|
||||||
environment.variables.EDITOR = "nvim";
|
|
||||||
}
|
|
||||||
|
|
@ -1,84 +0,0 @@
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
let
|
|
||||||
configOn = user: let
|
|
||||||
passwd_fname = "passwd_smb${user}";
|
|
||||||
in {
|
|
||||||
age.secrets.${passwd_fname}.file = ../../secrets/${passwd_fname}.age;
|
|
||||||
me.binds."/flower/smb/${user}/music" = "/flower/media/music/${user}";
|
|
||||||
me.binds."/flower/smb/${user}/syncthing" = "/flower/syncthing/${user}";
|
|
||||||
|
|
||||||
users.users.${user} = {
|
|
||||||
hashedPasswordFile = config.age.secrets.passwd.path;
|
|
||||||
isNormalUser = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
system.activationScripts = {
|
|
||||||
init_smbpasswd.text = let
|
|
||||||
smbpasswd = "${config.services.samba.package}/bin/smbpasswd";
|
|
||||||
in ''
|
|
||||||
printf "$(cat ${config.age.secrets.${passwd_fname}.path})\n$(cat ${config.age.secrets.${passwd_fname}.path})\n" | ${smbpasswd} -sa ${user}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
services.samba.settings."${user}" = {
|
|
||||||
"path" = "/flower/smb/${user}";
|
|
||||||
"browseable" = "yes";
|
|
||||||
"read only" = "no";
|
|
||||||
"guest ok" = "no";
|
|
||||||
"create mask" = "0644";
|
|
||||||
"directory mask" = "0755";
|
|
||||||
"force user" = user;
|
|
||||||
"force group" = "users";
|
|
||||||
"valid users" = user;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in lib.mkMerge [
|
|
||||||
(configOn "cilly")
|
|
||||||
(configOn "kujira")
|
|
||||||
{
|
|
||||||
me.binds."/flower/smb/kujira/opencloud" = "/flower/opencloud/data/storage/users/users/a8e29fc0-673c-4c67-be00-2442904acb43";
|
|
||||||
|
|
||||||
networking.firewall.allowPing = true;
|
|
||||||
|
|
||||||
services.samba = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.samba4Full;
|
|
||||||
openFirewall = true;
|
|
||||||
settings = {
|
|
||||||
global = {
|
|
||||||
"server smb encrypt" = "required";
|
|
||||||
"workgroup" = "WORKGROUP";
|
|
||||||
"server string" = "smbnix";
|
|
||||||
"netbios name" = "smbnix";
|
|
||||||
"security" = "user";
|
|
||||||
"hosts allow" = "100.64.0.0/10 127.0.0.1 alyssum localhost";
|
|
||||||
"hosts deny" = "0.0.0.0/0";
|
|
||||||
"guest account" = "nobody";
|
|
||||||
"map to guest" = "bad user";
|
|
||||||
};
|
|
||||||
"public" = {
|
|
||||||
"path" = "/flower/smb/public";
|
|
||||||
"browseable" = "yes";
|
|
||||||
"read only" = "no";
|
|
||||||
"guest ok" = "yes";
|
|
||||||
"create mask" = "0644";
|
|
||||||
"directory mask" = "0755";
|
|
||||||
"force user" = "hana";
|
|
||||||
"force group" = "users";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.samba-wsdd = {
|
|
||||||
enable = true;
|
|
||||||
openFirewall = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.avahi = {
|
|
||||||
enable = true;
|
|
||||||
openFirewall = true;
|
|
||||||
nssmdns4 = true;
|
|
||||||
publish.enable = true;
|
|
||||||
publish.userServices = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
]
|
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
|
|
||||||
nixpkgs.overlays = [ inputs.neovim-nightly.overlays.default ];
|
nixpkgs.overlays = [ inputs.neovim-nightly.overlays.default ];
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
wg_anemone.file = ../../secrets/wg_anemone.age;
|
|
||||||
passwd.file = ../../secrets/passwd.age;
|
passwd.file = ../../secrets/passwd.age;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -17,7 +16,6 @@
|
||||||
bluetooth
|
bluetooth
|
||||||
ccache
|
ccache
|
||||||
corectrl
|
corectrl
|
||||||
docker
|
|
||||||
flatpak
|
flatpak
|
||||||
greetd
|
greetd
|
||||||
gui
|
gui
|
||||||
|
|
@ -28,8 +26,6 @@
|
||||||
printing
|
printing
|
||||||
security
|
security
|
||||||
snapper
|
snapper
|
||||||
tailscale
|
|
||||||
wireguard
|
|
||||||
|
|
||||||
./filesystem.nix
|
./filesystem.nix
|
||||||
./kernel.nix
|
./kernel.nix
|
||||||
|
|
@ -55,6 +51,4 @@
|
||||||
|
|
||||||
services.fprintd.enable = true;
|
services.fprintd.enable = true;
|
||||||
services.tlp.enable = true;
|
services.tlp.enable = true;
|
||||||
|
|
||||||
programs.kdeconnect.enable = true;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,14 +23,14 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# swapDevices = [{
|
swapDevices = [{
|
||||||
# device = "/persist/swapfile";
|
device = "/persist/swapfile";
|
||||||
# size = 16 * 1024;
|
size = 16 * 1024;
|
||||||
# }];
|
}];
|
||||||
#
|
|
||||||
# systemd.sleep.extraConfig = ''
|
systemd.sleep.extraConfig = ''
|
||||||
# HibernateMode=shutdown
|
HibernateMode=shutdown
|
||||||
# '';
|
'';
|
||||||
/*
|
/*
|
||||||
services.logind.lidSwitch = "suspend-then-hibernate";
|
services.logind.lidSwitch = "suspend-then-hibernate";
|
||||||
systemd.sleep.extraConfig = ''
|
systemd.sleep.extraConfig = ''
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,18 @@
|
||||||
{ config, ... }: {
|
{ config, ... }: {
|
||||||
networking.wireless.iwd.enable = true;
|
networking = {
|
||||||
|
#nameservers = [ "8.8.8.8" "8.8.4.4" ];
|
||||||
|
|
||||||
|
#wg-quick.interfaces.wg0.configFile = "/persist/vpn.conf";
|
||||||
|
|
||||||
|
networkmanager = {
|
||||||
|
enable = true;
|
||||||
|
#dns = "none";
|
||||||
|
};
|
||||||
|
|
||||||
|
extraHosts = ''
|
||||||
|
192.168.100.16 hyacinth
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
environment.etc."NetworkManager/system-connections".source = "/persist/nm_system-connections";
|
environment.etc."NetworkManager/system-connections".source = "/persist/nm_system-connections";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,44 +0,0 @@
|
||||||
{ inputs, modules, modulesPath, ... }: {
|
|
||||||
networking.hostName = "dandelion";
|
|
||||||
system.stateVersion = "23.11";
|
|
||||||
time.timeZone = "Australia/Melbourne";
|
|
||||||
|
|
||||||
age.secrets = {
|
|
||||||
acme_dns.file = ../../secrets/acme_dns.age;
|
|
||||||
slskd_env.file = ../../secrets/slskd_env.age;
|
|
||||||
wg_dandelion.file = ../../secrets/wg_dandelion.age;
|
|
||||||
};
|
|
||||||
|
|
||||||
imports = with modules.system; [
|
|
||||||
(modulesPath + "/profiles/qemu-guest.nix")
|
|
||||||
home-manager
|
|
||||||
|
|
||||||
base
|
|
||||||
kernel
|
|
||||||
nix-stable
|
|
||||||
packages
|
|
||||||
security
|
|
||||||
tailscale
|
|
||||||
wireguard
|
|
||||||
|
|
||||||
modules.services.banksia
|
|
||||||
modules.services.nginx
|
|
||||||
modules.services.unbound
|
|
||||||
modules.services.website
|
|
||||||
|
|
||||||
inputs.c-amethyst.nixosModule
|
|
||||||
inputs.c-beryllium.nixosModule
|
|
||||||
inputs.c-citrine.nixosModule
|
|
||||||
inputs.c-diamond.nixosModule
|
|
||||||
inputs.c-fluorite.nixosModule
|
|
||||||
|
|
||||||
./filesystem.nix
|
|
||||||
./kernel.nix
|
|
||||||
./networking.nix
|
|
||||||
./nginx.nix
|
|
||||||
|
|
||||||
../../users/hana
|
|
||||||
];
|
|
||||||
|
|
||||||
me.environment = "headless";
|
|
||||||
}
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
{ ... }:
|
|
||||||
let
|
|
||||||
bind = src: {
|
|
||||||
depends = [ "/nix" ];
|
|
||||||
device = src;
|
|
||||||
fsType = "none";
|
|
||||||
neededForBoot = true;
|
|
||||||
options = [ "bind" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
mkLabelMount = label: type: {
|
|
||||||
device = "/dev/disk/by-label/${label}";
|
|
||||||
fsType = type;
|
|
||||||
options = [ "defaults" "relatime" ];
|
|
||||||
};
|
|
||||||
mkBtrfsMount = name: subvol: atime: mkLabelMount name "btrfs" // {
|
|
||||||
options = [ "autodefrag" "compress=zstd:3" "defaults" "discard=async" "space_cache=v2" "ssd" "subvol=${subvol}" (if atime then "relatime" else "noatime") ];
|
|
||||||
};
|
|
||||||
submount = mkBtrfsMount "DANDELION";
|
|
||||||
in {
|
|
||||||
fileSystems = {
|
|
||||||
"/" = {
|
|
||||||
device = "rootfs";
|
|
||||||
fsType = "tmpfs";
|
|
||||||
options = [ "defaults" "size=6G" "mode=755" ];
|
|
||||||
};
|
|
||||||
"/boot" = mkLabelMount "UEFI" "vfat";
|
|
||||||
|
|
||||||
"/nix" = submount "/@/nix" false;
|
|
||||||
"/persist" = (submount "/@/persist" true) // { neededForBoot = true; };
|
|
||||||
"/persist/.snapshots" = submount "/snap/persist" false;
|
|
||||||
"/var/log/journal" = bind "/persist/journal";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
{ ... }: {
|
|
||||||
boot = {
|
|
||||||
loader = {
|
|
||||||
efi.canTouchEfiVariables = true;
|
|
||||||
systemd-boot.enable = true;
|
|
||||||
};
|
|
||||||
initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" ];
|
|
||||||
initrd.kernelModules = [ "nvme" ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
{ ... }: {
|
|
||||||
networking.useDHCP = true;
|
|
||||||
networking.interfaces.enp2s0.useDHCP = false;
|
|
||||||
}
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
{ ... }: {
|
|
||||||
services.nginx.virtualHosts."muse.lava.moe" = {
|
|
||||||
useACMEHost = "lava.moe";
|
|
||||||
forceSSL = true;
|
|
||||||
locations."/".return = "404";
|
|
||||||
locations."/share/".proxyPass = "http://[fd0d:2::5:2]:4533";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
{ pkgs, ... }: {
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
git
|
|
||||||
htop
|
|
||||||
jq
|
|
||||||
neovim
|
|
||||||
rsync
|
|
||||||
sshfs
|
|
||||||
wget
|
|
||||||
|
|
||||||
kitty.terminfo
|
|
||||||
];
|
|
||||||
environment.variables.EDITOR = "nvim";
|
|
||||||
}
|
|
||||||
|
|
@ -3,10 +3,11 @@
|
||||||
system.stateVersion = "21.11";
|
system.stateVersion = "21.11";
|
||||||
time.timeZone = "Australia/Melbourne";
|
time.timeZone = "Australia/Melbourne";
|
||||||
|
|
||||||
|
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||||
nixpkgs.overlays = [ inputs.neovim-nightly.overlays.default ];
|
nixpkgs.overlays = [ inputs.neovim-nightly.overlays.default ];
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
passwd.file = ../../secrets/passwd.age;
|
passwd.file = ../../secrets/passwd.age;
|
||||||
wg_hyacinth.file = ../../secrets/wg_hyacinth.age;
|
wg_hyacinth.file = ../../secrets/wg_blossom.age;
|
||||||
wpa_conf.file = ../../secrets/wpa_conf.age;
|
wpa_conf.file = ../../secrets/wpa_conf.age;
|
||||||
};
|
};
|
||||||
imports = with modules.system; [
|
imports = with modules.system; [
|
||||||
|
|
@ -18,7 +19,6 @@
|
||||||
bluetooth
|
bluetooth
|
||||||
ccache
|
ccache
|
||||||
corectrl
|
corectrl
|
||||||
docker
|
|
||||||
flatpak
|
flatpak
|
||||||
greetd
|
greetd
|
||||||
gui
|
gui
|
||||||
|
|
@ -29,8 +29,7 @@
|
||||||
printing
|
printing
|
||||||
security
|
security
|
||||||
snapper
|
snapper
|
||||||
tailscale
|
virtualisation
|
||||||
wireguard
|
|
||||||
|
|
||||||
modules.services.syncthing
|
modules.services.syncthing
|
||||||
|
|
||||||
|
|
@ -43,5 +42,5 @@
|
||||||
];
|
];
|
||||||
systemd.services.nix-daemon.environment.TMPDIR = "/nix/tmp";
|
systemd.services.nix-daemon.environment.TMPDIR = "/nix/tmp";
|
||||||
|
|
||||||
me.hasBluetooth = true;
|
services.jenkins.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ in
|
||||||
"/" = {
|
"/" = {
|
||||||
device = "rootfs";
|
device = "rootfs";
|
||||||
fsType = "tmpfs";
|
fsType = "tmpfs";
|
||||||
options = [ "defaults" "size=24G" "mode=755" ];
|
options = [ "defaults" "size=8G" "mode=755" ];
|
||||||
};
|
};
|
||||||
"/boot" = mkLabelMount "CUP" "vfat";
|
"/boot" = mkLabelMount "CUP" "vfat";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,4 @@
|
||||||
];
|
];
|
||||||
kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.me.linux-lava);
|
kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.me.linux-lava);
|
||||||
};
|
};
|
||||||
hardware.amdgpu.overdrive = {
|
|
||||||
enable = true;
|
|
||||||
ppfeaturemask = "0xffffffff";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,13 +3,12 @@
|
||||||
networking = {
|
networking = {
|
||||||
useDHCP = true;
|
useDHCP = true;
|
||||||
interfaces.enp5s0.useDHCP = false;
|
interfaces.enp5s0.useDHCP = false;
|
||||||
interfaces.enp5s0.wakeOnLan.enable = true;
|
|
||||||
|
|
||||||
interfaces.enp5s0.ipv4.addresses = [{
|
interfaces.enp5s0.ipv4.addresses = [{
|
||||||
address = "192.168.1.201";
|
address = "192.168.0.151";
|
||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
}];
|
}];
|
||||||
defaultGateway = "192.168.1.1";
|
defaultGateway = "192.168.0.1";
|
||||||
nameservers = [ "8.8.8.8" "8.8.4.4" ];
|
nameservers = [ "8.8.8.8" "8.8.4.4" ];
|
||||||
|
|
||||||
extraHosts = ''
|
extraHosts = ''
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
discord
|
jetbrains.idea-community-bin
|
||||||
jetbrains.idea
|
|
||||||
texliveFull
|
texliveFull
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
{ config, lib, ...}: {
|
|
||||||
imports = [ ./options.nix ];
|
|
||||||
fileSystems = lib.mapAttrs (dest: key: let
|
|
||||||
target = if (lib.strings.hasPrefix "/" key)
|
|
||||||
then key
|
|
||||||
else "/persist/binds/${key}";
|
|
||||||
in {
|
|
||||||
depends = [ "/persist" ];
|
|
||||||
device = target;
|
|
||||||
fsType = "none";
|
|
||||||
options = [ "bind" ];
|
|
||||||
}) config.me.binds;
|
|
||||||
}
|
|
||||||
|
|
@ -14,10 +14,8 @@ let
|
||||||
}) paths
|
}) paths
|
||||||
);
|
);
|
||||||
in {
|
in {
|
||||||
binds = ./binds.nix;
|
|
||||||
options = ./options.nix;
|
options = ./options.nix;
|
||||||
services = mkAttrsFromPaths [
|
services = mkAttrsFromPaths [
|
||||||
./services/banksia.nix
|
|
||||||
./services/jellyfin.nix
|
./services/jellyfin.nix
|
||||||
./services/nginx.nix
|
./services/nginx.nix
|
||||||
./services/postgres.nix
|
./services/postgres.nix
|
||||||
|
|
@ -25,10 +23,8 @@ in {
|
||||||
./services/synapse.nix
|
./services/synapse.nix
|
||||||
./services/syncthing.nix
|
./services/syncthing.nix
|
||||||
./services/tmptsync.nix
|
./services/tmptsync.nix
|
||||||
./services/transmission.nix
|
|
||||||
./services/unbound.nix
|
./services/unbound.nix
|
||||||
./services/vaultwarden.nix
|
./services/vaultwarden.nix
|
||||||
./services/website.nix
|
|
||||||
];
|
];
|
||||||
system = mkAttrsFromPaths [
|
system = mkAttrsFromPaths [
|
||||||
./system/aagl.nix
|
./system/aagl.nix
|
||||||
|
|
@ -37,7 +33,6 @@ in {
|
||||||
./system/bluetooth.nix
|
./system/bluetooth.nix
|
||||||
./system/ccache.nix
|
./system/ccache.nix
|
||||||
./system/corectrl.nix
|
./system/corectrl.nix
|
||||||
./system/docker.nix
|
|
||||||
./system/flatpak.nix
|
./system/flatpak.nix
|
||||||
./system/greetd.nix
|
./system/greetd.nix
|
||||||
./system/gui.nix
|
./system/gui.nix
|
||||||
|
|
@ -50,13 +45,12 @@ in {
|
||||||
./system/printing.nix
|
./system/printing.nix
|
||||||
./system/security.nix
|
./system/security.nix
|
||||||
./system/snapper.nix
|
./system/snapper.nix
|
||||||
./system/tailscale.nix
|
./system/transmission.nix
|
||||||
./system/virtualisation.nix
|
./system/virtualisation.nix
|
||||||
./system/wireguard.nix
|
./system/wireguard.nix
|
||||||
];
|
];
|
||||||
user = mkAttrsFromPaths [
|
user = mkAttrsFromPaths [
|
||||||
./user/catppuccin.nix
|
./user/catppuccin.nix
|
||||||
./user/comma.nix
|
|
||||||
./user/direnv.nix
|
./user/direnv.nix
|
||||||
./user/dunst.nix
|
./user/dunst.nix
|
||||||
./user/eww.nix
|
./user/eww.nix
|
||||||
|
|
|
||||||
|
|
@ -44,10 +44,5 @@ in {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
default = false;
|
default = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
binds = lib.mkOption {
|
|
||||||
type = with lib.types; attrsOf str;
|
|
||||||
default = {};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
# TODO ^^
|
|
||||||
{ ... }: {
|
|
||||||
services.nginx.virtualHosts = {
|
|
||||||
"banksia.lava.moe" = {
|
|
||||||
useACMEHost = "lava.moe";
|
|
||||||
forceSSL = true;
|
|
||||||
locations."/".return = "302 https://lab.lava.moe/cilly/Banksia";
|
|
||||||
locations."/api".proxyPass = "http://localhost:8080/";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,21 +1,18 @@
|
||||||
{ config, ... }: {
|
{ config, inputs, ... }: {
|
||||||
networking.firewall.allowedTCPPorts = [ 80 443 ];
|
networking.firewall.allowedTCPPorts = [ 80 443 ];
|
||||||
security.acme = {
|
security.acme = {
|
||||||
acceptTerms = true;
|
acceptTerms = true;
|
||||||
defaults = {
|
email = "me@lava.moe";
|
||||||
email = "me@lava.moe";
|
|
||||||
group = "nginx";
|
|
||||||
dnsProvider = "cloudflare";
|
|
||||||
environmentFile = config.age.secrets."acme_dns".path;
|
|
||||||
};
|
|
||||||
certs."lava.moe" = {
|
certs."lava.moe" = {
|
||||||
|
group = "nginx";
|
||||||
|
domain = "lava.moe";
|
||||||
extraDomainNames = [
|
extraDomainNames = [
|
||||||
"*.lava.moe"
|
"*.lava.moe"
|
||||||
"*.local.lava.moe"
|
"*.local.lava.moe"
|
||||||
];
|
];
|
||||||
|
dnsProvider = "cloudflare";
|
||||||
|
credentialsFile = config.age.secrets."acme_dns".path;
|
||||||
};
|
};
|
||||||
certs."cilly.moe" = {};
|
|
||||||
certs."cilly.dev" = {};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
|
|
@ -24,5 +21,28 @@
|
||||||
recommendedOptimisation = true;
|
recommendedOptimisation = true;
|
||||||
recommendedGzipSettings = true;
|
recommendedGzipSettings = true;
|
||||||
recommendedProxySettings = true;
|
recommendedProxySettings = true;
|
||||||
|
|
||||||
|
virtualHosts = {
|
||||||
|
"lava.moe" = {
|
||||||
|
useACMEHost = "lava.moe";
|
||||||
|
forceSSL = true;
|
||||||
|
root = inputs.website.outPath;
|
||||||
|
};
|
||||||
|
"cdn.lava.moe" = {
|
||||||
|
useACMEHost = "lava.moe";
|
||||||
|
forceSSL = true;
|
||||||
|
root = "/persist/cdn";
|
||||||
|
};
|
||||||
|
"_" = {
|
||||||
|
default = true;
|
||||||
|
addSSL = true;
|
||||||
|
# TODO generate this somewhere
|
||||||
|
sslCertificate = "/persist/fakeCerts/fake.crt";
|
||||||
|
sslCertificateKey = "/persist/fakeCerts/fake.key";
|
||||||
|
extraConfig = ''
|
||||||
|
return 444;
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ in {
|
||||||
services.postgresql = {
|
services.postgresql = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dataDir = dir;
|
dataDir = dir;
|
||||||
# TODO: broken :3
|
|
||||||
package = pkgs.postgresql_13;
|
package = pkgs.postgresql_13;
|
||||||
authentication = lib.mkOverride 10 ''
|
authentication = lib.mkOverride 10 ''
|
||||||
#type database DBuser origin-address auth-method
|
#type database DBuser origin-address auth-method
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
{ config, ... }:
|
{ config, ... }:
|
||||||
let
|
let
|
||||||
dir = "/persist/shared/.syncthing";
|
dir = "/persist/shared/.syncthing";
|
||||||
user = if config.me.gui then "rin" else "hana";
|
uid = toString config.users.users.rin.uid;
|
||||||
uid = toString config.users.users."${user}".uid;
|
|
||||||
gid = toString config.users.groups.users.gid;
|
gid = toString config.users.groups.users.gid;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
@ -14,10 +13,9 @@ in
|
||||||
services.syncthing = {
|
services.syncthing = {
|
||||||
enable = true;
|
enable = true;
|
||||||
openDefaultPorts = true;
|
openDefaultPorts = true;
|
||||||
user = user;
|
user = "rin";
|
||||||
group = "users";
|
group = "users";
|
||||||
dataDir = "/persist/shared/.syncthing/data";
|
dataDir = "/persist/shared/.syncthing/data";
|
||||||
configDir = "/persist/shared/.syncthing/config";
|
configDir = "/persist/shared/.syncthing/config";
|
||||||
guiAddress = if config.me.gui then "127.0.0.1:8384" else ":8384";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,8 @@
|
||||||
{ inputs, pkgs, gcSecrets, ... }:
|
{ inputs, ... }:
|
||||||
let
|
let
|
||||||
dir = "/persist/unbound";
|
dir = "/persist/unbound";
|
||||||
|
|
||||||
converted = pkgs.runCommand "stevenblack-hosts-unbound" {} ''
|
|
||||||
echo "server:" > "$out"
|
|
||||||
grep '^0\.0\.0\.0' "${inputs.stevenblack-hosts}/hosts" | awk '{print "local-zone: \""$2"\" always_refuse"}' | tail -n +2 >> "$out"
|
|
||||||
'';
|
|
||||||
in {
|
in {
|
||||||
networking.firewall.interfaces."ve-+" = {
|
networking.firewall.interfaces.wlan0 = {
|
||||||
allowedUDPPorts = [ 53 853 ];
|
|
||||||
allowedTCPPorts = [ 53 853 ];
|
|
||||||
};
|
|
||||||
networking.firewall.interfaces.wg0 = {
|
|
||||||
allowedUDPPorts = [ 53 853 ];
|
allowedUDPPorts = [ 53 853 ];
|
||||||
allowedTCPPorts = [ 53 853 ];
|
allowedTCPPorts = [ 53 853 ];
|
||||||
};
|
};
|
||||||
|
|
@ -25,27 +16,17 @@ in {
|
||||||
name = ".";
|
name = ".";
|
||||||
forward-tls-upstream = true;
|
forward-tls-upstream = true;
|
||||||
forward-addr = [
|
forward-addr = [
|
||||||
"2606:4700:4700::1111@853#cloudflare-dns.com"
|
|
||||||
"2606:4700:4700::1001@853#cloudflare-dns.com"
|
|
||||||
"2001:4860:4860::8888@853#dns.google"
|
|
||||||
"2001:4860:4860::8844@853#dns.google"
|
|
||||||
"1.1.1.1@853#cloudflare-dns.com"
|
"1.1.1.1@853#cloudflare-dns.com"
|
||||||
"1.0.0.1@853#cloudflare-dns.com"
|
"1.0.0.1@853#cloudflare-dns.com"
|
||||||
"8.8.8.8@853#dns.google"
|
|
||||||
"8.8.4.4@853#dns.google"
|
|
||||||
];
|
];
|
||||||
}];
|
}];
|
||||||
|
|
||||||
server = {
|
server = {
|
||||||
interface = [ "0.0.0.0" "::0" ];
|
interface = [ "0.0.0.0" ];
|
||||||
access-control = [
|
access-control = [
|
||||||
"127.0.0.1/8 allow"
|
"127.0.0.1/8 allow"
|
||||||
"10.0.0.0/8 allow"
|
"10.0.0.0/8 allow"
|
||||||
"100.64.0.0/10 allow"
|
|
||||||
"192.168.100.0/24 allow"
|
"192.168.100.0/24 allow"
|
||||||
"fd0d::/16 allow"
|
|
||||||
"fd7a:115c:a1e0::/48 allow"
|
|
||||||
"${gcSecrets.wireguard.ipv6Subnet}:/80 allow"
|
|
||||||
];
|
];
|
||||||
domain-insecure = [ "\"local.lava.moe\"" ];
|
domain-insecure = [ "\"local.lava.moe\"" ];
|
||||||
local-zone = [ "\"warden.local.lava.moe.\" redirect" ];
|
local-zone = [ "\"warden.local.lava.moe.\" redirect" ];
|
||||||
|
|
@ -54,7 +35,7 @@ in {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
include = "${converted}";
|
include = "${inputs.hosts-blocklists}/unbound/unbound.blacklist.conf";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
||||||
{ inputs, pkgs, ... }: let
|
|
||||||
pastel = inputs.pastel.packages.${pkgs.system}.default;
|
|
||||||
in {
|
|
||||||
services.nginx.virtualHosts = {
|
|
||||||
"cilly.moe" = {
|
|
||||||
useACMEHost = "cilly.moe";
|
|
||||||
forceSSL = true;
|
|
||||||
root = pastel.outPath;
|
|
||||||
};
|
|
||||||
"cilly.dev" = {
|
|
||||||
useACMEHost = "cilly.dev";
|
|
||||||
forceSSL = true;
|
|
||||||
root = pastel.outPath;
|
|
||||||
};
|
|
||||||
"lava.moe" = {
|
|
||||||
useACMEHost = "lava.moe";
|
|
||||||
forceSSL = true;
|
|
||||||
root = inputs.website.outPath;
|
|
||||||
};
|
|
||||||
"cdn.lava.moe" = {
|
|
||||||
useACMEHost = "lava.moe";
|
|
||||||
forceSSL = true;
|
|
||||||
extraConfig = ''
|
|
||||||
return 301 https://sh.lava.moe$request_uri;
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
"sh.lava.moe" = {
|
|
||||||
useACMEHost = "lava.moe";
|
|
||||||
forceSSL = true;
|
|
||||||
root = "/persist/cdn";
|
|
||||||
};
|
|
||||||
"_" = {
|
|
||||||
default = true;
|
|
||||||
addSSL = true;
|
|
||||||
# TODO generate this somewhere
|
|
||||||
sslCertificate = "/persist/fakeCerts/fake.crt";
|
|
||||||
sslCertificateKey = "/persist/fakeCerts/fake.key";
|
|
||||||
extraConfig = ''
|
|
||||||
return 444;
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
{ config, inputs, modules, ... }: {
|
{ config, inputs, modules, ... }: {
|
||||||
imports = [ modules.binds modules.options ];
|
imports = [ modules.options ];
|
||||||
|
|
||||||
environment.etc = {
|
environment.etc = {
|
||||||
"machine-id".source = "/persist/machine-id";
|
"machine-id".source = "/persist/machine-id";
|
||||||
|
|
@ -11,8 +11,6 @@
|
||||||
environment.pathsToLink = [ "/share/zsh" ];
|
environment.pathsToLink = [ "/share/zsh" ];
|
||||||
|
|
||||||
i18n.defaultLocale = "en_AU.UTF-8";
|
i18n.defaultLocale = "en_AU.UTF-8";
|
||||||
i18n.extraLocales = [ "en_GB.UTF-8/UTF-8" ];
|
|
||||||
|
|
||||||
users.mutableUsers = false;
|
users.mutableUsers = false;
|
||||||
|
|
||||||
system = {
|
system = {
|
||||||
|
|
@ -23,5 +21,6 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
nix.registry.config.flake = inputs.self;
|
nix.registry.config.flake = inputs.self;
|
||||||
|
nix.registry.nixpkgs.flake = inputs.nixpkgs;
|
||||||
nix.registry.shells.flake = inputs.self;
|
nix.registry.shells.flake = inputs.self;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,9 @@
|
||||||
{ ... }: {
|
{ ... }: {
|
||||||
programs.corectrl = {
|
programs.corectrl = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
gpuOverclock = {
|
||||||
|
enable = true;
|
||||||
|
ppfeaturemask = "0xffffffff";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
{ pkgs, ... }: {
|
|
||||||
virtualisation.docker = {
|
|
||||||
enable = true;
|
|
||||||
storageDriver = "btrfs";
|
|
||||||
# rootless = {
|
|
||||||
# enable = true;
|
|
||||||
# setSocketVariable = true;
|
|
||||||
# };
|
|
||||||
};
|
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.docker-compose
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
default_session = {
|
default_session = {
|
||||||
command = "${pkgs.tuigreet}/bin/tuigreet --remember --asterisks --time --cmd 'zsh -c \"source $HOME/.config/zsh/.zshrc && Hyprland > $XDG_RUNTIME_DIR/Hyprland.out\"'";
|
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --asterisks --time --cmd 'zsh -c \"source $HOME/.config/zsh/.zshrc && Hyprland > $XDG_RUNTIME_DIR/Hyprland.out\"'";
|
||||||
user = "greeter";
|
user = "greeter";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@
|
||||||
hanazono
|
hanazono
|
||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-cjk-sans
|
noto-fonts-cjk-sans
|
||||||
|
noto-fonts-extra
|
||||||
open-sans
|
open-sans
|
||||||
twemoji-color-font
|
twemoji-color-font
|
||||||
unifont
|
unifont
|
||||||
|
|
|
||||||
|
|
@ -6,19 +6,7 @@
|
||||||
"-arinterval 15"
|
"-arinterval 15"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
xkb.options = "caps:escape";
|
||||||
};
|
};
|
||||||
services.keyd = {
|
console.useXkbConfig = true;
|
||||||
enable = true;
|
|
||||||
keyboards = {
|
|
||||||
default = {
|
|
||||||
ids = [ "*" ];
|
|
||||||
settings = {
|
|
||||||
main = {
|
|
||||||
capslock = "esc";
|
|
||||||
esc = "capslock";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,5 @@
|
||||||
{ config, lib, pkgs, ... }: {
|
{ config, lib, pkgs, ... }: {
|
||||||
nix = {
|
nix = {
|
||||||
package = pkgs.nixVersions.latest;
|
|
||||||
|
|
||||||
settings = rec {
|
settings = rec {
|
||||||
substituters = [
|
substituters = [
|
||||||
"https://cache.nixos.org?priority=10"
|
"https://cache.nixos.org?priority=10"
|
||||||
|
|
@ -19,5 +17,4 @@
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
programs.nh.enable = true;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
{ config, inputs, pkgs, ... }: {
|
{ config, lib, pkgs, ... }: {
|
||||||
nix = {
|
nix = {
|
||||||
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
|
|
||||||
package = pkgs.nixVersions.latest;
|
package = pkgs.nixVersions.latest;
|
||||||
|
|
||||||
settings = rec {
|
settings = rec {
|
||||||
|
|
@ -24,5 +23,5 @@
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
programs.nh.enable = true;
|
system.rebuild.enableNg = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,16 @@
|
||||||
{ config, lib, pkgs, ... }: {
|
{ config, lib, pkgs, ... }: {
|
||||||
config = lib.mkIf config.me.gui {
|
config = lib.mkIf config.me.gui {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
android-tools
|
gparted
|
||||||
gparted
|
|
||||||
nautilus
|
nautilus
|
||||||
];
|
];
|
||||||
|
programs.adb.enable = true;
|
||||||
hardware.graphics.extraPackages = with pkgs; [
|
hardware.graphics.extraPackages = with pkgs; [
|
||||||
intel-vaapi-driver
|
vaapiIntel
|
||||||
libva-vdpau-driver
|
vaapiVdpau
|
||||||
libvdpau-va-gl
|
libvdpau-va-gl
|
||||||
];
|
];
|
||||||
|
programs.light.enable = true;
|
||||||
hardware.opentabletdriver.enable = true;
|
hardware.opentabletdriver.enable = true;
|
||||||
hardware.keyboard.qmk.enable = true;
|
hardware.keyboard.qmk.enable = true;
|
||||||
programs.steam = {
|
programs.steam = {
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,12 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
imports = [ ./packages-gui.nix ];
|
imports = [ ./packages-gui.nix ];
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# ecryptfs
|
comma
|
||||||
|
ecryptfs
|
||||||
efibootmgr
|
efibootmgr
|
||||||
fd
|
|
||||||
git
|
git
|
||||||
git-crypt
|
|
||||||
htop
|
htop
|
||||||
jq
|
jq
|
||||||
kitty.terminfo
|
|
||||||
libarchive
|
libarchive
|
||||||
lf
|
lf
|
||||||
msr-tools
|
msr-tools
|
||||||
|
|
@ -16,9 +14,8 @@
|
||||||
neovim
|
neovim
|
||||||
nfs-utils
|
nfs-utils
|
||||||
ntfs3g
|
ntfs3g
|
||||||
ripgrep
|
|
||||||
rsync
|
|
||||||
sshfs
|
sshfs
|
||||||
|
rsync
|
||||||
wget
|
wget
|
||||||
];
|
];
|
||||||
environment.variables.EDITOR = "nvim";
|
environment.variables.EDITOR = "nvim";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, lib, pkgs, ... }: {
|
{ config, pkgs, ... }: {
|
||||||
networking.firewall =
|
networking.firewall =
|
||||||
let
|
let
|
||||||
iptables = "${pkgs.iptables}/bin/iptables";
|
iptables = "${pkgs.iptables}/bin/iptables";
|
||||||
|
|
@ -53,33 +53,5 @@
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
pam = lib.mkIf (config.me.environment != "headless") {
|
|
||||||
u2f = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
cue = true;
|
|
||||||
pinverification = 1;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
services.doas.rules.auth = {
|
|
||||||
u2f.settings.pinverification = lib.mkForce 0;
|
|
||||||
u2f_int = lib.mkMerge [
|
|
||||||
{
|
|
||||||
enable = true;
|
|
||||||
order = config.security.pam.services.doas.rules.auth.u2f.order + 1;
|
|
||||||
control = "sufficient";
|
|
||||||
modulePath = "${pkgs.pam_u2f}/lib/security/pam_u2f.so";
|
|
||||||
inherit (config.security.pam.u2f) settings;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
settings = lib.mkForce {
|
|
||||||
interactive = true;
|
|
||||||
pinverification = 0;
|
|
||||||
userpresence = 0;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
{ config, lib, ... }: {
|
|
||||||
age.secrets.tailscale_auth.file = ../../secrets/tailscale_auth.age;
|
|
||||||
me.binds."/var/lib/tailscale" = "tailscale";
|
|
||||||
networking.firewall.trustedInterfaces = [ "tailscale0" ];
|
|
||||||
networking.firewall.allowedUDPPorts = lib.mkIf (config.me.environment == "headless") [ 123 ];
|
|
||||||
|
|
||||||
services.tailscale = {
|
|
||||||
enable = true;
|
|
||||||
authKeyFile = config.age.secrets.tailscale_auth.path;
|
|
||||||
openFirewall = true;
|
|
||||||
useRoutingFeatures = if config.me.environment == "headless" then "both" else "client";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -5,6 +5,13 @@
|
||||||
downloadDirPermissions = "775";
|
downloadDirPermissions = "775";
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
alt-speed-down = 512;
|
||||||
|
alt-speed-enabled = true;
|
||||||
|
alt-speed-time-begin = 360;
|
||||||
|
alt-speed-time-day = 127;
|
||||||
|
alt-speed-time-enabled = true;
|
||||||
|
alt-speed-time-end = 1380;
|
||||||
|
alt-speed-up = 256;
|
||||||
download-dir = "/persist/transmission/Downloads";
|
download-dir = "/persist/transmission/Downloads";
|
||||||
incomplete-dir = "/persist/transmission/.incomplete";
|
incomplete-dir = "/persist/transmission/.incomplete";
|
||||||
ratio-limit-enabled = true;
|
ratio-limit-enabled = true;
|
||||||
|
|
@ -1,11 +1,13 @@
|
||||||
{ config, lib, pkgs, gcSecrets, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
port = 51801;
|
port = 51820;
|
||||||
serverName = "dandelion";
|
serverName = "sugarcane";
|
||||||
serverInterface = "enp0s6";
|
serverInterface = "ens3";
|
||||||
serverIp = gcSecrets.wireguard.gateway;
|
serverIp = "51.79.240.130";
|
||||||
|
|
||||||
forwarding = {
|
forwarding = {
|
||||||
|
"80" = [ "10.100.0.2" "80" ];
|
||||||
|
"443" = [ "10.100.0.2" "443" ];
|
||||||
"22727" = [ "10.100.0.3" "7777" ];
|
"22727" = [ "10.100.0.3" "7777" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -18,61 +20,52 @@ let
|
||||||
in ''
|
in ''
|
||||||
${pkgs.iptables}/bin/iptables -${type} PREROUTING -t nat -i ${serverInterface} -p tcp --dport ${sport} -j DNAT --to ${dest}:${dport}
|
${pkgs.iptables}/bin/iptables -${type} PREROUTING -t nat -i ${serverInterface} -p tcp --dport ${sport} -j DNAT --to ${dest}:${dport}
|
||||||
${pkgs.iptables}/bin/iptables -${type} FORWARD -p tcp -d ${dest} --dport ${dport} -j ACCEPT
|
${pkgs.iptables}/bin/iptables -${type} FORWARD -p tcp -d ${dest} --dport ${dport} -j ACCEPT
|
||||||
${pkgs.iptables}/bin/iptables -${type} PREROUTING -t nat -i ${serverInterface} -p udp --dport ${sport} -j DNAT --to ${dest}:${dport}
|
|
||||||
${pkgs.iptables}/bin/iptables -${type} FORWARD -p udp -d ${dest} --dport ${dport} -j ACCEPT
|
|
||||||
'') forwarding
|
'') forwarding
|
||||||
);
|
);
|
||||||
|
|
||||||
clients = {
|
routeBypass = {
|
||||||
|
caramel = {
|
||||||
|
gateway = "192.168.100.1";
|
||||||
|
interface = "wlan0";
|
||||||
|
routes = [
|
||||||
|
serverIp
|
||||||
|
];
|
||||||
|
};
|
||||||
hyacinth = {
|
hyacinth = {
|
||||||
publicKey = "6nVhazYdmC15A/nke9VrqIg3sOBVOmqj4GEsyBq7MVo=";
|
gateway = "192.168.100.1";
|
||||||
allowedIPs = [ "10.100.0.3/32" "${gcSecrets.wireguard.ipv6Subnet}:3" "fd0d::3" ];
|
interface = "enp5s0";
|
||||||
interfaces = {
|
routes = [
|
||||||
wg0 = { peers = [ server6OnlyPeer ]; };
|
serverIp
|
||||||
wg1 = { peers = [ serverPeer ]; autostart = false; };
|
];
|
||||||
wg2 = { peers = [ serverLocalOnlyPeer ]; autostart = false; };
|
|
||||||
};
|
|
||||||
};
|
|
||||||
anemone = {
|
|
||||||
publicKey = "px5+JNdAmqBvUC++DhiJrUBRAr+BYP6iYVt4sbhPTWY=";
|
|
||||||
allowedIPs = [ "10.100.0.4/32" "${gcSecrets.wireguard.ipv6Subnet}:4" "fd0d::4" ];
|
|
||||||
interfaces = {
|
|
||||||
wg0 = { peers = [ server6OnlyPeer ]; };
|
|
||||||
wg1 = { peers = [ serverPeer ]; autostart = false; };
|
|
||||||
wg2 = { peers = [ serverLocalOnlyPeer ]; autostart = false; };
|
|
||||||
};
|
|
||||||
};
|
|
||||||
hibiscus = {
|
|
||||||
publicKey = "vQ5a2KMrwi7RCRsD0yvog+n35vQYFuvwiPn+W4lbRBw=";
|
|
||||||
allowedIPs = [ "10.100.0.5/32" "${gcSecrets.wireguard.ipv6Subnet}:5" "fd0d::5" ];
|
|
||||||
interfaces = {
|
|
||||||
wg0 = { peers = [ server6OnlyPeer ]; };
|
|
||||||
wg1 = { peers = [ serverPeer ]; autostart = false; };
|
|
||||||
wg2 = { peers = [ serverLocalOnlyPeer ]; autostart = false; };
|
|
||||||
};
|
|
||||||
};
|
|
||||||
hazel = {
|
|
||||||
publicKey = "0zruTndObzHo+b1rbOuTsxCU97epygZycxXS/lgUHUc=";
|
|
||||||
allowedIPs = [ "10.100.0.21/32" "${gcSecrets.wireguard.ipv6Subnet}:21" "fd0d::21" ];
|
|
||||||
interfaces = {
|
|
||||||
wg0 = {
|
|
||||||
dns = [ "::1" "127.0.0.1" ];
|
|
||||||
peers = [ serverLocalOnlyPeer ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
clientPeers = builtins.map (client: builtins.removeAttrs client [ "interfaces" ]) (builtins.attrValues clients);
|
clients = {
|
||||||
serverPeerWith = ips: {
|
caramel = {
|
||||||
|
publicKey = "VDqcpS0lJzFgwikj61MJ1xc9P8Cuq0NXa+Hc+etn2iA=";
|
||||||
|
allowedIPs = [ "10.100.0.2/32" ];
|
||||||
|
};
|
||||||
|
hyacinth = {
|
||||||
|
publicKey = "6nVhazYdmC15A/nke9VrqIg3sOBVOmqj4GEsyBq7MVo=";
|
||||||
|
allowedIPs = [ "10.100.0.3/32" ];
|
||||||
|
};
|
||||||
|
strawberry = {
|
||||||
|
publicKey = "Fkcp/VSN4Dkhly8V4hskF4lnDviA7VZHCnWf7OliFCg=";
|
||||||
|
allowedIPs = [ "10.100.0.4/32" ];
|
||||||
|
};
|
||||||
|
maple = {
|
||||||
|
publicKey = "kPw8hpANygfz83Oi/l+iCVYalV2zfs7fhkccjoGG2Do=";
|
||||||
|
allowedIPs = [ "10.100.0.5/32" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
clientPeers = builtins.attrValues clients;
|
||||||
|
serverPeer = {
|
||||||
publicKey = "3ugIk2tQZXjAH9/95s63ld2WNUHQrd4Mz5jzbln6oj0=";
|
publicKey = "3ugIk2tQZXjAH9/95s63ld2WNUHQrd4Mz5jzbln6oj0=";
|
||||||
allowedIPs = ips;
|
allowedIPs = [ "0.0.0.0/0" ];
|
||||||
endpoint = "${serverIp}:${toString port}";
|
endpoint = "${serverIp}:${toString port}";
|
||||||
persistentKeepalive = 25;
|
persistentKeepalive = 25;
|
||||||
};
|
};
|
||||||
serverPeer = serverPeerWith [ "0.0.0.0/0" "::/0" ];
|
|
||||||
server6OnlyPeer = serverPeerWith [ "10.100.0.0/24" "::/0" ];
|
|
||||||
serverLocalOnlyPeer = serverPeerWith [ "10.100.0.0/24" "fd0d::/16" ];
|
|
||||||
|
|
||||||
serverConfig = {
|
serverConfig = {
|
||||||
nat = {
|
nat = {
|
||||||
|
|
@ -86,7 +79,7 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
wireguard.interfaces.wg0 = {
|
wireguard.interfaces.wg0 = {
|
||||||
ips = [ "10.100.0.1/24" "${gcSecrets.wireguard.ipv6Subnet}:1" "fd0d::1" ];
|
ips = [ "10.100.0.1/24" ];
|
||||||
listenPort = port;
|
listenPort = port;
|
||||||
|
|
||||||
postSetup = ''
|
postSetup = ''
|
||||||
|
|
@ -104,24 +97,33 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
clientConfig = {
|
clientConfig = {
|
||||||
wg-quick.interfaces =
|
wireguard.interfaces.wg0 =
|
||||||
let
|
let
|
||||||
client = clients."${config.networking.hostName}";
|
client = clients."${config.networking.hostName}";
|
||||||
in
|
routes = routeBypass."${config.networking.hostName}";
|
||||||
builtins.mapAttrs (interface: conf: {
|
mapRoutes = type: lib.concatMapStringsSep "\n" (r: "${pkgs.iproute2}/bin/ip route ${type} ${r} via ${routes.gateway} dev ${routes.interface}") routes.routes;
|
||||||
address = client.allowedIPs;
|
in {
|
||||||
dns = [ "fd0d::1" "10.100.0.1" ];
|
ips = client.allowedIPs;
|
||||||
privateKeyFile = config.age.secrets."wg_${config.networking.hostName}".path;
|
listenPort = port;
|
||||||
} // conf) client.interfaces;
|
|
||||||
|
postSetup = ''
|
||||||
|
${mapRoutes "add"}
|
||||||
|
${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.100.0.0/24 -o ${serverInterface} -j MASQUERADE
|
||||||
|
'';
|
||||||
|
|
||||||
|
postShutdown = ''
|
||||||
|
${mapRoutes "del"}
|
||||||
|
${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.100.0.0/24 -o ${serverInterface} -j MASQUERADE
|
||||||
|
'';
|
||||||
|
|
||||||
|
privateKeyFile = config.age.secrets."wg_${config.networking.hostName}".path;
|
||||||
|
peers = [ serverPeer ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
boot.kernel.sysctl = lib.mkIf (config.networking.hostName == serverName) ({
|
|
||||||
"net.ipv6.conf.all.forwarding" = true;
|
|
||||||
"net.ipv6.conf.default.forwarding" = true;
|
|
||||||
});
|
|
||||||
networking =
|
networking =
|
||||||
lib.mkMerge [
|
lib.mkMerge [
|
||||||
(lib.mkIf (config.networking.hostName == serverName) serverConfig)
|
(lib.mkIf (config.networking.hostName == serverName) serverConfig)
|
||||||
(lib.mkIf (config.networking.hostName != serverName) clientConfig)
|
(lib.mkIf (builtins.hasAttr config.networking.hostName clients) clientConfig)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@
|
||||||
echo "invalid theme, valid values: [dark, light, restore]"
|
echo "invalid theme, valid values: [dark, light, restore]"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
current="$HOME/.local/state/home-manager/gcroots/current-home/"
|
current="$HOME/.local/state/nix/profiles/home-manager"
|
||||||
cached="$HOME/.local/state/last-parent-specialisation"
|
cached="$HOME/.local/state/last-parent-specialisation"
|
||||||
if [ -d "$current/specialisation" ]; then
|
if [ -d "$current/specialisation" ]; then
|
||||||
if [ -d "$cached" ]; then
|
if [ -d "$cached" ]; then
|
||||||
|
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
{ inputs, ... }: {
|
|
||||||
imports = [
|
|
||||||
inputs.nix-index-database.homeModules.default
|
|
||||||
];
|
|
||||||
programs.nix-index.enable = true;
|
|
||||||
programs.nix-index-database.comma.enable = true;
|
|
||||||
}
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
programs.git.settings.core.excludesFile = ".envrc";
|
programs.git.extraConfig.core.excludesFile = ".envrc";
|
||||||
# We can't use .source since hm manages this file too
|
# We can't use .source since hm manages this file too
|
||||||
xdg.configFile."direnv/direnvrc".text = builtins.readFile ../../res/direnvrc;
|
xdg.configFile."direnv/direnvrc".text = builtins.readFile ../../res/direnvrc;
|
||||||
home.activation = {
|
home.activation = {
|
||||||
|
|
|
||||||
|
|
@ -21,9 +21,9 @@ let
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
home.packages = with pkgs; [ iw socat ];
|
home.packages = with pkgs; [ socat ];
|
||||||
programs.eww = {
|
programs.eww = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
configDir = res;
|
||||||
};
|
};
|
||||||
xdg.configFile."eww".source = res;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,15 @@
|
||||||
{ ... }: {
|
{ ... }: {
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
userName = "LavaDesu";
|
||||||
|
userEmail = "me@lava.moe";
|
||||||
signing = {
|
signing = {
|
||||||
key = "059F098EBF0E9A13E10A46BF6500251E087653C9";
|
key = "059F098EBF0E9A13E10A46BF6500251E087653C9";
|
||||||
signByDefault = true;
|
signByDefault = true;
|
||||||
};
|
};
|
||||||
settings = {
|
extraConfig = {
|
||||||
user.name = "Cilly Leang";
|
|
||||||
user.email = "mini@cilly.moe";
|
|
||||||
core.abbrev = 11;
|
core.abbrev = 11;
|
||||||
safe.directory = "/home/rin/Projects/flakes";
|
safe.directory = "/home/rin/Projects/flakes";
|
||||||
init.defaultBranch = "master";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,6 @@
|
||||||
};
|
};
|
||||||
services.gpg-agent = {
|
services.gpg-agent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
pinentry.package = pkgs.pinentry-gnome3;
|
pinentryPackage = pkgs.pinentry-gnome3;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
kblight = "brightnessctl -d ${config.me.kbBacklightDevice}";
|
kblight = "light -s sysfs/leds/${config.me.kbBacklightDevice}";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
home.packages = [ config.services.hypridle.package ];
|
home.packages = [ config.services.hypridle.package ];
|
||||||
|
|
@ -16,18 +16,18 @@ in
|
||||||
listener = lib.optionals (config.me.kbBacklightDevice != null) [
|
listener = lib.optionals (config.me.kbBacklightDevice != null) [
|
||||||
{
|
{
|
||||||
timeout = 120;
|
timeout = 120;
|
||||||
on-timeout = "${kblight} -s && ${kblight} 0";
|
on-timeout = "${kblight} -O && ${kblight} -S 0";
|
||||||
on-resume = "${kblight} -r";
|
on-resume = "${kblight} -I";
|
||||||
}
|
}
|
||||||
] ++ [
|
] ++ [
|
||||||
{
|
{
|
||||||
timeout = 150;
|
timeout = 150;
|
||||||
on-timeout = "brightnessctl -s && brightnessctl 50%-";
|
on-timeout = "light -O && light -T 0.5";
|
||||||
on-resume = "brightnessctl -r";
|
on-resume = "light -I";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
timeout = 180;
|
timeout = 180;
|
||||||
on-timeout = "brightnessctl -r && loginctl lock-session";
|
on-timeout = "light -I && loginctl lock-session";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
timeout = 195;
|
timeout = 195;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
{ pkgs, ... }: {
|
{ config, pkgs, ... }: {
|
||||||
programs.mpv = {
|
programs.mpv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.mpv.override {
|
package = pkgs.mpv-unwrapped.wrapper {
|
||||||
|
mpv = pkgs.mpv-unwrapped;
|
||||||
youtubeSupport = true;
|
youtubeSupport = true;
|
||||||
scripts = [ pkgs.mpvScripts.mpris ];
|
scripts = [ pkgs.mpvScripts.mpris ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -9,12 +9,11 @@
|
||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
vimdiffAlias = true;
|
vimdiffAlias = true;
|
||||||
withNodeJs = false;
|
withNodeJs = false;
|
||||||
withPython3 = false;
|
|
||||||
withRuby = false;
|
|
||||||
|
|
||||||
plugins = with pkgs.vimPlugins; [
|
plugins = with pkgs.vimPlugins; [
|
||||||
fzf-vim
|
ctrlp-vim
|
||||||
lualine-nvim
|
lualine-nvim
|
||||||
|
nerdtree
|
||||||
tokyonight-nvim
|
tokyonight-nvim
|
||||||
vim-fugitive
|
vim-fugitive
|
||||||
vim-nix
|
vim-nix
|
||||||
|
|
@ -22,7 +21,14 @@
|
||||||
vim-signify
|
vim-signify
|
||||||
vim-surround
|
vim-surround
|
||||||
|
|
||||||
|
nvim-cmp
|
||||||
|
nvim-lspconfig
|
||||||
|
cmp-nvim-lsp
|
||||||
|
cmp_luasnip
|
||||||
|
luasnip
|
||||||
|
|
||||||
(nvim-treesitter.withPlugins (p: with p; [
|
(nvim-treesitter.withPlugins (p: with p; [
|
||||||
|
tree-sitter-comment
|
||||||
tree-sitter-json
|
tree-sitter-json
|
||||||
tree-sitter-lua
|
tree-sitter-lua
|
||||||
tree-sitter-nix
|
tree-sitter-nix
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
{ config, lib, pkgs, sysConfig, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
luaconf = pkgs.writeText "config.lua"
|
luaconf = pkgs.writeText "config.lua"
|
||||||
(lib.replaceStrings
|
(lib.replaceStrings
|
||||||
["{{OMNISHARP_PATH}}" "{{DART_PATH}}" "{{CATPPUCCIN_FLAVOUR}}" "{{USERNAME}}" "{{HOSTNAME}}"]
|
["{{OMNISHARP_PATH}}" "{{DART_PATH}}" "{{CATPPUCCIN_FLAVOUR}}"]
|
||||||
["${pkgs.omnisharp-roslyn}/bin/OmniSharp" "${pkgs.dart}/bin/dart" config.catppuccin.nvim.flavor config.home.username sysConfig.networking.hostName]
|
["${pkgs.omnisharp-roslyn}/bin/OmniSharp" "${pkgs.dart}/bin/dart" config.catppuccin.nvim.flavor]
|
||||||
(builtins.readFile ../../res/config.lua));
|
(builtins.readFile ../../res/config.lua));
|
||||||
in {
|
in {
|
||||||
systemd.user.tmpfiles.rules = [
|
systemd.user.tmpfiles.rules = [
|
||||||
|
|
@ -17,35 +17,24 @@ in {
|
||||||
vimdiffAlias = true;
|
vimdiffAlias = true;
|
||||||
#package = pkgs.neovim-nightly;
|
#package = pkgs.neovim-nightly;
|
||||||
withNodeJs = true;
|
withNodeJs = true;
|
||||||
withPython3 = true;
|
|
||||||
withRuby = false;
|
|
||||||
|
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
nixd
|
|
||||||
rust-analyzer
|
rust-analyzer
|
||||||
texlab
|
nodePackages.diagnostic-languageserver
|
||||||
astro-language-server
|
nodePackages.eslint_d
|
||||||
tailwindcss-language-server
|
nodePackages.typescript-language-server
|
||||||
diagnostic-languageserver
|
nodePackages.vscode-langservers-extracted
|
||||||
eslint_d
|
nodePackages.yaml-language-server
|
||||||
typescript-language-server
|
|
||||||
vscode-langservers-extracted
|
|
||||||
yaml-language-server
|
|
||||||
];
|
];
|
||||||
|
|
||||||
plugins = with pkgs.vimPlugins; [
|
plugins = with pkgs.vimPlugins; [
|
||||||
autoclose-nvim
|
|
||||||
auto-save-nvim
|
|
||||||
flutter-tools-nvim
|
flutter-tools-nvim
|
||||||
fzf-vim
|
fzf-vim
|
||||||
fzf-lsp-nvim
|
fzf-lsp-nvim
|
||||||
lualine-nvim
|
lualine-nvim
|
||||||
nvim-ts-autotag
|
|
||||||
nvim-web-devicons
|
|
||||||
plenary-nvim
|
plenary-nvim
|
||||||
tokyonight-nvim
|
tokyonight-nvim
|
||||||
vim-fugitive
|
vim-fugitive
|
||||||
vim-latex-live-preview
|
|
||||||
vim-nix
|
vim-nix
|
||||||
vim-repeat
|
vim-repeat
|
||||||
vim-signify
|
vim-signify
|
||||||
|
|
@ -55,7 +44,6 @@ in {
|
||||||
|
|
||||||
nvim-cmp
|
nvim-cmp
|
||||||
nvim-dap
|
nvim-dap
|
||||||
nvim-highlight-colors
|
|
||||||
nvim-lspconfig
|
nvim-lspconfig
|
||||||
cmp-nvim-lsp
|
cmp-nvim-lsp
|
||||||
cmp_luasnip
|
cmp_luasnip
|
||||||
|
|
@ -63,7 +51,6 @@ in {
|
||||||
|
|
||||||
#(pkgs.me.nvim-treesitter-nightly.withPlugins (p: with p; [
|
#(pkgs.me.nvim-treesitter-nightly.withPlugins (p: with p; [
|
||||||
(nvim-treesitter.withPlugins (p: with p; [
|
(nvim-treesitter.withPlugins (p: with p; [
|
||||||
tree-sitter-astro
|
|
||||||
tree-sitter-bash
|
tree-sitter-bash
|
||||||
tree-sitter-c
|
tree-sitter-c
|
||||||
tree-sitter-c-sharp
|
tree-sitter-c-sharp
|
||||||
|
|
@ -74,7 +61,6 @@ in {
|
||||||
tree-sitter-javascript
|
tree-sitter-javascript
|
||||||
tree-sitter-json
|
tree-sitter-json
|
||||||
tree-sitter-kotlin
|
tree-sitter-kotlin
|
||||||
tree-sitter-latex
|
|
||||||
tree-sitter-lua
|
tree-sitter-lua
|
||||||
tree-sitter-markdown
|
tree-sitter-markdown
|
||||||
tree-sitter-nix
|
tree-sitter-nix
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ let
|
||||||
in {
|
in {
|
||||||
programs.rofi = {
|
programs.rofi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = pkgs.rofi-wayland;
|
||||||
theme = "theme";
|
theme = "theme";
|
||||||
};
|
};
|
||||||
xdg.configFile."rofi/theme.rasi".source = theme;
|
xdg.configFile."rofi/theme.rasi".source = theme;
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,7 @@ in
|
||||||
shuffle
|
shuffle
|
||||||
hidePodcasts
|
hidePodcasts
|
||||||
|
|
||||||
|
skipStats
|
||||||
songStats
|
songStats
|
||||||
history
|
history
|
||||||
volumePercentage
|
volumePercentage
|
||||||
|
|
|
||||||
|
|
@ -38,8 +38,7 @@ let
|
||||||
jf = "doas journalctl -f";
|
jf = "doas journalctl -f";
|
||||||
|
|
||||||
fl = "cd ~/Projects/flakes";
|
fl = "cd ~/Projects/flakes";
|
||||||
nr = "nh os switch";
|
nr = "doas nixos-rebuild switch --flake .#${sysConfig.networking.hostName} -v -L";
|
||||||
nb = "nh os boot";
|
|
||||||
|
|
||||||
gs = "git status";
|
gs = "git status";
|
||||||
ga = "git add";
|
ga = "git add";
|
||||||
|
|
@ -102,9 +101,10 @@ let
|
||||||
bindkey -a -r ':'
|
bindkey -a -r ':'
|
||||||
'';
|
'';
|
||||||
in {
|
in {
|
||||||
|
programs.command-not-found.enable = true;
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dotDir = "${config.xdg.configHome}/zsh";
|
dotDir = ".config/zsh";
|
||||||
|
|
||||||
autocd = true;
|
autocd = true;
|
||||||
defaultKeymap = "viins";
|
defaultKeymap = "viins";
|
||||||
|
|
|
||||||
27
overlays/android-studio.nix
Normal file
27
overlays/android-studio.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
||||||
|
self: { bash, buildFHSEnv, cacert, ncurses5, runCommand, ... } @ super:
|
||||||
|
let
|
||||||
|
drvName = super.android-studio.name;
|
||||||
|
fhsEnv = buildFHSEnv {
|
||||||
|
name = "${drvName}-fhs-env";
|
||||||
|
# google's analytics calls jdk's getOperatingSystemMXBean which tries to parse cgroups and ultimately fails for whatever reason with an npe
|
||||||
|
unshareCgroup = false;
|
||||||
|
multiPkgs = pkgs: [
|
||||||
|
ncurses5
|
||||||
|
|
||||||
|
(runCommand "fedoracert" {}
|
||||||
|
''
|
||||||
|
mkdir -p $out/etc/pki/tls/
|
||||||
|
ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs
|
||||||
|
'')
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
startScript = ''
|
||||||
|
#!${bash}/bin/bash
|
||||||
|
${fhsEnv}/bin/${drvName}-fhs-env ${super.android-studio.passthru.unwrapped}/bin/studio.sh "$@"
|
||||||
|
'';
|
||||||
|
in {
|
||||||
|
android-studio-patched = super.android-studio.overrideAttrs(_: {
|
||||||
|
inherit startScript;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
@ -1,11 +1,10 @@
|
||||||
builtins.map (path: import path) [
|
builtins.map (path: import path) [
|
||||||
|
./android-studio.nix
|
||||||
./bitwarden-desktop.nix
|
./bitwarden-desktop.nix
|
||||||
./cascadia-code.nix
|
./cascadia-code.nix
|
||||||
./ccache.nix
|
./ccache.nix
|
||||||
./eww.nix
|
./eww.nix
|
||||||
./jetbrains.nix
|
|
||||||
./material-icons.nix
|
./material-icons.nix
|
||||||
./openldap.nix
|
|
||||||
./steam.nix
|
./steam.nix
|
||||||
./utillinux.nix
|
./utillinux.nix
|
||||||
./wpa-supplicant.nix
|
./wpa-supplicant.nix
|
||||||
|
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
# https://github.com/NixOS/nixpkgs/issues/375254
|
|
||||||
self: super: {
|
|
||||||
jetbrains = super.jetbrains // {
|
|
||||||
gateway = let
|
|
||||||
unwrapped = super.jetbrains.gateway;
|
|
||||||
in super.buildFHSEnv {
|
|
||||||
name = "gateway";
|
|
||||||
inherit (unwrapped) version;
|
|
||||||
|
|
||||||
runScript = super.writeScript "gateway-wrapper" ''
|
|
||||||
unset JETBRAINS_CLIENT_JDK
|
|
||||||
exec ${unwrapped}/bin/gateway "$@"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = unwrapped.meta;
|
|
||||||
|
|
||||||
passthru = {
|
|
||||||
inherit unwrapped;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,16 +1,12 @@
|
||||||
self: super: let
|
self: super: let
|
||||||
llvmPackages = super.llvmPackages_19;
|
llvmPackages = super.llvmPackages_19;
|
||||||
clangVersion = super.lib.versions.major llvmPackages.libclang.version;
|
clangVersion = super.lib.versions.major llvmPackages.libclang.version;
|
||||||
addFlagsScript = "$out/nix-support/add-local-cc-cflags-before.sh";
|
|
||||||
cc = llvmPackages.stdenv.cc.override {
|
cc = llvmPackages.stdenv.cc.override {
|
||||||
# :sob: see https://github.com/NixOS/nixpkgs/issues/142901
|
# :sob: see https://github.com/NixOS/nixpkgs/issues/142901
|
||||||
bintools = llvmPackages.bintools;
|
bintools = llvmPackages.bintools;
|
||||||
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/368850
|
|
||||||
extraBuildCommands = ''
|
extraBuildCommands = ''
|
||||||
cat <(echo "NIX_CC_WRAPPER_SUPPRESS_TARGET_WARNING=1") "${addFlagsScript}" > "${addFlagsScript}.new"
|
|
||||||
mv "${addFlagsScript}.new" "${addFlagsScript}"
|
|
||||||
substituteInPlace "$out/nix-support/cc-cflags" --replace " -nostdlibinc" ""
|
substituteInPlace "$out/nix-support/cc-cflags" --replace " -nostdlibinc" ""
|
||||||
|
substituteInPlace "$out/nix-support/add-local-cc-cflags-before.sh" --replace 'echo "Warning: supplying the --target argument to a nix-wrapped compiler may not work correctly - cc-wrapper is currently not designed with multi-target compilers in mind. You may want to use an un-wrapped compiler instead." >&2' ""
|
||||||
echo " -resource-dir=${llvmPackages.libclang.lib}/lib/clang/${clangVersion}" >> $out/nix-support/cc-cflags
|
echo " -resource-dir=${llvmPackages.libclang.lib}/lib/clang/${clangVersion}" >> $out/nix-support/cc-cflags
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
self: super: {
|
|
||||||
# openldap i686 fails checks
|
|
||||||
# issue: https://github.com/NixOS/nixpkgs/issues/514113
|
|
||||||
# workaround: https://github.com/NixOS/nixpkgs/issues/513245#issuecomment-4320293674
|
|
||||||
# fix: https://github.com/NixOS/nixpkgs/pull/515956
|
|
||||||
openldap = super.openldap.overrideAttrs {
|
|
||||||
doCheck = !self.stdenv.hostPlatform.isi686;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
|
|
||||||
index ef9689f8776..aabbc031b5f 100644
|
|
||||||
--- a/drivers/bluetooth/btusb.c
|
|
||||||
+++ b/drivers/bluetooth/btusb.c
|
|
||||||
@@ -759,6 +759,8 @@ static const struct usb_device_id quirks_table[] = {
|
|
||||||
BTUSB_WIDEBAND_SPEECH },
|
|
||||||
{ USB_DEVICE(0x2b89, 0x8761), .driver_info = BTUSB_REALTEK |
|
|
||||||
BTUSB_WIDEBAND_SPEECH },
|
|
||||||
+ { USB_DEVICE(0x2c4e, 0x0115), .driver_info = BTUSB_REALTEK |
|
|
||||||
+ BTUSB_WIDEBAND_SPEECH },
|
|
||||||
|
|
||||||
/* Additional Realtek 8821AE Bluetooth devices */
|
|
||||||
{ USB_DEVICE(0x0b05, 0x17dc), .driver_info = BTUSB_REALTEK },
|
|
||||||
|
|
@ -56,10 +56,6 @@ let
|
||||||
INIT_STACK_ALL_ZERO = yes;
|
INIT_STACK_ALL_ZERO = yes;
|
||||||
INIT_STACK_NONE = no;
|
INIT_STACK_NONE = no;
|
||||||
|
|
||||||
# bore
|
|
||||||
SCHED_BORE = yes;
|
|
||||||
MIN_BASE_SLICE_NS = freeform "2000000";
|
|
||||||
|
|
||||||
# tickless timers
|
# tickless timers
|
||||||
HZ_PERIODIC = no;
|
HZ_PERIODIC = no;
|
||||||
NO_HZ = yes;
|
NO_HZ = yes;
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,17 @@
|
||||||
{ fetchFromGitHub, inputs, lib }:
|
{ fetchFromGitHub, inputs, lib }:
|
||||||
let
|
let
|
||||||
version = "7.0.10";
|
version = "6.14.7";
|
||||||
kernelHash = "1w4i705i0nl1xqv7fdhdbhy7j3xrzhl31fabs6vmgiw7nf06szxv";
|
kernelHash = "0w3nqh02vl8f2wsx3fmsvw1pdsnjs5zfqcmv2w2vnqdiwy1vd552";
|
||||||
kernelPatchHash = "0h7gxqcnww7sj5cdyblzj04775zhavwdylkm2pm91v6xkjbnz1zj";
|
kernelPatchHash = "05a5srmb27gqyv49mxy3rmlxgiinacwbyzmig1hk313m0wl88av3";
|
||||||
|
|
||||||
mm = lib.versions.majorMinor version;
|
mm = lib.versions.majorMinor version;
|
||||||
hasPatch = (builtins.length (builtins.splitVersion version)) == 3;
|
hasPatch = (builtins.length (builtins.splitVersion version)) == 3;
|
||||||
tkgPatches = [
|
tkgPatches = [
|
||||||
"0002-clear-patches"
|
"0002-clear-patches"
|
||||||
"0003-glitched-base"
|
"0003-glitched-base"
|
||||||
"0001-bore"
|
"0003-glitched-eevdf-additions"
|
||||||
"0003-glitched-cfs"
|
"0003-glitched-cfs"
|
||||||
|
"0007-v${mm}-fsync_legacy_via_futex_waitv"
|
||||||
"0012-misc-additions"
|
"0012-misc-additions"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
@ -35,7 +36,6 @@ in {
|
||||||
|
|
||||||
kernelPatches = lib.optionals hasPatch [
|
kernelPatches = lib.optionals hasPatch [
|
||||||
kernelPatchSrc
|
kernelPatchSrc
|
||||||
(patch ./bluetooth.patch)
|
|
||||||
]
|
]
|
||||||
++ builtins.map (name: {
|
++ builtins.map (name: {
|
||||||
inherit name;
|
inherit name;
|
||||||
|
|
|
||||||
141
packages/spotify-adblock/0001-cargo.patch
Normal file
141
packages/spotify-adblock/0001-cargo.patch
Normal file
|
|
@ -0,0 +1,141 @@
|
||||||
|
From 002a25dd56233d599adda61b298d612a46267407 Mon Sep 17 00:00:00 2001
|
||||||
|
From: LavaDesu <me@lava.moe>
|
||||||
|
Date: Tue, 14 Sep 2021 08:34:05 +0700
|
||||||
|
Subject: [PATCH] cargo
|
||||||
|
|
||||||
|
---
|
||||||
|
Cargo.lock | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 122 insertions(+)
|
||||||
|
create mode 100644 Cargo.lock
|
||||||
|
|
||||||
|
diff --git a/Cargo.lock b/Cargo.lock
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..b952e17ca90
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/Cargo.lock
|
||||||
|
@@ -0,0 +1,122 @@
|
||||||
|
+# This file is automatically @generated by Cargo.
|
||||||
|
+# It is not intended for manual editing.
|
||||||
|
+version = 3
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "aho-corasick"
|
||||||
|
+version = "0.7.18"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
|
||||||
|
+dependencies = [
|
||||||
|
+ "memchr",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "lazy_static"
|
||||||
|
+version = "1.4.0"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "libc"
|
||||||
|
+version = "0.2.101"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "memchr"
|
||||||
|
+version = "2.4.1"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "proc-macro2"
|
||||||
|
+version = "1.0.29"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d"
|
||||||
|
+dependencies = [
|
||||||
|
+ "unicode-xid",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "quote"
|
||||||
|
+version = "1.0.9"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
|
||||||
|
+dependencies = [
|
||||||
|
+ "proc-macro2",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "regex"
|
||||||
|
+version = "1.5.4"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
|
||||||
|
+dependencies = [
|
||||||
|
+ "aho-corasick",
|
||||||
|
+ "memchr",
|
||||||
|
+ "regex-syntax",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "regex-syntax"
|
||||||
|
+version = "0.6.25"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "serde"
|
||||||
|
+version = "1.0.130"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
|
||||||
|
+dependencies = [
|
||||||
|
+ "serde_derive",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "serde_derive"
|
||||||
|
+version = "1.0.130"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
|
||||||
|
+dependencies = [
|
||||||
|
+ "proc-macro2",
|
||||||
|
+ "quote",
|
||||||
|
+ "syn",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "spotify-adblock"
|
||||||
|
+version = "1.0.0"
|
||||||
|
+dependencies = [
|
||||||
|
+ "lazy_static",
|
||||||
|
+ "libc",
|
||||||
|
+ "regex",
|
||||||
|
+ "serde",
|
||||||
|
+ "toml",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "syn"
|
||||||
|
+version = "1.0.76"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84"
|
||||||
|
+dependencies = [
|
||||||
|
+ "proc-macro2",
|
||||||
|
+ "quote",
|
||||||
|
+ "unicode-xid",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "toml"
|
||||||
|
+version = "0.5.8"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
|
||||||
|
+dependencies = [
|
||||||
|
+ "serde",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "unicode-xid"
|
||||||
|
+version = "0.2.2"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
|
||||||
|
--
|
||||||
|
2.32.0
|
||||||
|
|
||||||
|
|
@ -7,7 +7,7 @@ rustPlatform.buildRustPackage {
|
||||||
version = "1.0";
|
version = "1.0";
|
||||||
src = inputs.spotify-adblock;
|
src = inputs.spotify-adblock;
|
||||||
|
|
||||||
cargoHash = "sha256-oGpe+kBf6kBboyx/YfbQBt1vvjtXd1n2pOH6FNcbF8M=";
|
cargoHash = "sha256-yxumYGAMObgl1u6GlbEQOKOn1DWxXN8bbT7BjiWT96o=";
|
||||||
|
|
||||||
patches = [ ./0002-allow-setting-config-from-environment-variable.patch ];
|
patches = [ ./0002-allow-setting-config-from-environment-variable.patch ];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,20 @@
|
||||||
-- Keybindings
|
-- Keybindings
|
||||||
local map = vim.keymap.set
|
local map = vim.api.nvim_set_keymap
|
||||||
map('n', '<C-H>', '<C-W>h', { noremap = true })
|
map('n', '<C-H>', '<C-W>h', { noremap = true })
|
||||||
map('n', '<C-J>', '<C-W>j', { noremap = true })
|
map('n', '<C-J>', '<C-W>j', { noremap = true })
|
||||||
map('n', '<C-K>', '<C-W>k', { noremap = true })
|
map('n', '<C-K>', '<C-W>k', { noremap = true })
|
||||||
map('n', '<C-L>', '<C-W>l', { noremap = true })
|
map('n', '<C-L>', '<C-W>l', { noremap = true })
|
||||||
map('n', '<C-Q>', ':q<CR>', { noremap = true })
|
map('n', '<C-Q>', ':q<CR>', { noremap = true })
|
||||||
map('n', '<C-P>', ':Files<CR>', { noremap = true })
|
|
||||||
|
|
||||||
-- Autocommands
|
-- Autocommands
|
||||||
vim.cmd('au BufEnter * set noro')
|
vim.cmd('au BufEnter * set noro')
|
||||||
vim.cmd('au CursorHold * lua vim.diagnostic.open_float(0, { scope = "line", focusable = false })')
|
|
||||||
|
|
||||||
-- Settings
|
-- Settings
|
||||||
vim.opt.mouse = ""
|
|
||||||
vim.opt.relativenumber = true
|
vim.opt.relativenumber = true
|
||||||
vim.opt.number = true
|
vim.opt.number = true
|
||||||
vim.opt.cursorline = true
|
vim.opt.cursorline = true
|
||||||
vim.opt.signcolumn = "yes:3"
|
vim.opt.signcolumn = "yes:3"
|
||||||
vim.opt.title = true
|
vim.opt.title = true
|
||||||
vim.opt.termguicolors = true
|
|
||||||
vim.opt.updatetime = 0
|
vim.opt.updatetime = 0
|
||||||
vim.opt.clipboard:prepend('unnamedplus')
|
vim.opt.clipboard:prepend('unnamedplus')
|
||||||
|
|
||||||
|
|
@ -47,9 +43,56 @@ vim.g.signify_sign_delete_first_line = '┏━'
|
||||||
vim.g.signify_sign_change = vim.g.signify_sign_add
|
vim.g.signify_sign_change = vim.g.signify_sign_add
|
||||||
vim.g.signify_sign_change_delete = vim.g.signify_sign_delete
|
vim.g.signify_sign_change_delete = vim.g.signify_sign_delete
|
||||||
|
|
||||||
|
-- Theming
|
||||||
|
vim.g.tokyonight_style = 'night'
|
||||||
|
vim.cmd[[
|
||||||
|
syntax enable
|
||||||
|
colorscheme tokyonight
|
||||||
|
]]
|
||||||
|
local colors = require("tokyonight.colors").setup {}
|
||||||
|
vim.cmd("highlight SignifySignAdd guifg="..colors.green)
|
||||||
|
vim.cmd("highlight SignifySignChange guifg="..colors.orange)
|
||||||
|
vim.cmd("highlight SignifySignDelete guifg="..colors.red)
|
||||||
|
vim.cmd("highlight SignifySignDeleteFirstLine guifg="..colors.red)
|
||||||
|
vim.cmd("highlight SignifySignChangeDelete guifg="..colors.red)
|
||||||
|
|
||||||
-- Plugins
|
-- Plugins
|
||||||
require('nvim-treesitter').setup {
|
require('nvim-treesitter.configs').setup {
|
||||||
highlight = { enable = true },
|
highlight = { enable = true },
|
||||||
indent = { enable = false }
|
indent = { enable = false }
|
||||||
}
|
}
|
||||||
require('lualine').setup { }
|
require('lualine').setup {
|
||||||
|
options = {
|
||||||
|
theme = 'tokyonight'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-- LSP
|
||||||
|
local nvim_lsp = require('lspconfig')
|
||||||
|
|
||||||
|
local on_attach = function(client, bufnr)
|
||||||
|
local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
|
||||||
|
local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
|
||||||
|
|
||||||
|
buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||||
|
|
||||||
|
local opts = { noremap = true, silent = true }
|
||||||
|
|
||||||
|
buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
|
||||||
|
buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
||||||
|
buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
|
||||||
|
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
|
||||||
|
buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
|
||||||
|
buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
|
||||||
|
buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
|
||||||
|
buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
|
||||||
|
buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
|
||||||
|
buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
|
||||||
|
buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
|
||||||
|
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
|
||||||
|
buf_set_keymap('n', '<space>e', '<cmd>lua vim.diagnostic.open_float(0, { scope = "line" })<CR>', opts)
|
||||||
|
buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
|
||||||
|
buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
|
||||||
|
buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
|
||||||
|
buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
|
||||||
|
end
|
||||||
|
|
|
||||||
190
res/config.lua
190
res/config.lua
|
|
@ -1,13 +1,11 @@
|
||||||
-- Keybindings
|
-- Keybindings
|
||||||
local map = vim.keymap.set
|
local map = vim.api.nvim_set_keymap
|
||||||
map('n', '<C-H>', '<C-W>h', { remap = false })
|
map('n', '<C-H>', '<C-W>h', { noremap = true })
|
||||||
map('n', '<C-J>', '<C-W>j', { remap = false })
|
map('n', '<C-J>', '<C-W>j', { noremap = true })
|
||||||
map('n', '<C-K>', '<C-W>k', { remap = false })
|
map('n', '<C-K>', '<C-W>k', { noremap = true })
|
||||||
map('n', '<C-L>', '<C-W>l', { remap = false })
|
map('n', '<C-L>', '<C-W>l', { noremap = true })
|
||||||
map('n', '<C-Q>', ':q<CR>', { remap = false })
|
map('n', '<C-Q>', ':q<CR>', { noremap = true })
|
||||||
map('n', '<C-P>', ':Files<CR>', { remap = false })
|
map('n', '<C-P>', ':Files<CR>', { noremap = true })
|
||||||
map('n', '<C-/>', 'gcc', { remap = true, silent = true })
|
|
||||||
map('v', '<C-/>', 'gc', { remap = true, silent = true })
|
|
||||||
|
|
||||||
-- Autocommands
|
-- Autocommands
|
||||||
vim.cmd('au BufEnter * set noro')
|
vim.cmd('au BufEnter * set noro')
|
||||||
|
|
@ -20,7 +18,6 @@ vim.opt.number = true
|
||||||
vim.opt.cursorline = true
|
vim.opt.cursorline = true
|
||||||
vim.opt.signcolumn = "yes:3"
|
vim.opt.signcolumn = "yes:3"
|
||||||
vim.opt.title = true
|
vim.opt.title = true
|
||||||
vim.opt.termguicolors = true
|
|
||||||
vim.opt.updatetime = 0
|
vim.opt.updatetime = 0
|
||||||
vim.opt.clipboard:prepend('unnamedplus')
|
vim.opt.clipboard:prepend('unnamedplus')
|
||||||
|
|
||||||
|
|
@ -51,7 +48,6 @@ vim.g.signify_sign_change_delete = vim.g.signify_sign_delete
|
||||||
|
|
||||||
-- VimTeX
|
-- VimTeX
|
||||||
vim.g.vimtex_view_method = "zathura"
|
vim.g.vimtex_view_method = "zathura"
|
||||||
vim.g.vimtex_quickfix_open_on_warning = 0
|
|
||||||
|
|
||||||
-- Theming
|
-- Theming
|
||||||
vim.api.nvim_command("syntax enable")
|
vim.api.nvim_command("syntax enable")
|
||||||
|
|
@ -68,39 +64,13 @@ vim.cmd("highlight SignifySignChangeDelete guifg="..colors.red)
|
||||||
vim.cmd("au FileType rust highlight DiagnosticUnderlineHint ctermfg=14 gui=italic guifg="..colors.overlay2)
|
vim.cmd("au FileType rust highlight DiagnosticUnderlineHint ctermfg=14 gui=italic guifg="..colors.overlay2)
|
||||||
|
|
||||||
-- Plugins
|
-- Plugins
|
||||||
require('autoclose').setup {}
|
require('nvim-treesitter.configs').setup {
|
||||||
local function autosavecond(buf)
|
|
||||||
if vim.tbl_contains({"astro", "tex"}, vim.fn.getbufvar(buf, "&filetype")) then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
require('auto-save').setup {
|
|
||||||
trigger_events = {
|
|
||||||
defer_save = { "InsertLeave", "TextChanged", "TextChangedI" },
|
|
||||||
},
|
|
||||||
debounce_delay = 250,
|
|
||||||
condition = autosavecond,
|
|
||||||
}
|
|
||||||
require('nvim-ts-autotag').setup {}
|
|
||||||
require('nvim-highlight-colors').setup {
|
|
||||||
render = "virtual",
|
|
||||||
}
|
|
||||||
require('nvim-treesitter').setup {
|
|
||||||
highlight = { enable = true },
|
highlight = { enable = true },
|
||||||
indent = { enable = false }
|
indent = { enable = false }
|
||||||
}
|
}
|
||||||
require('lualine').setup {
|
require('lualine').setup {
|
||||||
options = {
|
options = {
|
||||||
theme = 'catppuccin'
|
theme = 'tokyonight'
|
||||||
},
|
|
||||||
sections = {
|
|
||||||
lualine_c = {
|
|
||||||
{
|
|
||||||
"filename",
|
|
||||||
path = 1,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -108,72 +78,74 @@ require('lualine').setup {
|
||||||
-- many thanks to @kristijanhusak
|
-- many thanks to @kristijanhusak
|
||||||
-- https://github.com/nvim-treesitter/nvim-treesitter/issues/1167#issuecomment-920824125
|
-- https://github.com/nvim-treesitter/nvim-treesitter/issues/1167#issuecomment-920824125
|
||||||
function _G.javascript_indent()
|
function _G.javascript_indent()
|
||||||
local line = vim.fn.getline(vim.v.lnum)
|
local line = vim.fn.getline(vim.v.lnum)
|
||||||
local prev_line = vim.fn.getline(vim.v.lnum - 1)
|
local prev_line = vim.fn.getline(vim.v.lnum - 1)
|
||||||
if line:match('^%s*[%*/]%s*') then
|
if line:match('^%s*[%*/]%s*') then
|
||||||
if prev_line:match('^%s*%*%s*') then
|
if prev_line:match('^%s*%*%s*') then
|
||||||
return vim.fn.indent(vim.v.lnum - 1)
|
return vim.fn.indent(vim.v.lnum - 1)
|
||||||
end
|
|
||||||
if prev_line:match('^%s*/%*%*%s*$') then
|
|
||||||
return vim.fn.indent(vim.v.lnum - 1) + 1
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
if prev_line:match('^%s*/%*%*%s*$') then
|
||||||
|
return vim.fn.indent(vim.v.lnum - 1) + 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
return vim.fn['GetJavascriptIndent']()
|
return vim.fn['GetJavascriptIndent']()
|
||||||
end
|
end
|
||||||
|
|
||||||
vim.cmd('au FileType javascript setlocal indentexpr=v:lua.javascript_indent()')
|
vim.cmd('au FileType javascript setlocal indentexpr=v:lua.javascript_indent()')
|
||||||
|
|
||||||
-- LSP
|
-- LSP
|
||||||
vim.api.nvim_create_autocmd("LspAttach", {
|
local nvim_lsp = require('lspconfig')
|
||||||
callback = function(args)
|
|
||||||
local client = vim.lsp.get_client_by_id(args.data.client_id)
|
|
||||||
if not client then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(args.buf, ...) end
|
local on_attach = function(client, bufnr)
|
||||||
local function buf_set_option(...) vim.api.nvim_buf_set_option(args.buf, ...) end
|
local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
|
||||||
|
local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
|
||||||
|
|
||||||
local opts = { noremap = true, silent = true }
|
local opts = { noremap = true, silent = true }
|
||||||
|
|
||||||
buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
|
buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
|
||||||
buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
||||||
buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
|
buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
|
||||||
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
|
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
|
||||||
buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
|
buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
|
||||||
buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
|
buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
|
||||||
buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
|
buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
|
||||||
buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
|
buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
|
||||||
buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
|
buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
|
||||||
buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
|
buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
|
||||||
buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
|
buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
|
||||||
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
|
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
|
||||||
buf_set_keymap('n', '<space>e', '<cmd>lua vim.diagnostic.open_float(0, { scope = "line" })<CR>', opts)
|
buf_set_keymap('n', '<space>e', '<cmd>lua vim.diagnostic.open_float(0, { scope = "line" })<CR>', opts)
|
||||||
buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
|
buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
|
||||||
buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
|
buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
|
||||||
buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
|
buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
|
||||||
buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
|
buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
|
||||||
end
|
end
|
||||||
})
|
|
||||||
|
|
||||||
vim.diagnostic.config({
|
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
|
||||||
focusable = false,
|
vim.lsp.diagnostic.on_publish_diagnostics, {
|
||||||
virtual_text = false,
|
focusable = false,
|
||||||
underline = true,
|
virtual_text = false,
|
||||||
signs = true,
|
underline = true,
|
||||||
update_in_insert = true
|
signs = true,
|
||||||
})
|
update_in_insert = true
|
||||||
|
}
|
||||||
|
)
|
||||||
|
vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
|
||||||
|
vim.lsp.handlers.signature_help, { focusable = false }
|
||||||
|
)
|
||||||
|
|
||||||
|
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||||
|
capabilities.textDocument.completion.completionItem.snippetSupport = true
|
||||||
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
|
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
|
||||||
|
|
||||||
local servers = { 'astro', 'clangd', 'cssls', 'html', 'tailwindcss', 'texlab', 'ts_ls', 'yamlls' }
|
local servers = { 'cssls', 'html', 'nil_ls', 'ts_ls', 'yamlls' }
|
||||||
for _, lsp in ipairs(servers) do
|
for _, lsp in ipairs(servers) do
|
||||||
vim.lsp.config(lsp, {
|
nvim_lsp[lsp].setup {
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
|
on_attach = on_attach,
|
||||||
flags = { debounce_text_changes = 150 }
|
flags = { debounce_text_changes = 150 }
|
||||||
})
|
}
|
||||||
vim.lsp.enable(lsp)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- nvim-cmp
|
-- nvim-cmp
|
||||||
|
|
@ -223,16 +195,15 @@ cmp.setup {
|
||||||
|
|
||||||
-- LSP/Omnisharp
|
-- LSP/Omnisharp
|
||||||
local pid = vim.fn.getpid()
|
local pid = vim.fn.getpid()
|
||||||
vim.lsp.config("omnisharp", {
|
nvim_lsp.omnisharp.setup {
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
flags = { debounce_text_changes = 150 },
|
flags = { debounce_text_changes = 150 },
|
||||||
cmd = { "{{OMNISHARP_PATH}}", "--languageserver", "--hostPID", tostring(pid) }
|
cmd = { "{{OMNISHARP_PATH}}", "--languageserver", "--hostPID", tostring(pid) }
|
||||||
})
|
}
|
||||||
vim.lsp.enable("omnisharp")
|
|
||||||
|
|
||||||
-- LSP/rust_analyzer
|
-- LSP/rust_analyzer
|
||||||
vim.lsp.config("rust_analyzer", {
|
nvim_lsp.rust_analyzer.setup {
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
flags = { debounce_text_changes = 150 },
|
flags = { debounce_text_changes = 150 },
|
||||||
|
|
@ -249,11 +220,11 @@ vim.lsp.config("rust_analyzer", {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
vim.lsp.enable("rust_analyzer")
|
|
||||||
|
|
||||||
-- LSP/Diagnostics
|
-- LSP/Diagnostics
|
||||||
vim.lsp.config("diagnosticls", {
|
nvim_lsp.diagnosticls.setup {
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
flags = { debounce_text_changes = 150 },
|
flags = { debounce_text_changes = 150 },
|
||||||
|
|
@ -289,34 +260,7 @@ vim.lsp.config("diagnosticls", {
|
||||||
vue = 'eslint'
|
vue = 'eslint'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
vim.lsp.enable("diagnosticls")
|
|
||||||
|
|
||||||
-- LSP/nixd
|
|
||||||
vim.lsp.config("nixd", {
|
|
||||||
cmd = { "nixd" },
|
|
||||||
filetypes = { "nix" },
|
|
||||||
root_markers = { "flake.nix", ".git" },
|
|
||||||
settings = {
|
|
||||||
nixd = {
|
|
||||||
nixpkgs = {
|
|
||||||
expr = "import <nixpkgs> { }",
|
|
||||||
},
|
|
||||||
formatting = {
|
|
||||||
command = { "nixfmt" },
|
|
||||||
},
|
|
||||||
options = {
|
|
||||||
nixos = {
|
|
||||||
expr = '(builtins.getFlake (toString ./.)).nixosConfigurations.{{HOSTNAME}}.options',
|
|
||||||
},
|
|
||||||
home_manager = {
|
|
||||||
expr = '(builtins.getFlake (builtins.toString ./.)).nixosConfigurations."{{USERNAME}}@{{HOSTNAME}}".options.home-manager.users.type.getSubOptions []',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
vim.lsp.enable("nixd")
|
|
||||||
|
|
||||||
-- LSP/Signatures
|
-- LSP/Signatures
|
||||||
require("lsp_signature").setup {
|
require("lsp_signature").setup {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
(defwindow mainbar :monitor 0
|
(defwindow mainbar :monitor 0
|
||||||
|
|
||||||
:geometry (geometry :x "0%"
|
:geometry (geometry :x "0%"
|
||||||
:y "0%"
|
:y "0%"
|
||||||
:width "100%"
|
:width "100%"
|
||||||
|
|
@ -40,15 +39,12 @@
|
||||||
`cat /sys/class/power_supply/_BAT_PATH_/capacity`)
|
`cat /sys/class/power_supply/_BAT_PATH_/capacity`)
|
||||||
(defpoll pbat_status :interval "1s" :run-while bat-enabled
|
(defpoll pbat_status :interval "1s" :run-while bat-enabled
|
||||||
`cat /sys/class/power_supply/_BAT_PATH_/status`)
|
`cat /sys/class/power_supply/_BAT_PATH_/status`)
|
||||||
(defpoll wifi_ssid :interval "1s" :run-while wifi-enabled
|
(defpoll network_strength :interval "1s" :run-while wifi-enabled
|
||||||
`iwctl station wlan0 show | grep "Connected network" | awk '{print $3}'`)
|
`nmcli -f IN-USE,SIGNAL device wifi | grep '*' | tr -d -c 0-9`)
|
||||||
(defpoll wifi_strength :interval "1s" :run-while wifi-enabled
|
|
||||||
`iw dev wlan0 link | awk '/signal/ {gsub("-",""); print $2}'`)
|
|
||||||
(defpoll bluetooth_device :interval "1s" :run-while bt-enabled
|
(defpoll bluetooth_device :interval "1s" :run-while bt-enabled
|
||||||
`bluetoothctl devices Connected | grep Device | cut -d" " -f3-`)
|
`bluetoothctl devices Connected | grep Device | cut -d" " -f3-`)
|
||||||
(defpoll bluetooth_device_count :interval "1s" :run-while bt-enabled
|
|
||||||
`bluetoothctl devices Connected | wc -l`)
|
|
||||||
|
|
||||||
|
(deflisten lnetwork :initial "" :run-while wifi-enabled "./scripts/network.sh")
|
||||||
(deflisten ltitle :initial "" "./scripts/title.sh")
|
(deflisten ltitle :initial "" "./scripts/title.sh")
|
||||||
(deflisten lworkspaces :initial "[]" "./scripts/workspaces.sh")
|
(deflisten lworkspaces :initial "[]" "./scripts/workspaces.sh")
|
||||||
(deflisten lcurrent_workspace :initial "1" "./scripts/active-workspace.sh")
|
(deflisten lcurrent_workspace :initial "1" "./scripts/active-workspace.sh")
|
||||||
|
|
@ -103,28 +99,28 @@
|
||||||
(revealer :transition "slideleft"
|
(revealer :transition "slideleft"
|
||||||
:reveal {bluetooth-extended && bluetooth_device != ""}
|
:reveal {bluetooth-extended && bluetooth_device != ""}
|
||||||
:duration 150
|
:duration 150
|
||||||
(label :text { bluetooth_device_count == "1" ? bluetooth_device : (bluetooth_device_count + " devices") }
|
(label :text bluetooth_device
|
||||||
:class "base")))))
|
:class "base")))))
|
||||||
|
|
||||||
(defwidget network []
|
(defwidget network []
|
||||||
(button :onclick `eww update network-extended=${network-extended ? "false" : "true"}`
|
(button :onclick `eww update network-extended=${network-extended ? "false" : "true"}`
|
||||||
(box :orientation "horizontal"
|
(box :orientation "horizontal"
|
||||||
:class {"widget pill" + ((network-extended && wifi_ssid != "") ? " extended" : "")}
|
:class {"widget pill" + ((network-extended && lnetwork != "Disconnected") ? " extended" : "")}
|
||||||
:spacing {(network-extended && wifi_ssid != "") ? 5 : 0}
|
:spacing {(network-extended && lnetwork != "Disconnected") ? 5 : 0}
|
||||||
:space-evenly false
|
:space-evenly false
|
||||||
(label :text {
|
(label :text {
|
||||||
(wifi_ssid == "") ? ""
|
(lnetwork == "Disconnected") ? ""
|
||||||
: (wifi_strength == "") ? ""
|
: (network_strength == "") ? ""
|
||||||
: (wifi_strength < 75) ? ""
|
: (network_strength < 20) ? ""
|
||||||
: (wifi_strength < 65) ? ""
|
: (network_strength < 30) ? ""
|
||||||
: (wifi_strength < 60) ? ""
|
: (network_strength < 55) ? ""
|
||||||
: (wifi_strength < 50) ? ""
|
: (network_strength < 80) ? ""
|
||||||
: ""}
|
: ""}
|
||||||
:class "base pill-icon")
|
:class "base pill-icon")
|
||||||
(revealer :transition "slideleft"
|
(revealer :transition "slideleft"
|
||||||
:reveal {network-extended && wifi_ssid != ""}
|
:reveal {network-extended && lnetwork != "Disconnected"}
|
||||||
:duration 150
|
:duration 150
|
||||||
(label :text wifi_ssid
|
(label :text lnetwork
|
||||||
:class "base")))))
|
:class "base")))))
|
||||||
|
|
||||||
(defwidget battery []
|
(defwidget battery []
|
||||||
|
|
|
||||||
19
res/eww/scripts/network.sh
Executable file
19
res/eww/scripts/network.sh
Executable file
|
|
@ -0,0 +1,19 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
init=$(nmcli -t -f name,device connection show --active | grep wlp1s0 | cut -d\: -f1)
|
||||||
|
|
||||||
|
if [[ -z $init ]]; then
|
||||||
|
echo Disconnected
|
||||||
|
else
|
||||||
|
echo $init
|
||||||
|
fi
|
||||||
|
|
||||||
|
nmcli monitor | while read -r line ; do
|
||||||
|
if [[ $line == *"is now the primary connection" ]]; then
|
||||||
|
conn=$(echo $line | cut -d\' -f2)
|
||||||
|
echo $conn
|
||||||
|
fi
|
||||||
|
if [[ $line == "There's no primary connection" ]]; then
|
||||||
|
echo Disconnected
|
||||||
|
fi
|
||||||
|
done
|
||||||
BIN
secrets.gcrypt/secrett
Normal file
BIN
secrets.gcrypt/secrett
Normal file
Binary file not shown.
Binary file not shown.
25
secrets.nix
25
secrets.nix
|
|
@ -1,25 +1,18 @@
|
||||||
let
|
let
|
||||||
alyssum = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAp00i2DTwMk9i2WBEwpNTDA51TQJEqzpyCka6znmRzR";
|
|
||||||
anemone = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEPFifSAybe97xDP/cq6AAjy7Fm0go0dtQ9ICK6JRUgc";
|
anemone = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEPFifSAybe97xDP/cq6AAjy7Fm0go0dtQ9ICK6JRUgc";
|
||||||
blossom = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5wfPCcpkNR3ubr7cBV0UwVCDo/sMmV0aI/JOJTIxQj";
|
blossom = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5wfPCcpkNR3ubr7cBV0UwVCDo/sMmV0aI/JOJTIxQj";
|
||||||
|
caramel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPFJT1XYyjDZFHYT/8RdxAReKkeU8QfpLrmMjEeW/80";
|
||||||
|
sugarcane = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIImymDDLSOdLcsox8wxS9Z84fsbsz6Mi58OU0od2p/ZQ";
|
||||||
dandelion = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFUk99ku7+eiIO7Q9sIPlPx3GiUljLv7W404W/zwrtzI";
|
dandelion = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFUk99ku7+eiIO7Q9sIPlPx3GiUljLv7W404W/zwrtzI";
|
||||||
hazel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6mi50ecrrMIn5C4QUyCjPHfSElz0mhevvFCznUzIrK";
|
|
||||||
|
|
||||||
rin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPru5eTBvHJ4ZmrrzPRHCGM09wQP/ZHSaKYalDuBVO15";
|
rin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPru5eTBvHJ4ZmrrzPRHCGM09wQP/ZHSaKYalDuBVO15";
|
||||||
in {
|
in {
|
||||||
"secrets/passwd.age".publicKeys = [ alyssum anemone blossom rin ];
|
"secrets/passwd.age".publicKeys = [ anemone blossom caramel sugarcane rin ];
|
||||||
"secrets/passwd_smbcilly.age".publicKeys = [ alyssum rin ];
|
"secrets/wpa_conf.age".publicKeys = [ blossom caramel rin ];
|
||||||
"secrets/passwd_smbkujira.age".publicKeys = [ alyssum rin ];
|
|
||||||
"secrets/wpa_conf.age".publicKeys = [ alyssum blossom rin ];
|
|
||||||
|
|
||||||
"secrets/acme_dns.age".publicKeys = [ alyssum dandelion hazel rin ];
|
"secrets/acme_dns.age".publicKeys = [ dandelion rin ];
|
||||||
"secrets/navidrome_env.age".publicKeys = [ alyssum dandelion rin ];
|
"secrets/warden_admin.age".publicKeys = [ caramel rin ];
|
||||||
"secrets/slskd_env.age".publicKeys = [ anemone dandelion rin ];
|
"secrets/wg_blossom.age".publicKeys = [ blossom rin ];
|
||||||
"secrets/tailscale_auth.age".publicKeys = [ alyssum anemone blossom dandelion rin ];
|
"secrets/wg_caramel.age".publicKeys = [ caramel rin ];
|
||||||
"secrets/warden_admin.age".publicKeys = [ rin ];
|
"secrets/wg_sugarcane.age".publicKeys = [ sugarcane rin ];
|
||||||
"secrets/wg_anemone.age".publicKeys = [ anemone rin ];
|
|
||||||
"secrets/wg_dandelion.age".publicKeys = [ dandelion rin ];
|
|
||||||
"secrets/wg_hazel.age".publicKeys = [ hazel rin ];
|
|
||||||
"secrets/wg_hyacinth.age".publicKeys = [ blossom rin ];
|
|
||||||
"secrets/wg_caramel.age".publicKeys = [ rin ];
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue