This commit is contained in:
Leon Liu 2024-12-28 00:10:33 +09:00
parent 3d4deffa71
commit 4efa832e79
4 changed files with 44 additions and 62 deletions

View File

@ -4,23 +4,7 @@
{ config, pkgs, lib, ... }:
let
kubeMasterIP = "192.168.11.2";
kubeMasterHostname = "api.kube";
kubeMasterAPIServerPort = 6443;
in
{
nixpkgs.overlays = [
(final: prev: {
open-webui = prev.open-webui.overridePythonAttrs(old: {
dependencies = with pkgs.python311Packages; old.dependencies ++ [
emoji
iso-639
langdetect
];
});
})
];
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
@ -53,11 +37,13 @@ in
package = pkgs.noto-fonts-emoji;
name = "Noto Color Emoji";
};
sizes = {
terminal = 20;
};
};
nix.settings.trusted-users = [ "root" "liu" ];
virtualisation.docker.enable = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ];
networking.extraHosts = "${kubeMasterIP} ${kubeMasterHostname}";
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
@ -100,34 +86,15 @@ in
services.xserver.displayManager.gdm.enable = true;
programs.hyprland = {
enable = true;
withUWSM = true;
xwayland.enable = true;
};
services.xserver.desktopManager.gnome.enable = true;
# services.xserver.desktopManager.gnome.enable = true;
# Configure keymap in X11
# services.xserver = {
# layout = "us";
# xkbVariant = "";
# };
# Enable CUPS to print documents.
# services.printing.enable = true;
# Enable sound with pipewire.
# hardware.pulseaudio.enable = false;
# security.rtkit.enable = true;
# services.pipewire = {
# enable = true;
# alsa.enable = true;
# alsa.support32Bit = true;
# pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
# };
services.printing.enable = true;
# i18n.inputMethod = {
# enabled = "fcitx5";
@ -146,7 +113,6 @@ in
# };
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
programs.zsh.enable = true;
# Define a user account. Don't forget to set a password with passwd.
users.users.liu = {
@ -181,13 +147,6 @@ in
# services.xserver.displayManager.autoLogin.enable = true;
# services.xserver.displayManager.autoLogin.user = "liu";
# Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229
# systemd.services."getty@tty1".enable = false;
# systemd.services."autovt@tty1".enable = false;
# systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
# systemd.services.systemd-networkd-wait-online.enable = lib.mkForce false;
systemd.services.easytier = {
enable = true;
description = "Easytier";
@ -295,7 +254,6 @@ in
};
};
environment.sessionVariables.NIXOS_OZONE_WL = "1";
systemd.services.caddy.serviceConfig.EnvironmentFile = ["/opt/caddy/env"];
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. Its perfectly fine and recommended to leave

View File

@ -1,4 +1,4 @@
{ config, pkgs, nixvim, ... }:
{ lib, pkgs, nixvim, ... }:
{
@ -53,6 +53,12 @@
dolphin
wofi
kitty
hyprlock
hypridle
rofi-wayland
dunst
libnotify
nemo
# Language servers
yaml-language-server
@ -134,7 +140,7 @@
enableZshIntegration = true;
extraConfig = builtins.readFile ./wezterm.lua;
};
programs.vscode = {
programs.vscode = let fontSize = 16; in {
enable = true;
extensions = [
pkgs.vscode-extensions.bbenoist.nix
@ -143,6 +149,11 @@
userSettings = {
"window.zoomLevel" = 2;
"editor.fontFamily" = "mononoki";
"editor.fontSize" = lib.mkForce fontSize;
"debug.console.fontSize" = lib.mkForce fontSize;
"markdown.preview.fontSize" = lib.mkForce fontSize;
"terminal.integrated.fontSize" = lib.mkForce fontSize;
"chat.editor.fontSize" = lib.mkForce fontSize;
"[dart]" = {
"editor.formatOnSave" = true;
"editor.formatOnType" = true;
@ -173,6 +184,10 @@
};
wayland.windowManager.hyprland = {
enable = true;
systemd.enable = false;
extraConfig = (builtins.readFile ./hyprland.conf);
};
programs.kitty = {
enable = true;
};
}

View File

@ -24,7 +24,9 @@
################
# See https://wiki.hyprland.org/Configuring/Monitors/
monitor=,preferred,auto,auto
monitor = DP-3,2560x1440@144,0x0,1
monitor = DP-2,2560x1440@144,2560x0,1
###################
@ -34,9 +36,9 @@ monitor=,preferred,auto,auto
# See https://wiki.hyprland.org/Configuring/Keywords/
# Set programs that you use
$terminal = wezterm
$fileManager = dolphin
$menu = wofi --show drun
$terminal = kitty
$fileManager = nemo
$menu = rofi -show drun -show-icons
#################
@ -168,8 +170,12 @@ master {
# https://wiki.hyprland.org/Configuring/Variables/#misc
misc {
force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :(
disable_splash_rendering = true
font_family = "mononoki"
mouse_move_enables_dpms = true
key_press_enables_dpms = true
}
@ -280,6 +286,7 @@ bindl = , XF86AudioPause, exec, playerctl play-pause
bindl = , XF86AudioPlay, exec, playerctl play-pause
bindl = , XF86AudioPrev, exec, playerctl previous
bind = $mainMod, L, exec, hyprlock
##############################
### WINDOWS AND WORKSPACES ###
##############################
@ -298,3 +305,5 @@ windowrulev2 = suppressevent maximize, class:.*
# Fix some dragging issues with XWayland
windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
exec-once = dunst

View File

@ -25,11 +25,11 @@
};
in {
"open-webui.home.ly-dodo.win" = proxy 8080;
# "open-webui.home.ly-dodo.win" = proxy 8080;
"adguard.home.ly-dodo.win" = proxy 8082;
"plex.home.ly-dodo.win" = proxy 32400;
"qbittorrent.home.ly-dodo.win" = proxy 30011;
"paperless.home.ly-dodo.win" = proxy 30012;
# "plex.home.ly-dodo.win" = proxy 32400;
# "qbittorrent.home.ly-dodo.win" = proxy 30011;
# "paperless.home.ly-dodo.win" = proxy 30012;
};
};
}