Merge branch 'main' of orion:kiri/nixos-config

This commit is contained in:
2025-12-04 18:48:31 +01:00
7 changed files with 36 additions and 16 deletions

View File

@@ -3,10 +3,22 @@
imports = [ imports = [
../../modules/nixos/desktop.nix ../../modules/nixos/desktop.nix
../../modules/nixos/ssh.nix
./hardware-configuration.nix ./hardware-configuration.nix
./variables.nix ./variables.nix
]; ];
networking = {
interfaces = {
enp5s0 = {
wakeOnLan.enable = true;
};
};
firewall = {
allowedUDPPorts = [ 9 ];
};
};
home-manager.users."${config.var.username}" = import ./home.nix; home-manager.users."${config.var.username}" = import ./home.nix;
system.stateVersion = "24.05"; system.stateVersion = "24.05";

View File

@@ -89,6 +89,8 @@
cmatrix cmatrix
libreoffice-qt6-fresh libreoffice-qt6-fresh
trash-cli
]; ];
}; };
} }

View File

@@ -144,9 +144,10 @@ in
windowrule = [ windowrule = [
"match:title hyprpanel-settings, float on" "match:title hyprpanel-settings, float on"
"match:class xdg-desktop-portal-gtk, float on, center on, size monitor_w/2 monitor_h/2" "match:class xdg-desktop-portal-gtk, float on, center on, size (monitor_w * 0.5) (monitor_h * 0.5)"
# Match on bitwarden chrome extension id # Match on bitwarden chrome extension id
"match:class .*nngceckbapebfimnlniiiahkandclblb.*, float on, center on, size monitor_w/2 monitor_h/2" "match:class .*nngceckbapebfimnlniiiahkandclblb.*, float on, center on, size (monitor_w * 0.5) (monitor_h * 0.5)"
"match:class imv, float on, center on, max_size (monitor_w * 0.8) (monitor_h * 0.8)"
]; ];
layerrule = [ layerrule = [

View File

@@ -61,6 +61,8 @@ let
typstyle typstyle
ltex-ls-plus ltex-ls-plus
harper
]; ];
}; };

View File

@@ -64,7 +64,7 @@ require("lz.n").load({
-- 1. Setup Diagnostics (Visuals) -- 1. Setup Diagnostics (Visuals)
vim.diagnostic.config({ vim.diagnostic.config({
severity_sort = true, severity_sort = true,
underline = { severity = vim.diagnostic.severity.ERROR }, -- underline = { severity = vim.diagnostic.severity.ERROR },
signs = { signs = {
text = { text = {
[vim.diagnostic.severity.ERROR] = "", [vim.diagnostic.severity.ERROR] = "",
@@ -165,6 +165,8 @@ require("lz.n").load({
}, },
}) })
vim.lsp.enable("ltex_plus") vim.lsp.enable("ltex_plus")
vim.lsp.enable("harper_ls")
end, end,
}, },
}) })

View File

@@ -4,6 +4,18 @@
... ...
}: }:
let let
devices = {
"altair" = {
id = "HDHWROJ-ZLNQKCL-PN6WGHA-IGJHIRI-3UHDYUU-LUJHYK4-UMKWLAZ-VFISJQF";
};
"orion" = {
id = "7ESQ3BX-FEW7656-ZPT3CKF-FLXON26-HXRNTDW-THSJBNF-LFWCHFB-ASP4WAG";
};
"polaris" = {
id = "6YBO3OK-3QVMKWL-ZOS4ZTF-G53CY6K-WYZJNFG-DTYCUA4-WJF2LRC-PJT3NAL";
};
};
username = config.var.username; username = config.var.username;
hostname = config.var.hostname; hostname = config.var.hostname;
isOrion = hostname == "orion"; isOrion = hostname == "orion";
@@ -33,12 +45,12 @@ in
overrideFolders = true; # Overrides any folders added via Web UI overrideFolders = true; # Overrides any folders added via Web UI
settings = { settings = {
devices = config.var.syncthing.devices; devices = devices;
folders = { folders = {
"sync" = { "sync" = {
path = syncPath; path = syncPath;
devices = builtins.attrNames config.var.syncthing.devices; # Share with all defined devices devices = builtins.attrNames devices; # Share with all defined devices
# Ensure new files are readable by the group (chmod 770 approx) # Ensure new files are readable by the group (chmod 770 approx)
ignorePerms = true; ignorePerms = true;
}; };

View File

@@ -25,17 +25,6 @@
browser = "brave"; browser = "brave";
}; };
syncthing = {
devices = {
"altair" = {
id = "HDHWROJ-ZLNQKCL-PN6WGHA-IGJHIRI-3UHDYUU-LUJHYK4-UMKWLAZ-VFISJQF";
};
"orion" = {
id = "7ESQ3BX-FEW7656-ZPT3CKF-FLXON26-HXRNTDW-THSJBNF-LFWCHFB-ASP4WAG";
};
};
};
autoUpgrade = false; autoUpgrade = false;
autoGarbageCollector = true; autoGarbageCollector = true;
}; };