Compare commits
8 Commits
router/wir
...
19a7fbf181
| Author | SHA1 | Date | |
|---|---|---|---|
|
19a7fbf181
|
|||
|
2ca40aa2f9
|
|||
|
9c02c5b611
|
|||
|
77df850248
|
|||
|
beaf8ae2bd
|
|||
|
e8f37f3245
|
|||
|
2ba1412280
|
|||
|
1b7395c392
|
38
flake.nix
38
flake.nix
@@ -24,19 +24,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, home-manager, plasma-manager, nixos-generators, secrix }:
|
||||
let
|
||||
hmModule = file: {
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
|
||||
|
||||
home-manager.users.cazzzer = import file;
|
||||
# Optionally, use home-manager.extraSpecialArgs to pass
|
||||
# arguments to home.nix
|
||||
};
|
||||
in
|
||||
{
|
||||
outputs = { self, nixpkgs, home-manager, plasma-manager, nixos-generators, secrix }: {
|
||||
apps.x86_64-linux.secrix = secrix.secrix self;
|
||||
|
||||
nixosConfigurations = {
|
||||
@@ -45,25 +33,19 @@
|
||||
modules = [
|
||||
./modules
|
||||
./hosts/common.nix
|
||||
./hosts/common-desktop.nix
|
||||
./hosts/Yura-PC
|
||||
./users/cazzzer
|
||||
# https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-nixos-module
|
||||
home-manager.nixosModules.home-manager
|
||||
(hmModule ./home/cazzzer-pc.nix)
|
||||
];
|
||||
};
|
||||
Yura-TPX13 = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
./modules
|
||||
./hosts/common.nix
|
||||
./hosts/common-desktop.nix
|
||||
./hosts/Yura-TPX13
|
||||
./users/cazzzer
|
||||
# https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-nixos-module
|
||||
home-manager.nixosModules.home-manager
|
||||
(hmModule ./home/cazzzer-laptop.nix)
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
|
||||
|
||||
home-manager.users.cazzzer = import ./home;
|
||||
# Optionally, use home-manager.extraSpecialArgs to pass
|
||||
# arguments to home.nix
|
||||
}
|
||||
];
|
||||
};
|
||||
VM = nixpkgs.lib.nixosSystem {
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./modules
|
||||
];
|
||||
|
||||
programs.plasma = {
|
||||
kwin.virtualDesktops.number = 6;
|
||||
kwin.virtualDesktops.rows = 2;
|
||||
|
||||
shortcuts.kwin = {
|
||||
"Switch to Desktop 1" = "Meta+F1";
|
||||
"Switch to Desktop 2" = "Meta+F2";
|
||||
"Switch to Desktop 3" = "Meta+F3";
|
||||
"Switch to Desktop 4" = "Meta+Z";
|
||||
"Switch to Desktop 5" = "Meta+X";
|
||||
"Switch to Desktop 6" = "Meta+C";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./modules
|
||||
];
|
||||
|
||||
programs.plasma.kwin.virtualDesktops.number = 2;
|
||||
}
|
||||
247
home/default.nix
Normal file
247
home/default.nix
Normal file
@@ -0,0 +1,247 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
username = "cazzzer";
|
||||
in
|
||||
{
|
||||
# Home Manager needs a bit of information about you and the paths it should
|
||||
# manage.
|
||||
home.username = username;
|
||||
home.homeDirectory = "/home/${username}";
|
||||
|
||||
# Let Home Manager install and manage itself.
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
home.sessionVariables = {
|
||||
EDITOR = "micro";
|
||||
SHELL = "fish";
|
||||
};
|
||||
|
||||
# TODO: remove (replace by bitwarden-desktop)
|
||||
services.gnome-keyring = {
|
||||
enable = true;
|
||||
components = [ "pkcs11" "ssh" ];
|
||||
};
|
||||
|
||||
services.darkman = {
|
||||
enable = true;
|
||||
settings = {
|
||||
lat = 37.3387;
|
||||
lng = -121.8853;
|
||||
};
|
||||
lightModeScripts = {
|
||||
plasma-color = "plasma-apply-colorscheme BreezeLight";
|
||||
};
|
||||
darkModeScripts = {
|
||||
plasma-color = "plasma-apply-colorscheme BreezeDark";
|
||||
};
|
||||
};
|
||||
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
shellInit = "set fish_greeting";
|
||||
shellAliases = {
|
||||
# Replace ls with exa
|
||||
ls = "exa -al --color=always --group-directories-first --icons"; # preferred listing
|
||||
la = "exa -a --color=always --group-directories-first --icons"; # all files and dirs
|
||||
ll = "exa -l --color=always --group-directories-first --icons"; # long format
|
||||
lt = "exa -aT --color=always --group-directories-first --icons"; # tree listing
|
||||
"l." = "exa -a | rg '^\.'"; # show only dotfiles
|
||||
|
||||
# Replace cat with bat
|
||||
cat = "bat";
|
||||
};
|
||||
# alias for nix shell with flake packages
|
||||
functions.add.body = ''
|
||||
set -x packages 'nixpkgs#'$argv
|
||||
nix shell $packages
|
||||
'';
|
||||
interactiveShellInit = ''
|
||||
fastfetch
|
||||
'';
|
||||
};
|
||||
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
settings = {
|
||||
format = lib.concatStrings [
|
||||
"$all"
|
||||
"$time"
|
||||
"$cmd_duration"
|
||||
"$line_break"
|
||||
"$jobs"
|
||||
"$status"
|
||||
"$character"
|
||||
];
|
||||
username = {
|
||||
format = " [╭─$user]($style)@";
|
||||
style_user = "bold red";
|
||||
style_root = "bold red";
|
||||
show_always = true;
|
||||
};
|
||||
hostname = {
|
||||
format = "[$hostname]($style) in ";
|
||||
style = "bold dimmed red";
|
||||
ssh_only = false;
|
||||
};
|
||||
directory = {
|
||||
style = "purple";
|
||||
truncation_length = 0;
|
||||
truncate_to_repo = true;
|
||||
truncation_symbol = "repo: ";
|
||||
};
|
||||
git_status = {
|
||||
style = "white";
|
||||
ahead = "⇡\${count}";
|
||||
diverged = "⇕⇡\${ahead_count}⇣\${behind_count}";
|
||||
behind = "⇣\${count}";
|
||||
deleted = "x";
|
||||
};
|
||||
cmd_duration = {
|
||||
min_time = 1000;
|
||||
format = "took [$duration]($style) ";
|
||||
};
|
||||
time = {
|
||||
format = " 🕙 $time($style) ";
|
||||
time_format = "%T";
|
||||
style = "bright-white";
|
||||
disabled = false;
|
||||
};
|
||||
character = {
|
||||
success_symbol = " [╰─λ](bold red)";
|
||||
error_symbol = " [×](bold red)";
|
||||
};
|
||||
status = {
|
||||
symbol = "🔴";
|
||||
format = "[\\[$symbol$status_common_meaning$status_signal_name$status_maybe_int\\]]($style)";
|
||||
map_symbol = true;
|
||||
disabled = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.plasma = {
|
||||
enable = true;
|
||||
overrideConfig = true;
|
||||
# TODO: figure out how to enable tela-circle icon theme if installed in systemPackages
|
||||
# workspace.iconTheme = if builtins.elem pkgs.tela-circle-icon-theme config.environment.systemPackages then "Tela-circle" else null;
|
||||
workspace.iconTheme = "Tela-circle";
|
||||
fonts = let
|
||||
defaultFont = {
|
||||
family = "Noto Sans";
|
||||
pointSize = 14;
|
||||
};
|
||||
in {
|
||||
general = defaultFont;
|
||||
fixedWidth = defaultFont // { family = "Hack"; };
|
||||
small = defaultFont // { pointSize = defaultFont.pointSize - 2; };
|
||||
toolbar = defaultFont;
|
||||
menu = defaultFont;
|
||||
windowTitle = defaultFont;
|
||||
};
|
||||
input.keyboard.layouts = [
|
||||
{ layout = "us"; displayName = "us"; }
|
||||
{ layout = "minimak-4"; displayName = "us4"; }
|
||||
{ layout = "ru"; displayName = "ru"; }
|
||||
];
|
||||
kwin.virtualDesktops.number = 2;
|
||||
session.sessionRestore.restoreOpenApplicationsOnLogin = "startWithEmptySession";
|
||||
shortcuts = {
|
||||
# kmix.mic_mute = "ScrollLock";
|
||||
kmix.mic_mute = ["Microphone Mute" "ScrollLock" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"];
|
||||
plasmashell.show-barcode = "Meta+M";
|
||||
kwin."Window Maximize" = [ "Meta+F" "Meta+PgUp,Maximize Window" ];
|
||||
"KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Space";
|
||||
};
|
||||
hotkeys.commands."launch-konsole" = {
|
||||
name = "Launch Konsole";
|
||||
key = "Meta+Alt+C";
|
||||
command = "konsole";
|
||||
};
|
||||
configFile = {
|
||||
kdeglobals.KDE.AnimationDurationFactor = 0.5;
|
||||
kdeglobals.General.accentColorFromWallpaper = true;
|
||||
kwinrc.Wayland.InputMethod = {
|
||||
value = "org.fcitx.Fcitx5.desktop";
|
||||
shellExpand = true;
|
||||
};
|
||||
dolphinrc.General.ShowFullPath = true;
|
||||
dolphinrc.DetailsMode.PreviewSize.persistent = true;
|
||||
kactivitymanagerdrc = {
|
||||
activities."809dc779-bf5b-49e6-8e3f-cbe283cb05b6" = "Default";
|
||||
activities."b34a506d-ac4f-4797-8c08-6ef45bc49341" = "Fun";
|
||||
activities-icons."809dc779-bf5b-49e6-8e3f-cbe283cb05b6" = "keyboard";
|
||||
activities-icons."b34a506d-ac4f-4797-8c08-6ef45bc49341" = "preferences-desktop-gaming";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
xdg.configFile = {
|
||||
"fcitx5/conf/wayland.conf".text = "Allow Overriding System XKB Settings=False";
|
||||
};
|
||||
|
||||
# This value determines the Home Manager release that your configuration is
|
||||
# compatible with. This helps avoid breakage when a new Home Manager release
|
||||
# introduces backwards incompatible changes.
|
||||
#
|
||||
# You should not change this value, even if you update Home Manager. If you do
|
||||
# want to update the value, then make sure to first check the Home Manager
|
||||
# release notes.
|
||||
home.stateVersion = "24.11"; # Please read the comment before changing.
|
||||
|
||||
# The home.packages option allows you to install Nix packages into your
|
||||
# environment.
|
||||
# home.packages = [
|
||||
# # Adds the 'hello' command to your environment. It prints a friendly
|
||||
# # "Hello, world!" when run.
|
||||
# pkgs.hello
|
||||
|
||||
# # It is sometimes useful to fine-tune packages, for example, by applying
|
||||
# # overrides. You can do that directly here, just don't forget the
|
||||
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
|
||||
# # fonts?
|
||||
# (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
|
||||
|
||||
# # You can also create simple shell scripts directly inside your
|
||||
# # configuration. For example, this adds a command 'my-hello' to your
|
||||
# # environment:
|
||||
# (pkgs.writeShellScriptBin "my-hello" ''
|
||||
# echo "Hello, ${config.home.username}!"
|
||||
# '')
|
||||
# ];
|
||||
|
||||
# Home Manager is pretty good at managing dotfiles. The primary way to manage
|
||||
# plain files is through 'home.file'.
|
||||
# home.file = {
|
||||
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
|
||||
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
|
||||
# # symlink to the Nix store copy.
|
||||
# ".screenrc".source = dotfiles/screenrc;
|
||||
|
||||
# # You can also set the file content immediately.
|
||||
# ".gradle/gradle.properties".text = ''
|
||||
# org.gradle.console=verbose
|
||||
# org.gradle.daemon.idletimeout=3600000
|
||||
# '';
|
||||
# };
|
||||
|
||||
# Home Manager can also manage your environment variables through
|
||||
# 'home.sessionVariables'. These will be explicitly sourced when using a
|
||||
# shell provided by Home Manager. If you don't want to manage your shell
|
||||
# through Home Manager then you have to manually source 'hm-session-vars.sh'
|
||||
# located at either
|
||||
#
|
||||
# ~/.nix-profile/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
# or
|
||||
#
|
||||
# ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
# or
|
||||
#
|
||||
# /etc/profiles/per-user/cazzzer/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
# home.sessionVariables = {
|
||||
# EDITOR = "emacs";
|
||||
# };
|
||||
}
|
||||
@@ -1,83 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
username = "cazzzer";
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./fish.nix
|
||||
./starship.nix
|
||||
./plasma.nix
|
||||
];
|
||||
|
||||
# Home Manager needs a bit of information about you and the paths it should
|
||||
# manage.
|
||||
home.username = username;
|
||||
home.homeDirectory = "/home/${username}";
|
||||
|
||||
# Let Home Manager install and manage itself.
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
home.sessionVariables = {
|
||||
EDITOR = "micro";
|
||||
SHELL = "fish";
|
||||
};
|
||||
|
||||
services.darkman = {
|
||||
enable = true;
|
||||
settings = {
|
||||
lat = 37.3387;
|
||||
lng = -121.8853;
|
||||
};
|
||||
lightModeScripts = {
|
||||
plasma-color = "plasma-apply-colorscheme BreezeLight";
|
||||
};
|
||||
darkModeScripts = {
|
||||
plasma-color = "plasma-apply-colorscheme BreezeDark";
|
||||
};
|
||||
};
|
||||
|
||||
# This value determines the Home Manager release that your configuration is
|
||||
# compatible with. This helps avoid breakage when a new Home Manager release
|
||||
# introduces backwards incompatible changes.
|
||||
#
|
||||
# You should not change this value, even if you update Home Manager. If you do
|
||||
# want to update the value, then make sure to first check the Home Manager
|
||||
# release notes.
|
||||
home.stateVersion = "24.11"; # Please read the comment before changing.
|
||||
|
||||
# The home.packages option allows you to install Nix packages into your
|
||||
# environment.
|
||||
# home.packages = [
|
||||
# # Adds the 'hello' command to your environment. It prints a friendly
|
||||
# # "Hello, world!" when run.
|
||||
# pkgs.hello
|
||||
|
||||
# # It is sometimes useful to fine-tune packages, for example, by applying
|
||||
# # overrides. You can do that directly here, just don't forget the
|
||||
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
|
||||
# # fonts?
|
||||
# (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
|
||||
|
||||
# # You can also create simple shell scripts directly inside your
|
||||
# # configuration. For example, this adds a command 'my-hello' to your
|
||||
# # environment:
|
||||
# (pkgs.writeShellScriptBin "my-hello" ''
|
||||
# echo "Hello, ${config.home.username}!"
|
||||
# '')
|
||||
# ];
|
||||
|
||||
# Home Manager is pretty good at managing dotfiles. The primary way to manage
|
||||
# plain files is through 'home.file'.
|
||||
# home.file = {
|
||||
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
|
||||
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
|
||||
# # symlink to the Nix store copy.
|
||||
# ".screenrc".source = dotfiles/screenrc;
|
||||
|
||||
# # You can also set the file content immediately.
|
||||
# ".gradle/gradle.properties".text = ''
|
||||
# org.gradle.console=verbose
|
||||
# org.gradle.daemon.idletimeout=3600000
|
||||
# '';
|
||||
# };
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
shellInit = "set fish_greeting";
|
||||
shellAliases = {
|
||||
# Replace ls with exa
|
||||
ls = "exa -al --color=always --group-directories-first --icons"; # preferred listing
|
||||
la = "exa -a --color=always --group-directories-first --icons"; # all files and dirs
|
||||
ll = "exa -l --color=always --group-directories-first --icons"; # long format
|
||||
lt = "exa -aT --color=always --group-directories-first --icons"; # tree listing
|
||||
"l." = "exa -a | rg '^\.'"; # show only dotfiles
|
||||
|
||||
# Replace cat with bat
|
||||
cat = "bat";
|
||||
};
|
||||
# alias for nix shell with flake packages
|
||||
functions.add.body = ''
|
||||
set -x packages 'nixpkgs#'$argv
|
||||
nix shell $packages
|
||||
'';
|
||||
interactiveShellInit = ''
|
||||
fastfetch
|
||||
'';
|
||||
};
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
{ config, lib, pkgs, osConfig, ... }:
|
||||
|
||||
{
|
||||
programs.plasma = {
|
||||
enable = true;
|
||||
overrideConfig = true;
|
||||
resetFilesExclude = [
|
||||
"plasma-org.kde.plasma.desktop-appletsrc"
|
||||
];
|
||||
# Use tela circle icon theme if installed in system packages
|
||||
workspace.iconTheme = if builtins.elem pkgs.tela-circle-icon-theme osConfig.environment.systemPackages then "Tela-circle" else null;
|
||||
fonts = let
|
||||
defaultFont = {
|
||||
family = "Noto Sans";
|
||||
pointSize = 14;
|
||||
};
|
||||
in {
|
||||
general = defaultFont;
|
||||
fixedWidth = defaultFont // { family = "Hack"; };
|
||||
small = defaultFont // { pointSize = defaultFont.pointSize - 2; };
|
||||
toolbar = defaultFont;
|
||||
menu = defaultFont;
|
||||
windowTitle = defaultFont;
|
||||
};
|
||||
input.keyboard.layouts = [
|
||||
{ layout = "us"; displayName = "us"; }
|
||||
{ layout = "minimak-4"; displayName = "us4"; }
|
||||
{ layout = "ru"; displayName = "ru"; }
|
||||
];
|
||||
session.sessionRestore.restoreOpenApplicationsOnLogin = "startWithEmptySession";
|
||||
shortcuts = {
|
||||
# kmix.mic_mute = "ScrollLock";
|
||||
kmix.mic_mute = ["Microphone Mute" "ScrollLock" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"];
|
||||
plasmashell.show-barcode = "Meta+M";
|
||||
kwin."Window Maximize" = [ "Meta+F" "Meta+PgUp,Maximize Window" ];
|
||||
"KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Space";
|
||||
};
|
||||
hotkeys.commands."launch-konsole" = {
|
||||
name = "Launch Konsole";
|
||||
key = "Meta+Alt+C";
|
||||
command = "konsole";
|
||||
};
|
||||
configFile = {
|
||||
kdeglobals.KDE.AnimationDurationFactor = 0.5;
|
||||
kdeglobals.General.accentColorFromWallpaper = true;
|
||||
kwinrc.Wayland.InputMethod = {
|
||||
value = "org.fcitx.Fcitx5.desktop";
|
||||
shellExpand = true;
|
||||
};
|
||||
dolphinrc.General.ShowFullPath = true;
|
||||
dolphinrc.DetailsMode.PreviewSize.persistent = true;
|
||||
kactivitymanagerdrc = {
|
||||
activities."809dc779-bf5b-49e6-8e3f-cbe283cb05b6" = "Default";
|
||||
activities."b34a506d-ac4f-4797-8c08-6ef45bc49341" = "Fun";
|
||||
activities-icons."809dc779-bf5b-49e6-8e3f-cbe283cb05b6" = "keyboard";
|
||||
activities-icons."b34a506d-ac4f-4797-8c08-6ef45bc49341" = "preferences-desktop-gaming";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
xdg.configFile = {
|
||||
"fcitx5/conf/wayland.conf".text = "Allow Overriding System XKB Settings=False";
|
||||
};
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
settings = {
|
||||
format = lib.concatStrings [
|
||||
"$all"
|
||||
"$time"
|
||||
"$cmd_duration"
|
||||
"$line_break"
|
||||
"$jobs"
|
||||
"$status"
|
||||
"$character"
|
||||
];
|
||||
username = {
|
||||
format = " [╭─$user]($style)@";
|
||||
style_user = "bold red";
|
||||
style_root = "bold red";
|
||||
show_always = true;
|
||||
};
|
||||
hostname = {
|
||||
format = "[$hostname]($style) in ";
|
||||
style = "bold dimmed red";
|
||||
ssh_only = false;
|
||||
};
|
||||
directory = {
|
||||
style = "purple";
|
||||
truncation_length = 0;
|
||||
truncate_to_repo = true;
|
||||
truncation_symbol = "repo: ";
|
||||
};
|
||||
git_status = {
|
||||
style = "white";
|
||||
ahead = "⇡\${count}";
|
||||
diverged = "⇕⇡\${ahead_count}⇣\${behind_count}";
|
||||
behind = "⇣\${count}";
|
||||
deleted = "x";
|
||||
};
|
||||
cmd_duration = {
|
||||
min_time = 1000;
|
||||
format = "took [$duration]($style) ";
|
||||
};
|
||||
time = {
|
||||
format = " 🕙 $time($style) ";
|
||||
time_format = "%T";
|
||||
style = "bright-white";
|
||||
disabled = false;
|
||||
};
|
||||
character = {
|
||||
success_symbol = " [╰─λ](bold red)";
|
||||
error_symbol = " [×](bold red)";
|
||||
};
|
||||
status = {
|
||||
symbol = "🔴";
|
||||
format = "[\\[$symbol$status_common_meaning$status_signal_name$status_maybe_int\\]]($style)";
|
||||
map_symbol = true;
|
||||
disabled = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -10,9 +10,13 @@
|
||||
./hardware-configuration.nix
|
||||
# <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
|
||||
];
|
||||
opts.kb-input.enable = true;
|
||||
mods.kb-input.enable = true;
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
# boot.plymouth.enable = true;
|
||||
# boot.plymouth.theme = "breeze";
|
||||
boot.kernelParams = [
|
||||
"amd_iommu=on"
|
||||
"iommu=pt"
|
||||
@@ -26,13 +30,218 @@
|
||||
options kvm ignore_msrs=1
|
||||
'';
|
||||
|
||||
boot.loader.timeout = 3;
|
||||
boot.loader.systemd-boot.configurationLimit = 5;
|
||||
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_14;
|
||||
|
||||
# https://nixos.wiki/wiki/Accelerated_Video_Playback
|
||||
hardware.graphics.extraPackages = with pkgs; [
|
||||
intel-media-driver # LIBVA_DRIVER_NAME=iHD
|
||||
];
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
intel-media-driver # LIBVA_DRIVER_NAME=iHD
|
||||
];
|
||||
};
|
||||
|
||||
environment.etc.hosts.mode = "0644";
|
||||
|
||||
networking.hostName = "Yura-PC"; # Define your hostname.
|
||||
networking.hostId = "110a2814"; # Required for ZFS.
|
||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
|
||||
# Configure network proxy if necessary
|
||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
||||
|
||||
# Enable networking
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
# You can disable this if you're only using the Wayland session.
|
||||
services.xserver.enable = false;
|
||||
|
||||
# Enable the KDE Plasma Desktop Environment.
|
||||
services.displayManager.sddm.enable = true;
|
||||
services.displayManager.sddm.wayland.enable = true;
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
|
||||
# Enable CUPS to print documents.
|
||||
services.printing.enable = true;
|
||||
|
||||
# Enable sound with pipewire.
|
||||
services.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.qemuGuest.enable = true;
|
||||
# services.spice-vdagentd.enable = true;
|
||||
services.openssh.enable = true;
|
||||
services.flatpak.enable = true;
|
||||
# services.geoclue2.enable = true;
|
||||
# location.provider = "geoclue2";
|
||||
# services.gnome.gnome-keyring.enable = true;
|
||||
security.pam.services.sddm.enableGnomeKeyring = true;
|
||||
# security.pam.services.sddm.gnupg.enable = true;
|
||||
|
||||
|
||||
# Enable touchpad support (enabled default in most desktopManager).
|
||||
# services.xserver.libinput.enable = true;
|
||||
|
||||
hardware.bluetooth.enable = true;
|
||||
hardware.bluetooth.powerOnBoot = false;
|
||||
# Install firefox.
|
||||
# programs.firefox.enable = true;
|
||||
programs.kdeconnect.enable = true;
|
||||
programs.fish.enable = true;
|
||||
programs.git.enable = true;
|
||||
programs.git.lfs.enable = true;
|
||||
# https://nixos.wiki/wiki/Git
|
||||
programs.git.package = pkgs.git.override { withLibsecret = true; };
|
||||
programs.lazygit.enable = true;
|
||||
programs.neovim.enable = true;
|
||||
programs.gnupg.agent.enable = true;
|
||||
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
|
||||
# programs.starship.enable = true;
|
||||
programs.wireshark.enable = true;
|
||||
programs.wireshark.package = pkgs.wireshark; # wireshark-cli by default
|
||||
programs.bat.enable = true;
|
||||
programs.htop.enable = true;
|
||||
|
||||
# https://nixos.wiki/wiki/Docker
|
||||
virtualisation.docker.enable = true;
|
||||
virtualisation.docker.enableOnBoot = false;
|
||||
virtualisation.docker.package = pkgs.docker_27;
|
||||
|
||||
# https://discourse.nixos.org/t/firefox-does-not-use-kde-window-decorations-and-cursor/32132/3
|
||||
# programs.dconf.enable = true;
|
||||
# programs.firefox = {
|
||||
# enable = true;
|
||||
# preferences = {
|
||||
# "widget.use-xdg-desktop-portal.file-picker" = 1;
|
||||
# "widget.use-xdg-desktop-portal.mime-handler" = 1;
|
||||
# };
|
||||
# };
|
||||
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
|
||||
# https://github.com/flatpak/flatpak/issues/2861
|
||||
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||
|
||||
programs.nix-ld.enable = true;
|
||||
programs.nix-ld.libraries = with pkgs; [
|
||||
# Add any missing dynamic libraries for unpackaged
|
||||
# programs here, NOT in environment.systemPackages
|
||||
|
||||
# For JetBrains stuff
|
||||
# https://github.com/NixOS/nixpkgs/issues/240444
|
||||
];
|
||||
|
||||
# attempt to fix flatpak firefox cjk fonts
|
||||
# fonts.fontconfig.defaultFonts.serif = [
|
||||
# "Noto Serif"
|
||||
# "DejaVu Serif"
|
||||
# ];
|
||||
# fonts.fontconfig.defaultFonts.sansSerif = [
|
||||
# "Noto Sans"
|
||||
# "DejaVu Sans"
|
||||
# ];
|
||||
|
||||
workarounds.flatpak.enable = true;
|
||||
fonts.packages = with pkgs; [
|
||||
fantasque-sans-mono
|
||||
nerd-fonts.fantasque-sans-mono
|
||||
noto-fonts
|
||||
noto-fonts-emoji
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-cjk-serif
|
||||
jetbrains-mono
|
||||
];
|
||||
# fonts.fontDir.enable = true;
|
||||
# fonts.fontconfig.allowBitmaps = false;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
dust
|
||||
eza
|
||||
fastfetch
|
||||
fd
|
||||
helix
|
||||
micro
|
||||
openssl
|
||||
ripgrep
|
||||
starship
|
||||
tealdeer
|
||||
transcrypt
|
||||
] ++ [
|
||||
efibootmgr
|
||||
ffmpeg
|
||||
file
|
||||
fq
|
||||
gnumake
|
||||
ijq
|
||||
jq
|
||||
ldns
|
||||
mediainfo
|
||||
rbw
|
||||
restic
|
||||
resticprofile
|
||||
rclone
|
||||
ripgrep-all
|
||||
rustscan
|
||||
whois
|
||||
yt-dlp
|
||||
] ++ [
|
||||
bitwarden-desktop
|
||||
darkman
|
||||
host-spawn # for flatpaks
|
||||
kdePackages.filelight
|
||||
kdePackages.flatpak-kcm
|
||||
kdePackages.kate
|
||||
kdePackages.yakuake
|
||||
# TODO: remove (replace by bitwarden-desktop)
|
||||
gcr
|
||||
gnome-keyring # config for this and some others
|
||||
mpv
|
||||
nextcloud-client
|
||||
lxqt.pavucontrol-qt
|
||||
pinentry
|
||||
tela-circle-icon-theme
|
||||
virt-viewer
|
||||
waypipe
|
||||
] ++ [
|
||||
# jetbrains.rust-rover
|
||||
# jetbrains.goland
|
||||
jetbrains.clion
|
||||
jetbrains.idea-ultimate
|
||||
jetbrains.pycharm-professional
|
||||
jetbrains.webstorm
|
||||
android-studio
|
||||
rustup
|
||||
zed-editor
|
||||
];
|
||||
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
# started in user sessions.
|
||||
# programs.mtr.enable = true;
|
||||
# programs.gnupg.agent = {
|
||||
# enable = true;
|
||||
# enableSSHSupport = true;
|
||||
# };
|
||||
|
||||
# List services that you want to enable:
|
||||
|
||||
# Enable the OpenSSH daemon.
|
||||
# services.openssh.enable = true;
|
||||
|
||||
# Open ports in the firewall.
|
||||
# networking.nftables.enable = true;
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
# Bootloader.
|
||||
boot.kernelParams = [
|
||||
"sysrq_always_enabled=1"
|
||||
];
|
||||
|
||||
networking.hostName = "Yura-TPX13"; # Define your hostname.
|
||||
networking.hostId = "8425e349"; # Required for ZFS.
|
||||
|
||||
services.fprintd.enable = true;
|
||||
|
||||
# Install firefox.
|
||||
programs.firefox.enable = true;
|
||||
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
# started in user sessions.
|
||||
# programs.mtr.enable = true;
|
||||
# programs.gnupg.agent = {
|
||||
# enable = true;
|
||||
# enableSSHSupport = true;
|
||||
# };
|
||||
|
||||
# Open ports in the firewall.
|
||||
# networking.nftables.enable = true;
|
||||
# networking.firewall.allowedTCPPorts = [ ];
|
||||
# networking.firewall.allowedUDPPorts = [ ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
|
||||
# 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. It‘s perfectly fine and recommended to leave
|
||||
# this value at the release version of the first install of this system.
|
||||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "24.11"; # Did you read the comment?
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "zroot/e/ROOT/nixos/default";
|
||||
fsType = "zfs";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/C6A4-8931";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp2s0f0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
@@ -1,167 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
opts.kb-input.enable = true;
|
||||
|
||||
boot.kernelParams = [
|
||||
"sysrq_always_enabled=1"
|
||||
];
|
||||
|
||||
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_14;
|
||||
boot.loader = {
|
||||
efi.canTouchEfiVariables = true;
|
||||
timeout = 3;
|
||||
systemd-boot = {
|
||||
enable = true;
|
||||
configurationLimit = 5;
|
||||
};
|
||||
};
|
||||
|
||||
# https://nixos.wiki/wiki/Accelerated_Video_Playback
|
||||
hardware.graphics.enable = true;
|
||||
|
||||
environment.etc.hosts.mode = "0644";
|
||||
|
||||
# Enable networking
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
# You can disable this if you're only using the Wayland session.
|
||||
services.xserver.enable = false;
|
||||
|
||||
# Enable the KDE Plasma Desktop Environment.
|
||||
services.displayManager.sddm.enable = true;
|
||||
services.displayManager.sddm.wayland.enable = true;
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
|
||||
# Enable CUPS to print documents.
|
||||
services.printing.enable = true;
|
||||
|
||||
# Enable sound with pipewire.
|
||||
services.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;
|
||||
};
|
||||
|
||||
services.flatpak.enable = true;
|
||||
|
||||
hardware.bluetooth.enable = true;
|
||||
hardware.bluetooth.powerOnBoot = false;
|
||||
programs.kdeconnect.enable = true;
|
||||
programs.fish.enable = true;
|
||||
programs.git.enable = true;
|
||||
programs.git.lfs.enable = true;
|
||||
# https://nixos.wiki/wiki/Git
|
||||
programs.git.package = pkgs.git.override { withLibsecret = true; };
|
||||
programs.lazygit.enable = true;
|
||||
programs.neovim.enable = true;
|
||||
programs.wireshark.enable = true;
|
||||
programs.wireshark.package = pkgs.wireshark; # wireshark-cli by default
|
||||
programs.bat.enable = true;
|
||||
programs.htop.enable = true;
|
||||
|
||||
# https://nixos.wiki/wiki/Docker
|
||||
virtualisation.docker.enable = true;
|
||||
virtualisation.docker.enableOnBoot = false;
|
||||
virtualisation.docker.package = pkgs.docker_28;
|
||||
|
||||
# https://github.com/flatpak/flatpak/issues/2861
|
||||
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||
|
||||
workarounds.flatpak.enable = true;
|
||||
fonts.packages = with pkgs; [
|
||||
fantasque-sans-mono
|
||||
nerd-fonts.fantasque-sans-mono
|
||||
noto-fonts
|
||||
noto-fonts-emoji
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-cjk-serif
|
||||
jetbrains-mono
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
dust
|
||||
eza
|
||||
fastfetch
|
||||
fd
|
||||
helix
|
||||
micro
|
||||
openssl
|
||||
ripgrep
|
||||
starship
|
||||
tealdeer
|
||||
transcrypt
|
||||
] ++ [
|
||||
efibootmgr
|
||||
ffmpeg
|
||||
file
|
||||
fq
|
||||
gnumake
|
||||
ijq
|
||||
jq
|
||||
ldns
|
||||
mediainfo
|
||||
rbw
|
||||
restic
|
||||
resticprofile
|
||||
rclone
|
||||
ripgrep-all
|
||||
rustscan
|
||||
whois
|
||||
wireguard-tools
|
||||
yt-dlp
|
||||
] ++ [
|
||||
bitwarden-desktop
|
||||
darkman
|
||||
host-spawn # for flatpaks
|
||||
kdePackages.filelight
|
||||
kdePackages.flatpak-kcm
|
||||
kdePackages.kate
|
||||
kdePackages.yakuake
|
||||
mpv
|
||||
nextcloud-client
|
||||
lxqt.pavucontrol-qt
|
||||
pinentry
|
||||
tela-circle-icon-theme
|
||||
virt-viewer
|
||||
waypipe
|
||||
] ++ [
|
||||
# jetbrains.rust-rover
|
||||
# jetbrains.goland
|
||||
jetbrains.clion
|
||||
jetbrains.idea-ultimate
|
||||
jetbrains.pycharm-professional
|
||||
jetbrains.webstorm
|
||||
android-studio
|
||||
rustup
|
||||
zed-editor
|
||||
] ++ [
|
||||
# Python
|
||||
python3
|
||||
poetry
|
||||
|
||||
# Haskell
|
||||
haskellPackages.ghc
|
||||
haskellPackages.stack
|
||||
|
||||
# Node
|
||||
nodejs_22
|
||||
pnpm
|
||||
bun
|
||||
|
||||
# Nix
|
||||
nil
|
||||
nixd
|
||||
nixfmt-rfc-style
|
||||
|
||||
# Gleam
|
||||
gleam
|
||||
beamMinimal26Packages.erlang
|
||||
];
|
||||
}
|
||||
@@ -28,8 +28,4 @@
|
||||
formatted = builtins.concatStringsSep "\n" sortedUnique;
|
||||
in
|
||||
formatted;
|
||||
|
||||
services.openssh.enable = true;
|
||||
services.openssh.settings.PasswordAuthentication = false;
|
||||
services.openssh.settings.KbdInteractiveAuthentication = false;
|
||||
}
|
||||
|
||||
@@ -48,6 +48,9 @@ in
|
||||
# VM services
|
||||
services.qemuGuest.enable = true;
|
||||
services.spice-vdagentd.enable = true;
|
||||
services.openssh.enable = true;
|
||||
services.openssh.settings.PasswordAuthentication = false;
|
||||
services.openssh.settings.KbdInteractiveAuthentication = false;
|
||||
|
||||
security.sudo.wheelNeedsPassword = false;
|
||||
|
||||
@@ -78,7 +81,6 @@ in
|
||||
transcrypt
|
||||
waypipe
|
||||
whois
|
||||
wireguard-tools
|
||||
];
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
|
||||
@@ -13,7 +13,7 @@ let
|
||||
${ifs.lan30.name},
|
||||
${ifs.lan40.name},
|
||||
${ifs.lan50.name},
|
||||
${ifs.wg0.name},
|
||||
wg0,
|
||||
}
|
||||
define OPNSENSE_NET6 = ${vars.extra.opnsense.net6}
|
||||
define ZONE_LAN_EXTRA_NET6 = {
|
||||
@@ -87,7 +87,7 @@ in
|
||||
content = ''
|
||||
${nftIdentifiers}
|
||||
define ALLOWED_TCP_PORTS = { ssh }
|
||||
define ALLOWED_UDP_PORTS = { ${toString vars.ifs.wg0.listenPort} }
|
||||
define ALLOWED_UDP_PORTS = { 18596 }
|
||||
define ALLOWED_TCP_LAN_PORTS = { ssh, https }
|
||||
define ALLOWED_UDP_LAN_PORTS = { bootps, dhcpv6-server, domain, https }
|
||||
set port_forward_v6 {
|
||||
|
||||
@@ -83,7 +83,7 @@ in
|
||||
ia_pd 30/${ifs.lan30.net6} -
|
||||
ia_pd 40/${ifs.lan40.net6} -
|
||||
ia_pd 50/${ifs.lan50.net6} -
|
||||
ia_pd 100/${pdFromWan}9::/64 - # for vpn stuff
|
||||
# ia_pd 7 -
|
||||
# ia_pd 8 -
|
||||
|
||||
# the leases can be assigned to the interfaces,
|
||||
|
||||
5
hosts/router/secrets/wireguard/wg0-peer-AsusS513-psk.age
Normal file
5
hosts/router/secrets/wireguard/wg0-peer-AsusS513-psk.age
Normal file
@@ -0,0 +1,5 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 D2MY/A YAk0egMScFdPo0uAZzITtgQyPAifDcVUfb957Zhz9Ec
|
||||
pAEM+7sbPE8rHBhRV7mTmH1w4mbfKFopMWbwu/3KHCw
|
||||
--- ykshsqEqKvCCE2kWIPAJPA/DFW7mu6+0x4MQhHgi1yU
|
||||
'<27>zƀ{g<>id\{<7B>E<EFBFBD><45><EFBFBD>tp<74>U<>g2QC3g<33><08>JG<4A>V1<56>6<>WG_E&<26>v<EFBFBD><76>)<29>&<26><><EFBFBD>ޑN"<22><><EFBFBD>n<EFBFBD>_T͒<54>
|
||||
Binary file not shown.
@@ -1,5 +1,6 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 D2MY/A cRVo1AetNYKsb28kGpe6mVpoCyfNcRibeBYhJuXbbEY
|
||||
k8XL4XEv4FM6sfU/TOFTg4vlKm61409No/TpCEjTnSk
|
||||
--- mT9w1vnx2FrzWw+Zt1wV6UJ+mjHTizrUPVeaTisYQ74
|
||||
=<3D>q-So<><6F>pn<70><6E><EFBFBD><EFBFBD><EFBFBD>I<EFBFBD><49><EFBFBD>Z֠i<D6A0>'<27><><EFBFBD>"%M<><06><>C&
|
||||
-> ssh-ed25519 D2MY/A P88M0uj4ZphVo3WrRYDu+c7B0Dl7ncctbYkByYmU2wg
|
||||
DV3Gn6TQ6iByAlNt0gg8kSZ2r0Gie/wcznZx9M+CC2g
|
||||
--- KhwGM50BVql02Jq0do2uhXMfgWPPDfbodzDRmZ9n0O4
|
||||
r<EFBFBD><EFBFBD><EFBFBD>Զa<EFBFBD>yY/C<><43>J<EFBFBD>B<EFBFBD>X<EFBFBD>!<21>"F
|
||||
<EFBFBD>h<EFBFBD><EFBFBD><EFBFBD>(<28>L><3E>()<29><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>S;<3B>}}2ОO.<2E><13>hoqY<19>K"c<>E<EFBFBD><45>JM?-<2D>O
|
||||
@@ -1,5 +1,5 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 D2MY/A Xg7XTl/qJqVqvXsHNKcoICq74DeOlquN1CEn1PwxlVY
|
||||
FqmPdDgmuUrwZPLW56RhW8o1VXr5l2Xms6IVebpi7bA
|
||||
--- nLT/bC55EvoXK6f7DYbMhD3I8Z122bxeGVw1PCds2IM
|
||||
!<><7F><05>Dl<44><6C><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;<3B><>KXq8<71>4<EFBFBD><34><EFBFBD><EFBFBD>+b<><62>p_q4B<34><42>'8<>%<25>cI<63><49>D<EFBFBD>t<><0C><05>V~;v*<2A><>W<EFBFBD>-<2D>,[<5B>tݑ<74>
|
||||
-> ssh-ed25519 D2MY/A tvRtTGWnaB0zxqZRba4/XpzwPa61RrnHCk4tT8OfnGQ
|
||||
IX85Q5VKxQTl+MnhzwiuTnNMVkR9QrYo/1njrbZeBnQ
|
||||
--- dmlPIL2T+RFhbO2iLDRa4BxxYSSUQdedV3TK83ooFdA
|
||||
<18>gE 7<><37>0`d<>V(o<>W<EFBFBD><57><EFBFBD>S@<01>ۭ<EFBFBD><DBAD><EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD>Z<EFBFBD><5A>ЃT<D083><54><EFBFBD><EFBFBD><14>U<EFBFBD><55>+*<2A>\Q<><51>[<5B><><EFBFBD><EFBFBD>x<><78>29<32>i5<69>k
|
||||
@@ -5,11 +5,8 @@ let
|
||||
name_,
|
||||
domain_,
|
||||
p4_, # /24
|
||||
p4Size_ ? 24,
|
||||
p6_, # /64
|
||||
p6Size_ ? 64,
|
||||
ulaPrefix_, # /64
|
||||
ulaSize_ ? 64,
|
||||
token? 1,
|
||||
ip6Token_? "::${toString token}",
|
||||
ulaToken_? "::${toString token}",
|
||||
@@ -17,18 +14,18 @@ let
|
||||
name = name_;
|
||||
domain = domain_;
|
||||
p4 = p4_;
|
||||
p4Size = p4Size_;
|
||||
p4Size = 24;
|
||||
net4 = "${p4}.0/${toString p4Size}";
|
||||
addr4 = "${p4}.${toString token}";
|
||||
addr4Sized = "${addr4}/${toString p4Size}";
|
||||
p6 = p6_;
|
||||
p6Size = p6Size_;
|
||||
p6Size = 64;
|
||||
net6 = "${p6}::/${toString p6Size}";
|
||||
ip6Token = ip6Token_;
|
||||
addr6 = "${p6}${ip6Token}";
|
||||
addr6Sized = "${addr6}/${toString p6Size}";
|
||||
ulaPrefix = ulaPrefix_;
|
||||
ulaSize = ulaSize_;
|
||||
ulaSize = 64;
|
||||
ulaNet = "${ulaPrefix}::/${toString ulaSize}";
|
||||
ulaToken = ulaToken_;
|
||||
ulaAddr = "${ulaPrefix}${ulaToken}";
|
||||
@@ -100,17 +97,17 @@ rec {
|
||||
p6_ = "${pdFromWan}a"; # ::/64
|
||||
ulaPrefix_ = "${ulaPrefix}:0050"; # ::/64
|
||||
};
|
||||
wg0 = mkIfConfig {
|
||||
name_ = "wg0";
|
||||
domain_ = "wg0.${ldomain}";
|
||||
p4_ = "10.18.16"; # .0/24
|
||||
p6_ = "${pdFromWan}9:0:6"; # ::/96
|
||||
p6Size_ = 96;
|
||||
ulaPrefix_ = "${ulaPrefix}:0100:0:6"; # ::/96
|
||||
ulaSize_ = 96;
|
||||
} // {
|
||||
listenPort = 51944;
|
||||
};
|
||||
};
|
||||
|
||||
wg = {
|
||||
wg0 = rec {
|
||||
name = "wg0";
|
||||
p4 = "10.18.16"; # .0/24
|
||||
addr4 = "${p4}.1";
|
||||
addr4Sized = "${addr4}/24";
|
||||
p6 = "${pdFromWan}f::6"; # :0:0/96
|
||||
addr6 = "${p6}:0:1";
|
||||
addr6Sized = "${addr6}/96";
|
||||
};
|
||||
|
||||
extra = {
|
||||
|
||||
@@ -1,23 +1,24 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
vars = import ./vars.nix;
|
||||
wg0 = vars.ifs.wg0;
|
||||
|
||||
peerIps = ifObj: token: [
|
||||
"${ifObj.p4}.${toString token}/32"
|
||||
"${ifObj.p6}:${toString token}:0/112"
|
||||
"${ifObj.ulaPrefix}:${toString token}:0/112"
|
||||
];
|
||||
|
||||
mkWg0Peer = token: publicKey: {
|
||||
allowedIPs = peerIps wg0 token;
|
||||
inherit publicKey;
|
||||
pskEnabled = true;
|
||||
};
|
||||
wg0 = vars.wg.wg0;
|
||||
|
||||
wg0Peers = {
|
||||
"Yura-TPX13" = mkWg0Peer 100 "iFdsPYrpw7vsFYYJB4SOTa+wxxGVcmYp9CPxe0P9ewA=";
|
||||
"Yura-Pixel7Pro" = mkWg0Peer 101 "GPdXxjvnhsyufd2QX/qsR02dinUtPnnxrE66oGt/KyA=";
|
||||
"Yura-TPX13" = {
|
||||
allowedIPs = [ "${wg0.p4}.3/32" "${wg0.p6}:3:0/112" ];
|
||||
publicKey = "iJa5JmJbMHNlbEluNwoB2Q8LyrPAfb7S/mluanMcI08=";
|
||||
pskEnabled = true;
|
||||
};
|
||||
"Yura-Pixel7Pro" = {
|
||||
allowedIPs = [ "${wg0.p4}.4/32" "${wg0.p6}:4:0/112" ];
|
||||
publicKey = "UjZlsukmAsX60Z5FnZwKCSu141Gjj74+hBVT3TRhwT4=";
|
||||
pskEnabled = true;
|
||||
};
|
||||
"AsusS513" = {
|
||||
allowedIPs = [ "${wg0.p4}.100/32" ];
|
||||
publicKey = "XozJ7dHdJfkLORkCVxaB1VmvHEOAA285kRZcmzfPl38=";
|
||||
pskEnabled = false;
|
||||
};
|
||||
};
|
||||
peerSecretName = name: "wg0-peer-${name}-psk";
|
||||
secrets = config.secrix.services.systemd-networkd.secrets;
|
||||
@@ -30,26 +31,20 @@ in
|
||||
value.encrypted.file = ./secrets/wireguard/${peerSecretName name}.age;
|
||||
};
|
||||
peerSecrets = lib.attrsets.mapAttrs' mapPeer pskPeers;
|
||||
|
||||
allSecrets = {
|
||||
wg0-private-key.encrypted.file = ./secrets/wireguard/wg0-private-key.age;
|
||||
} // peerSecrets;
|
||||
|
||||
setSecretOwnership = name: value: value // {
|
||||
decrypted.user = "systemd-network";
|
||||
decrypted.group = "systemd-network";
|
||||
};
|
||||
in lib.attrsets.mapAttrs setSecretOwnership allSecrets;
|
||||
in
|
||||
{
|
||||
wg0-private-key.encrypted.file = ./secrets/wireguard/wg0-private-key.age;
|
||||
} // peerSecrets;
|
||||
|
||||
systemd.network.netdevs = {
|
||||
"10-wg0" = {
|
||||
netdevConfig = {
|
||||
Kind = "wireguard";
|
||||
Name = wg0.name;
|
||||
Name = "wg0";
|
||||
};
|
||||
wireguardConfig = {
|
||||
PrivateKeyFile = secrets.wg0-private-key.decrypted.path;
|
||||
ListenPort = wg0.listenPort;
|
||||
ListenPort = 18596;
|
||||
};
|
||||
wireguardPeers = map (peer: {
|
||||
AllowedIPs = lib.strings.concatStringsSep "," peer.value.allowedIPs;
|
||||
@@ -65,7 +60,7 @@ in
|
||||
networkConfig = {
|
||||
IPv4Forwarding = true;
|
||||
IPv6SendRA = false;
|
||||
Address = [ wg0.addr4Sized wg0.addr6Sized wg0.ulaAddrSized ];
|
||||
Address = [ wg0.addr4Sized wg0.addr6Sized ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
[ # Include the results of the hardware scan.
|
||||
# ./hardware-configuration.nix
|
||||
];
|
||||
opts.kb-input.enable = false;
|
||||
mods.kb-input.enable = false;
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
@@ -51,6 +51,9 @@
|
||||
# services.cloud-init.network.enable = false;
|
||||
services.qemuGuest.enable = true;
|
||||
services.spice-vdagentd.enable = true;
|
||||
services.openssh.enable = true;
|
||||
services.openssh.settings.PasswordAuthentication = false;
|
||||
services.openssh.settings.KbdInteractiveAuthentication = false;
|
||||
|
||||
security.sudo.wheelNeedsPassword = false;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ ... }: {
|
||||
imports = [
|
||||
./opts
|
||||
./mods
|
||||
./workarounds
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ ... }: {
|
||||
imports = [
|
||||
./kb-input
|
||||
./kb-input.nix
|
||||
];
|
||||
}
|
||||
@@ -4,10 +4,10 @@
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.opts.kb-input;
|
||||
cfg = config.mods.kb-input;
|
||||
in {
|
||||
options = {
|
||||
opts.kb-input = {
|
||||
mods.kb-input = {
|
||||
enable = lib.mkEnableOption "input method and custom keyboard layout";
|
||||
enableMinimak = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
@@ -14,5 +14,29 @@
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE02AhJIZtrtZ+5sZhna39LUUCEojQzmz2BDWguT9ZHG yuri@tati.sh"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHczlipzGWv8c6oYwt2/9ykes5ElfneywDXBTOYbfSfn Pixel7Pro"
|
||||
];
|
||||
# TODO: think of a better way to do this
|
||||
packages = with pkgs; lib.optionals (config.networking.hostName == "Yura-PC") [
|
||||
# Python
|
||||
python3
|
||||
poetry
|
||||
|
||||
# Haskell
|
||||
haskellPackages.ghc
|
||||
haskellPackages.stack
|
||||
|
||||
# Node
|
||||
nodejs_22
|
||||
pnpm
|
||||
bun
|
||||
|
||||
# Nix
|
||||
nil
|
||||
nixd
|
||||
nixfmt-rfc-style
|
||||
|
||||
# Gleam
|
||||
gleam
|
||||
beamMinimal26Packages.erlang
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user