la till beets och fixade med ip
This commit is contained in:
parent
b14b30ec0b
commit
7b9a87a250
7 changed files with 87 additions and 18 deletions
|
|
@ -79,6 +79,7 @@
|
|||
};
|
||||
modules = [
|
||||
./maskiner/node/configuration.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
sops-nix.nixosModules.sops
|
||||
bbk.nixosModules.default
|
||||
];
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -44,11 +44,22 @@ in
|
|||
mode = "0440";
|
||||
};
|
||||
environment.systemPackages = with pkgs; [
|
||||
beets
|
||||
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;";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
66
moduler/programs/beets/default.nix
Normal file
66
moduler/programs/beets/default.nix
Normal file
|
|
@ -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" ]; };
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -126,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"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue