Squash merge refactor into main

This commit is contained in:
danny 2025-08-09 22:22:19 +08:00
parent 529c9e5fa7
commit b82cd59f4f
35 changed files with 498 additions and 358 deletions

View file

@ -1,7 +1,12 @@
{
settings,
username,
...
}:
let
monitors = [
''desc:LG Display 0x0665''
];
in
{
imports = [
./hardware-configuration.nix
@ -17,18 +22,54 @@
];
home-manager = {
users."${settings.personal.username}" = {
users."${username}" = {
imports = [
../../../home/presets/basic.nix
(import ../../../home/user/bitwarden.nix {
email = "danny@dn-server.net.dn";
baseUrl = "https://bitwarden.net.dn";
})
# Hyprland
(import ../../../home/user/hyprland.nix { inherit monitors; })
{
wayland.windowManager.hyprland = {
settings = {
windowrulev2 = [
# Meidia control
"move 1680 59, class: ^(org.pulseaudio.pavucontrol)$"
"size 868 561, class: ^(org.pulseaudio.pavucontrol)$"
# Local Send (File Sharing)
"size 523 1372, class: ^(localsend_app)$"
"move 2024 56, class: ^(localsend_app)$"
# Airplay
"size 487 1055, class: ^(GStreamer)$"
# Bluetooth
"move 1943 59, class: ^(blueberry.py)$"
"size 605 763, class: ^(blueberry.py)$"
];
monitors = [
''desc:LG Display 0x0665, preferred, 0x0, 1.25''
];
};
};
}
# Git
(import ../../../home/user/git.nix {
inherit username;
email = "danny10132024@gmail.com";
})
];
};
};
users.users."${settings.personal.username}".openssh.authorizedKeys.keys = [
users.users."${username}".openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILSHkPa6vmr5WBPXAazY16+Ph1Mqv9E24uLIf32oC2oH danny@phone.dn"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJSAOufpee7f8D8ONIIGU3qsN+8+DGO7BfZnEOTYqtQ5 danny@pre7780.dn"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMj/LeB3i/vca3YwGNpAjf922FgiY2svro48fUSQAjOv Shortcuts on :D"