Compare commits

..

No commits in common. "7b9a87a2506b06912ad3edfda8f33e7829aeb618" and "89c846f69aa9df523476bf8e204ea3c02497d78e" have entirely different histories.

8 changed files with 23 additions and 88 deletions

View file

@ -79,7 +79,6 @@
};
modules = [
./maskiner/node/configuration.nix
home-manager.nixosModules.home-manager
sops-nix.nixosModules.sops
bbk.nixosModules.default
];

View file

@ -15,6 +15,6 @@ loki.source.journal "read" {
loki.write "endpoint" {
endpoint {
url ="http://192.168.1.143:3100/loki/api/v1/push"
url ="http://192.168.1.227:3100/loki/api/v1/push"
}
}

View file

@ -51,6 +51,15 @@ 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;

View file

@ -44,22 +44,11 @@ in
mode = "0440";
};
environment.systemPackages = with pkgs; [
git
vim
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;
@ -70,7 +59,8 @@ 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;";
};
};
};

View file

@ -69,7 +69,6 @@
vial
via
remmina
brightnessctl
dbeaver-bin

View file

@ -1,66 +0,0 @@
{ 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" ]; };
};
}

View file

@ -1,10 +1,15 @@
{
host,
config,
lib,
pkgs,
inputs,
myhostname,
...
}:
let
hyprlandPkg = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
in
with lib;
{
options = {
@ -126,8 +131,7 @@ 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"
"desc: ASUSTek COMPUTER INC VG279 JBLMQS021792 (HDMI-A-1), 1920x1080@60, 0x0, 1"
"desc: BOE 0x08BC (eDP-1), disable"
# "eDP-1, 1920x1080@60, 0x0, 1, transform, 0"
",prefered,auto,1"
];

View file

@ -40,10 +40,10 @@
identityFile = "/home/fw/.ssh/fw-ssh-key";
};
"node" = {
hostname = "100.64.0.4";
hostname = "192.168.1.227";
port = 22;
user = "fw";
identityFile = "/home/fw/.ssh/id_ed25519";
identityFile = "/home/fw/.ssh/id_rsa";
};
};
};