feat(homelab): migrate server to fabric
This commit is contained in:
@@ -8,7 +8,7 @@ resources:
|
|||||||
|
|
||||||
minecraftServer:
|
minecraftServer:
|
||||||
eula: "TRUE"
|
eula: "TRUE"
|
||||||
type: "PAPER"
|
type: "FABRIC"
|
||||||
version: "1.21.11"
|
version: "1.21.11"
|
||||||
difficulty: hard
|
difficulty: hard
|
||||||
motd: "A Minecraft Server."
|
motd: "A Minecraft Server."
|
||||||
@@ -21,8 +21,11 @@ minecraftServer:
|
|||||||
secretKey: rcon-password
|
secretKey: rcon-password
|
||||||
modrinth:
|
modrinth:
|
||||||
projects:
|
projects:
|
||||||
- treeminer
|
- fabric-api
|
||||||
- fast-leaf-decay
|
- tree-vein-miner
|
||||||
|
- lithium
|
||||||
|
- servux
|
||||||
|
- ferrite-core
|
||||||
|
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
kubernetes.io/hostname: kube
|
kubernetes.io/hostname: kube
|
||||||
|
|||||||
@@ -14,6 +14,15 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf config.desktop.enable {
|
config = lib.mkIf config.desktop.enable {
|
||||||
|
i18n.inputMethod = {
|
||||||
|
enable = true;
|
||||||
|
type = "fcitx5";
|
||||||
|
fcitx5.addons = with pkgs; [
|
||||||
|
fcitx5-mozc
|
||||||
|
fcitx5-gtk
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
vscode-fhs
|
vscode-fhs
|
||||||
pavucontrol
|
pavucontrol
|
||||||
@@ -111,6 +120,14 @@
|
|||||||
};
|
};
|
||||||
xdg.configFile = {
|
xdg.configFile = {
|
||||||
"hypr/hyprlock.conf".source = ../../custom/hyprlock/hyprlock.conf;
|
"hypr/hyprlock.conf".source = ../../custom/hyprlock/hyprlock.conf;
|
||||||
|
"fcitx5/config".text = ''
|
||||||
|
[Hotkey]
|
||||||
|
TriggerKeys=
|
||||||
|
EnumerateWithTriggerKeys=True
|
||||||
|
EnumerateForwardKeys=
|
||||||
|
EnumerateBackwardKeys=
|
||||||
|
EnumerateSkipFirst=False
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
services.dunst = {
|
services.dunst = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -210,6 +227,8 @@
|
|||||||
"$mod SHIFT, v, exec, bash -c ~/dotfiles/scripts/copy.sh"
|
"$mod SHIFT, v, exec, bash -c ~/dotfiles/scripts/copy.sh"
|
||||||
"$mod SHIFT, s, exec, bash -c ~/dotfiles/scripts/screenshot.sh"
|
"$mod SHIFT, s, exec, bash -c ~/dotfiles/scripts/screenshot.sh"
|
||||||
"$mod, p, exec, bash -c ~/dotfiles/scripts/project.sh"
|
"$mod, p, exec, bash -c ~/dotfiles/scripts/project.sh"
|
||||||
|
"$mod SHIFT, k, exec, bash -c ~/dotfiles/scripts/layout.sh"
|
||||||
|
"$mod SHIFT, j, exec, fcitx5-remote -t"
|
||||||
|
|
||||||
"$mod, 0, workspace, 10"
|
"$mod, 0, workspace, 10"
|
||||||
"$mod SHIFT, 0, movetoworkspacesilent, 10"
|
"$mod SHIFT, 0, movetoworkspacesilent, 10"
|
||||||
@@ -257,17 +276,21 @@
|
|||||||
"XCURSOR_SIZE,24"
|
"XCURSOR_SIZE,24"
|
||||||
"LIBVA_DRIVER_NAME,nvidia"
|
"LIBVA_DRIVER_NAME,nvidia"
|
||||||
"__GLX_VENDOR_LIBRARY_NAME,nvidia"
|
"__GLX_VENDOR_LIBRARY_NAME,nvidia"
|
||||||
|
# "GTK_IM_MODULE,fcitx"
|
||||||
|
# "QT_IM_MODULE,fcitx"
|
||||||
|
"XMODIFIERS,@im=fcitx"
|
||||||
];
|
];
|
||||||
exec-once = [
|
exec-once = [
|
||||||
# "status-bar"
|
# "status-bar"
|
||||||
"qs"
|
"qs"
|
||||||
"wl-clip-persist --clipboard regular"
|
"wl-clip-persist --clipboard regular"
|
||||||
|
"fcitx5 -d"
|
||||||
];
|
];
|
||||||
monitor = [
|
monitor = [
|
||||||
"eDP-1, 1920x1080, 0x0, 1"
|
"eDP-1, 1920x1080, 0x0, 1"
|
||||||
];
|
];
|
||||||
input = {
|
input = {
|
||||||
kb_layout = "us";
|
kb_layout = "us,jp";
|
||||||
touchpad = {
|
touchpad = {
|
||||||
natural_scroll = true;
|
natural_scroll = true;
|
||||||
};
|
};
|
||||||
|
|||||||
18
scripts/layout.sh
Executable file
18
scripts/layout.sh
Executable file
@@ -0,0 +1,18 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Rofi-based keyboard layout switcher for Hyprland
|
||||||
|
|
||||||
|
layouts="🇨🇦 Canadian (CA)
|
||||||
|
🇯🇵 Japanese (JP)"
|
||||||
|
|
||||||
|
selected=$(echo "$layouts" | rofi -dmenu -p "Layout")
|
||||||
|
|
||||||
|
case "$selected" in
|
||||||
|
*"Canadian"*)
|
||||||
|
hyprctl switchxkblayout all 0
|
||||||
|
notify-send -h string:synchronous:keyboard "Keyboard" "🇨🇦 Canadian (CA)"
|
||||||
|
;;
|
||||||
|
*"Japanese"*)
|
||||||
|
hyprctl switchxkblayout all 1
|
||||||
|
notify-send -h string:synchronous:keyboard "Keyboard" "🇯🇵 Japanese (JP)"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
Reference in New Issue
Block a user