diff --git a/containers/emerald/configuration.nix b/containers/emerald/configuration.nix index 421ddb0..f69a4c6 100644 --- a/containers/emerald/configuration.nix +++ b/containers/emerald/configuration.nix @@ -16,8 +16,7 @@ ShareURL = "https://${shareFqdn}"; EnableSharing = true; DataFolder = "/persist/navidrome"; - MusicFolder = "/binds/music/main"; + MusicFolder = "/binds/music"; }; }; - systemd.services.navidrome.serviceConfig.BindReadOnlyPaths = ["/binds/music"]; } diff --git a/containers/emerald/flake.nix b/containers/emerald/flake.nix index 5ee69e4..9c9acdc 100644 --- a/containers/emerald/flake.nix +++ b/containers/emerald/flake.nix @@ -9,11 +9,11 @@ shareFqdn = "muse.lava.moe"; subnetId = "5"; - subnet = x: "fd0d:2::${subnetId}:${toString x}"; + subnet = x: "fd0d:1::${subnetId}:${toString x}"; host = subnet 1; client = subnet 2; - subnet4 = x: "10.32.${subnetId}.${toString x}"; + subnet4 = x: "10.30.${subnetId}.${toString x}"; host4 = subnet4 1; client4 = subnet4 2; @@ -39,7 +39,13 @@ useACMEHost = "lava.moe"; forceSSL = true; locations."/".proxyPass = "http://[${client}]:4533"; - listenAddresses = [ "100.67.2.1" ]; + listenAddresses = [ "10.0.0.1" "[fd0d::1]" "100.67.1.1" ]; + }; + services.nginx.virtualHosts."${shareFqdn}" = { + useACMEHost = "lava.moe"; + forceSSL = true; + locations."/".return = "404"; + locations."/share/".proxyPass = "http://[${client}]:4533"; }; systemd.tmpfiles.rules = [ "d /persist/containers/${name} 755 root users" ]; @@ -62,7 +68,7 @@ isReadOnly = false; }; bindMounts."music" = { - hostPath = "/flower/media/music"; + hostPath = "/persist/media/music"; mountPoint = "/binds/music"; isReadOnly = true; }; diff --git a/hosts/alyssum/default.nix b/hosts/alyssum/default.nix index 06c415f..661e3d5 100644 --- a/hosts/alyssum/default.nix +++ b/hosts/alyssum/default.nix @@ -6,7 +6,6 @@ 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"; @@ -28,7 +27,6 @@ modules.services.nginx modules.services.syncthing - inputs.c-emerald.nixosModule inputs.c-garnet.nixosModule ./filesystem.nix diff --git a/hosts/alyssum/samba.nix b/hosts/alyssum/samba.nix index d876981..f14365b 100644 --- a/hosts/alyssum/samba.nix +++ b/hosts/alyssum/samba.nix @@ -4,7 +4,6 @@ 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} = { diff --git a/hosts/dandelion/default.nix b/hosts/dandelion/default.nix index f65dfd1..33b6eec 100644 --- a/hosts/dandelion/default.nix +++ b/hosts/dandelion/default.nix @@ -5,6 +5,7 @@ age.secrets = { acme_dns.file = ../../secrets/acme_dns.age; + navidrome_env.file = ../../secrets/navidrome_env.age; slskd_env.file = ../../secrets/slskd_env.age; wg_dandelion.file = ../../secrets/wg_dandelion.age; }; @@ -30,12 +31,12 @@ inputs.c-beryllium.nixosModule inputs.c-citrine.nixosModule inputs.c-diamond.nixosModule + inputs.c-emerald.nixosModule inputs.c-fluorite.nixosModule ./filesystem.nix ./kernel.nix ./networking.nix - ./nginx.nix ../../users/hana ]; diff --git a/hosts/dandelion/nginx.nix b/hosts/dandelion/nginx.nix deleted file mode 100644 index c29de38..0000000 --- a/hosts/dandelion/nginx.nix +++ /dev/null @@ -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"; - }; -} diff --git a/modules/system/nix.nix b/modules/system/nix.nix index eb14f73..6a6fd04 100644 --- a/modules/system/nix.nix +++ b/modules/system/nix.nix @@ -1,6 +1,5 @@ -{ config, inputs, pkgs, ... }: { +{ config, lib, pkgs, ... }: { nix = { - nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; package = pkgs.nixVersions.latest; settings = rec { diff --git a/modules/user/neovim.nix b/modules/user/neovim.nix index 2b8d4c1..d691c61 100644 --- a/modules/user/neovim.nix +++ b/modules/user/neovim.nix @@ -1,9 +1,9 @@ -{ config, lib, pkgs, sysConfig, ... }: +{ config, lib, pkgs, ... }: let luaconf = pkgs.writeText "config.lua" (lib.replaceStrings - ["{{OMNISHARP_PATH}}" "{{DART_PATH}}" "{{CATPPUCCIN_FLAVOUR}}" "{{USERNAME}}" "{{HOSTNAME}}"] - ["${pkgs.omnisharp-roslyn}/bin/OmniSharp" "${pkgs.dart}/bin/dart" config.catppuccin.nvim.flavor config.home.username sysConfig.networking.hostName] + ["{{OMNISHARP_PATH}}" "{{DART_PATH}}" "{{CATPPUCCIN_FLAVOUR}}"] + ["${pkgs.omnisharp-roslyn}/bin/OmniSharp" "${pkgs.dart}/bin/dart" config.catppuccin.nvim.flavor] (builtins.readFile ../../res/config.lua)); in { systemd.user.tmpfiles.rules = [ @@ -21,7 +21,6 @@ in { withRuby = false; extraPackages = with pkgs; [ - nixd rust-analyzer texlab astro-language-server diff --git a/res/config.lua b/res/config.lua index c0b5dad..3e91e28 100644 --- a/res/config.lua +++ b/res/config.lua @@ -167,7 +167,7 @@ vim.diagnostic.config({ capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) -local servers = { 'astro', 'clangd', 'cssls', 'html', 'tailwindcss', 'texlab', 'ts_ls', 'yamlls' } +local servers = { 'astro', 'clangd', 'cssls', 'html', 'nil_ls', 'tailwindcss', 'texlab', 'ts_ls', 'yamlls' } for _, lsp in ipairs(servers) do vim.lsp.config(lsp, { capabilities = capabilities, @@ -292,32 +292,6 @@ vim.lsp.config("diagnosticls", { }) vim.lsp.enable("diagnosticls") --- LSP/nixd -vim.lsp.config("nixd", { - cmd = { "nixd" }, - filetypes = { "nix" }, - root_markers = { "flake.nix", ".git" }, - settings = { - nixd = { - nixpkgs = { - expr = "import { }", - }, - 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 require("lsp_signature").setup { hint_enable = false, diff --git a/secrets.nix b/secrets.nix index b1f55e5..bec70ef 100644 --- a/secrets.nix +++ b/secrets.nix @@ -13,7 +13,7 @@ in { "secrets/wpa_conf.age".publicKeys = [ alyssum blossom rin ]; "secrets/acme_dns.age".publicKeys = [ alyssum dandelion hazel rin ]; - "secrets/navidrome_env.age".publicKeys = [ alyssum dandelion rin ]; + "secrets/navidrome_env.age".publicKeys = [ anemone dandelion rin ]; "secrets/slskd_env.age".publicKeys = [ anemone dandelion rin ]; "secrets/tailscale_auth.age".publicKeys = [ alyssum anemone blossom dandelion rin ]; "secrets/warden_admin.age".publicKeys = [ rin ]; diff --git a/secrets/navidrome_env.age b/secrets/navidrome_env.age index 7df364f..6cb705c 100644 Binary files a/secrets/navidrome_env.age and b/secrets/navidrome_env.age differ diff --git a/users/rin/packages.nix b/users/rin/packages.nix index 3fe0129..afc711b 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -15,6 +15,7 @@ in { ffmpeg gnupg kitty + nil nodejs_latest pamixer pnpm