diff --git a/flake.nix b/flake.nix index 82ba93f..0b71cd5 100644 --- a/flake.nix +++ b/flake.nix @@ -79,6 +79,7 @@ }; modules = [ ./maskiner/node/configuration.nix + home-manager.nixosModules.home-manager sops-nix.nixosModules.sops bbk.nixosModules.default ]; diff --git a/maskiner/archive/alloy-systemd.yaml b/maskiner/archive/alloy-systemd.yaml index c7bf697..07588f5 100644 --- a/maskiner/archive/alloy-systemd.yaml +++ b/maskiner/archive/alloy-systemd.yaml @@ -15,6 +15,6 @@ loki.source.journal "read" { loki.write "endpoint" { endpoint { - url ="http://192.168.1.227:3100/loki/api/v1/push" + url ="http://192.168.1.143:3100/loki/api/v1/push" } } diff --git a/maskiner/laptop/configuration.nix b/maskiner/laptop/configuration.nix index a890706..4ae9d12 100644 --- a/maskiner/laptop/configuration.nix +++ b/maskiner/laptop/configuration.nix @@ -51,15 +51,6 @@ in theme = theme; }; - programs.ssh.knownHosts = { - desktop = { - extraHostNames = [ "192.168.1.227" ]; - publicKeyFile = ../../keys/rsa_pubkey; - }; - "192.168.1.227" = { - publicKeyFile = ../../keys/rsa_pubkey; - }; - }; hyprland = { enable = true; theme = theme; diff --git a/maskiner/node/configuration.nix b/maskiner/node/configuration.nix index 202e7f1..b5261ff 100644 --- a/maskiner/node/configuration.nix +++ b/maskiner/node/configuration.nix @@ -44,11 +44,22 @@ in mode = "0440"; }; environment.systemPackages = with pkgs; [ - beets - git - vim + git + vim ]; + home-manager.users.fw = { + imports = [ + (modulesDirectory + /programs/beets) + ]; + home.username = "fw"; + home.homeDirectory = "/home/fw"; + + home.stateVersion = "26.05"; + + systemd.user.startServices = "sd-switch"; + }; + services.nginx = { enable = true; recommendedProxySettings = true; @@ -59,8 +70,7 @@ in locations."/" = { proxyPass = "https://192.168.1.1"; proxyWebsockets = true; - extraConfig = - "proxy_ssl_server_name on;" + "proxy_pass_header Authorization;"; + extraConfig = "proxy_ssl_server_name on;" + "proxy_pass_header Authorization;"; }; }; }; diff --git a/moduler/programs.nix b/moduler/programs.nix index 610cd70..4f924e8 100644 --- a/moduler/programs.nix +++ b/moduler/programs.nix @@ -69,6 +69,7 @@ vial via remmina + brightnessctl dbeaver-bin diff --git a/moduler/programs/beets/default.nix b/moduler/programs/beets/default.nix new file mode 100644 index 0000000..3b48a09 --- /dev/null +++ b/moduler/programs/beets/default.nix @@ -0,0 +1,66 @@ +{ config, pkgs, ... }: +let + beetsConfig = pkgs.writeText "beets-config.yaml" '' + directory: ${config.home.homeDirectory}/Music + library: ${config.home.homeDirectory}/.config/beets/library.db + + plugins: + - fetchart + - fish + - musicbrainz + - lyrics + - web + + import: + move: yes + write: yes + + fetchart: + auto: yes + + lyrics: + auto: yes + + web: + host: 127.0.0.1 + port: 8337 + ''; +in +{ + home.packages = with pkgs; [ + beets + fish + + # Common helpers used by beets/plugins + ffmpeg + imagemagick + + # Optional but often useful with beets: + chromaprint + ]; + + # Install beets config into ~/.config/beets/config.yaml + xdg.configFile."beets/config.yaml".source = beetsConfig; + + # Convenience: ensure beet uses that config without needing BEETSCONFIG each time + home.sessionVariables = { + BEETSCONFIG = "${config.xdg.configHome}/beets/config.yaml"; + }; + + # Optional: a user service for `beet web` + systemd.user.services.beets-web = { + Unit = { + Description = "Beets web plugin (user service)"; + After = [ "network.target" ]; + }; + Service = { + ExecStart = "${pkgs.beets}/bin/beet web"; + Restart = "on-failure"; + Environment = [ + "BEETSCONFIG=${config.xdg.configHome}/beets/config.yaml" + ]; + }; + Install = { WantedBy = [ "default.target" ]; }; + }; +} + diff --git a/moduler/programs/hyprland/default.nix b/moduler/programs/hyprland/default.nix index 5408a62..8d53ce6 100644 --- a/moduler/programs/hyprland/default.nix +++ b/moduler/programs/hyprland/default.nix @@ -1,15 +1,10 @@ { - host, config, lib, pkgs, inputs, - myhostname, ... }: -let - hyprlandPkg = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; -in with lib; { options = { @@ -131,7 +126,8 @@ with lib; monitor = [ "desc: ASUSTek COMPUTER INC ASUS PA279CV S4LMTF159462 (DP-1), 3840x2160@60, 0x0, 1.5, transform, 0" "desc: ASUSTek COMPUTER INC VG279 JBLMQS021792 (DP-1), 1920x1080@144, 0x0, 1" - # "eDP-1, 1920x1080@60, 0x0, 1, transform, 0" + "desc: ASUSTek COMPUTER INC VG279 JBLMQS021792 (HDMI-A-1), 1920x1080@60, 0x0, 1" + "desc: BOE 0x08BC (eDP-1), disable" ",prefered,auto,1" ]; diff --git a/moduler/ssh.nix b/moduler/ssh.nix index 6805ca6..d122bfa 100644 --- a/moduler/ssh.nix +++ b/moduler/ssh.nix @@ -40,10 +40,10 @@ identityFile = "/home/fw/.ssh/fw-ssh-key"; }; "node" = { - hostname = "192.168.1.227"; + hostname = "100.64.0.4"; port = 22; user = "fw"; - identityFile = "/home/fw/.ssh/id_rsa"; + identityFile = "/home/fw/.ssh/id_ed25519"; }; }; };