refactor: move max into dentritic pattern
This commit is contained in:
@@ -1,7 +0,0 @@
|
||||
{ ... }: {
|
||||
time.timeZone = "America/New_York";
|
||||
|
||||
# security.sudo.wheelNeedsPassword = false;
|
||||
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
}
|
||||
@@ -1,68 +0,0 @@
|
||||
{ lib, ... }: {
|
||||
|
||||
programs.chromium = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
programs.firefox = let
|
||||
lock-false = {
|
||||
Value = false;
|
||||
Status = "locked";
|
||||
};
|
||||
lock-true = {
|
||||
Value = true;
|
||||
Status = "locked";
|
||||
};
|
||||
lock-empty-string = {
|
||||
Value = "";
|
||||
Status = "locked";
|
||||
};
|
||||
in {
|
||||
enable = true;
|
||||
policies = {
|
||||
DisableTelemetry = true;
|
||||
DisableFirefoxStudies = true;
|
||||
DontCheckDefaultBrowser = true;
|
||||
DisablePocket = true;
|
||||
DisableAccounts = true;
|
||||
|
||||
Preferences = {
|
||||
"extensions.pocket.enabled" = lock-false;
|
||||
"browser.topsites.contile.enabled" = lock-false;
|
||||
"browser.newtabpage.pinned" = lock-empty-string;
|
||||
"browser.newtabpage.activity-stream.showSponsored" = lock-false;
|
||||
"browser.newtabpage.activity-stream.system.showSponsored" = lock-false;
|
||||
"browser.newtabpage.activity-stream.showSponsoredTopSites" = lock-false;
|
||||
};
|
||||
|
||||
ExtensionSettings = {
|
||||
"uBlock0@raymondhill.net" = {
|
||||
install_url =
|
||||
"https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
"{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
|
||||
install_url =
|
||||
"https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
"{d7742d87-e61d-4b78-b8a1-b469842139fa}" = {
|
||||
install_url =
|
||||
"https://addons.mozilla.org/firefox/downloads/latest/vimium-ff/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
"myallychou@gmail.com" = {
|
||||
install_url =
|
||||
"https://addons.mozilla.org/firefox/downloads/latest/youtube-recommended-videos/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
UserMessaging = {
|
||||
UrlbarInterventions = false;
|
||||
SkipOnboarding = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
services.displayManager.cosmic-greeter.enable = true;
|
||||
|
||||
services.desktopManager.cosmic.enable = true;
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./hyprland/cursor.nix
|
||||
./hyprland/packages.nix
|
||||
./hyprland/greeter.nix
|
||||
./hyprland/hyprlock.nix
|
||||
];
|
||||
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
withUWSM = true;
|
||||
xwayland.enable = true;
|
||||
};
|
||||
|
||||
programs.ydotool.enable = true;
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||
"apple_cursor"
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
apple-cursor
|
||||
];
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
default_session = {
|
||||
command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd 'uwsm start hyprland-uwsm.desktop'";
|
||||
user = "greeter";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
security.pam.services.hyprlock = {};
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
hyprpaper
|
||||
hypridle
|
||||
hyprpicker
|
||||
hyprsunset
|
||||
hyprshot
|
||||
waybar
|
||||
walker
|
||||
swayosd
|
||||
|
||||
playerctl
|
||||
brightnessctl
|
||||
wl-clipboard
|
||||
wdisplays
|
||||
|
||||
bluetui
|
||||
|
||||
kdePackages.dolphin
|
||||
];
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
{ pkgs, ... }: {
|
||||
services = {
|
||||
desktopManager.plasma6.enable = true;
|
||||
|
||||
displayManager.sddm.enable = true;
|
||||
displayManager.sddm.wayland.enable = true;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
kdePackages.discover # Optional: Install if you use Flatpak or fwupd firmware update sevice
|
||||
kdePackages.kcalc # Calculator
|
||||
kdePackages.kcharselect # Tool to select and copy special characters from all installed fonts
|
||||
kdePackages.kcolorchooser # A small utility to select a color
|
||||
kdePackages.kolourpaint # Easy-to-use paint program
|
||||
kdePackages.ksystemlog # KDE SystemLog Application
|
||||
kdePackages.sddm-kcm # Configuration module for SDDM
|
||||
kdiff3 # Compares and merges 2 or 3 files or directories
|
||||
kdePackages.isoimagewriter # Optional: Program to write hybrid ISO files onto USB disks
|
||||
kdePackages.partitionmanager # Optional Manage the disk devices, partitions and file systems on your computer
|
||||
kdePackages.merkuro
|
||||
kdePackages.korganizer
|
||||
kdePackages.kdepim-addons
|
||||
hardinfo2 # System information and benchmarks for Linux systems
|
||||
haruna # Open source video player built with Qt/QML and libmpv
|
||||
wayland-utils # Wayland utilities
|
||||
wl-clipboard # Command-line copy/paste utilities for Wayland
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
{ ... }: { programs.thunderbird.enable = true; }
|
||||
@@ -1,29 +0,0 @@
|
||||
{ pkgs, apple-fonts, ... }: {
|
||||
fonts = {
|
||||
fontconfig.defaultFonts = {
|
||||
sansSerif = [ "SF Pro" ];
|
||||
serif = [ "SF Pro" ];
|
||||
monospace = [ "JetBrainsMono Nerd Font" ];
|
||||
emoji = [ "Apple Color Emoji" ];
|
||||
};
|
||||
|
||||
packages = with pkgs; [
|
||||
monocraft
|
||||
noto-fonts-cjk-sans
|
||||
nerd-fonts.jetbrains-mono
|
||||
(apple-fonts.packages.${pkgs.system}.sf-pro)
|
||||
(stdenv.mkDerivation {
|
||||
name = "apple-color-emoji";
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/samuelngs/apple-emoji-linux/releases/download/v17.4/AppleColorEmoji.ttf";
|
||||
sha256 = "1wahjmbfm1xgm58madvl21451a04gxham5vz67gqz1cvpi0cjva8";
|
||||
};
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
install -Dm644 $src $out/share/fonts/truetype/AppleColorEmoji.ttf
|
||||
'';
|
||||
})
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
{ pkgs, ... }: {
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
i18n.supportedLocales = [ "en_US.UTF-8/UTF-8" "zh_CN.UTF-8/UTF-8" ];
|
||||
i18n.inputMethod = {
|
||||
enable = true;
|
||||
type = "fcitx5";
|
||||
fcitx5.addons = with pkgs; [
|
||||
# fcitx5-gtk # alternatively, kdePackages.fcitx5-qt
|
||||
kdePackages.fcitx5-qt # alternatively, kdePackages.fcitx5-qt
|
||||
qt6Packages.fcitx5-chinese-addons # table input method support
|
||||
fcitx5-nord # a color theme
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
{ pkgs, proton-pass-cli, config, ... }:
|
||||
let
|
||||
cache-path = "$HOME/.cache/pass";
|
||||
|
||||
proton-pass = pkgs.writeShellScriptBin "pass-cli" ''
|
||||
export PROTON_PASS_KEY_PROVIDER="env"
|
||||
export PROTON_PASS_ENCRYPTION_KEY="${config.sops.secrets.proton_key.path}"
|
||||
exec ${proton-pass-cli.packages.${pkgs.system}.default}/bin/pass-cli "$@"
|
||||
'';
|
||||
|
||||
pass-sync = pkgs.writeShellScriptBin "pass-sync" ''
|
||||
mkdir -p "${cache-path}"
|
||||
vaults=$(${proton-pass}/bin/pass-cli vault list --output json | ${pkgs.jq}/bin/jq '.vaults[].name' -r)
|
||||
for vault in $vaults; do
|
||||
${proton-pass}/bin/pass-cli item list $vault --filter-state active --output json | ${pkgs.jq}/bin/jq '.items[].content.title' -r > "${cache-path}/$vault"
|
||||
done
|
||||
'';
|
||||
|
||||
pass-fzf = pkgs.writeShellScriptBin "pass-fzf" ''
|
||||
selected=$(for f in ~/.cache/pass/*; do while IFS= read -r line; do echo "$(basename "$f"): $line"; done < "$f"; done | fzf)
|
||||
vault=$(echo "$selected" | cut -d':' -f1)
|
||||
item=$(echo "$selected" | cut -d':' -f2- | sed 's/^ //')
|
||||
${proton-pass}/bin/pass-cli item view --vault-name "$vault" --item-title "$item" --output json | ${pkgs.jq}/bin/jq '.item.content.content.Login.password' | ${pkgs.wl-clipboard}/bin/wl-copy
|
||||
'';
|
||||
|
||||
in {
|
||||
environment.systemPackages = [
|
||||
proton-pass
|
||||
pass-sync
|
||||
pass-fzf
|
||||
];
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
services.syncthing = {
|
||||
enable = true;
|
||||
openDefaultPorts = true;
|
||||
|
||||
settings = {
|
||||
devices = {
|
||||
"phone" = { id = "DBTMZ3P-VONFNYH-LDDNIO3-ZZ2TKO5-QFVV5D4-W4FMV67-HUTIJQB-UHNF3QM"; };
|
||||
};
|
||||
|
||||
folders = {
|
||||
"Music" = {
|
||||
path = "/home/max/media/music";
|
||||
devices = [ "phone" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
yubioath-flutter # gui
|
||||
yubikey-manager # `ykman`
|
||||
pam_u2f # yubikey with sudo
|
||||
];
|
||||
|
||||
services.pcscd.enable = true;
|
||||
services.udev.packages = [ pkgs.yubikey-personalization ];
|
||||
|
||||
services.yubikey-agent.enable = true;
|
||||
|
||||
security.pam = {
|
||||
sshAgentAuth.enable = true;
|
||||
u2f = {
|
||||
enable = true;
|
||||
settings = {
|
||||
cue = true;
|
||||
authFile = "/home/max/.config/Yubico/u2f_keys";
|
||||
};
|
||||
};
|
||||
services = {
|
||||
login.u2fAuth = true;
|
||||
sudo = {
|
||||
u2fAuth = true;
|
||||
sshAgentAuth = true;
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
@@ -15,7 +15,6 @@
|
||||
../common/optional/locale.nix
|
||||
../common/optional/email.nix
|
||||
../common/optional/proton.nix
|
||||
../common/optional/syncthing.nix
|
||||
];
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,35 +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 = [ "usb_storage" "sdhci_pci" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/664ec8c7-4c36-414c-bf99-c5346a4579dd";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/02E4-1CF8";
|
||||
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.wlan0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
|
||||
}
|
||||
@@ -1,157 +0,0 @@
|
||||
{ config, zen-browser, system, pkgs, firefox-addons, ... }:
|
||||
{
|
||||
xdg.mimeApps = let
|
||||
value = let
|
||||
browser = zen-browser.packages.${system}.beta; # or twilight
|
||||
in
|
||||
browser.meta.desktopFileName;
|
||||
|
||||
associations = builtins.listToAttrs (map (name: {
|
||||
inherit name value;
|
||||
}) [
|
||||
"application/x-extension-shtml"
|
||||
"application/x-extension-xhtml"
|
||||
"application/x-extension-html"
|
||||
"application/x-extension-xht"
|
||||
"application/x-extension-htm"
|
||||
"x-scheme-handler/unknown"
|
||||
"x-scheme-handler/mailto"
|
||||
"x-scheme-handler/chrome"
|
||||
"x-scheme-handler/about"
|
||||
"x-scheme-handler/https"
|
||||
"x-scheme-handler/http"
|
||||
"application/xhtml+xml"
|
||||
"application/json"
|
||||
"text/plain"
|
||||
"text/html"
|
||||
]);
|
||||
in {
|
||||
enable = true;
|
||||
associations.added = associations;
|
||||
defaultApplications = associations;
|
||||
};
|
||||
|
||||
programs.zen-browser = {
|
||||
enable = true;
|
||||
|
||||
policies = {
|
||||
AutofillAddressEnabled = false;
|
||||
AutofillCreditCardEnabled = false;
|
||||
DisableAppUpdate = true;
|
||||
DisableFeedbackCommands = true;
|
||||
DisableFirefoxStudies = true;
|
||||
DisablePocket = true;
|
||||
DisableTelemetry = true;
|
||||
DontCheckDefaultBrowser = true;
|
||||
NoDefaultBookmarks = true;
|
||||
OfferToSaveLogins = false;
|
||||
EnableTrackingProtection = {
|
||||
Value = true;
|
||||
Locked = true;
|
||||
Cryptomining = true;
|
||||
Fingerprinting = true;
|
||||
};
|
||||
|
||||
|
||||
# ID's can be collected from this command:
|
||||
# nix run github:tupakkatapa/mozid -- "https://addons.mozilla.org/en-US/firefox/addon/<example>/"
|
||||
ExtensionSettings = {
|
||||
# The default behaviour of ctrl+click, shift+click, cmd+click (on macOS) and middle-click when clicking on links is to open the link in a new tab (or new window in the case of shift).
|
||||
# This behaviour is sometimes broken by silly developers.
|
||||
"{18b670e2-67df-4b26-b9b0-34835d1f062a}" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/link-fixer/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
profiles.default = let
|
||||
containers = {
|
||||
Personal = {
|
||||
color = "yellow";
|
||||
icon = "circle";
|
||||
id = 1;
|
||||
};
|
||||
School = {
|
||||
color = "red";
|
||||
icon = "fruit";
|
||||
id = 2;
|
||||
};
|
||||
Work = {
|
||||
color = "blue";
|
||||
icon = "briefcase";
|
||||
id = 3;
|
||||
};
|
||||
};
|
||||
spaces = {
|
||||
Personal = {
|
||||
id = "c6de089c-410d-4206-961d-ab11f988d40a";
|
||||
icon = "⭐";
|
||||
container = containers."Personal".id;
|
||||
position = 1000;
|
||||
};
|
||||
School = {
|
||||
id = "78aabdad-8aae-4fe0-8ff0-2a0c6c4ccc24";
|
||||
icon = "🍎";
|
||||
container = containers."School".id;
|
||||
position = 2000;
|
||||
};
|
||||
Work = {
|
||||
id = "cdd10fab-4fc5-494b-9041-325e5759195b";
|
||||
icon = "💼";
|
||||
container = containers."Work".id;
|
||||
position = 3000;
|
||||
};
|
||||
};
|
||||
pins = {
|
||||
# Personal Pins
|
||||
"Proton Mail" = {
|
||||
id = "d9942e0a-0997-418d-b357-91727300d184";
|
||||
container = containers.Personal.id;
|
||||
url = "https://mail.proton.me";
|
||||
isEssential = true;
|
||||
position = 1;
|
||||
};
|
||||
"Proton Calendar" = {
|
||||
id = "6557e03f-c0ab-4656-ac94-acfb1fe19f3c";
|
||||
container = containers.Personal.id;
|
||||
url = "https://calendar.proton.me";
|
||||
isEssential = true;
|
||||
position = 2;
|
||||
};
|
||||
"YNAB" = {
|
||||
id = "10cb5609-fcd5-4ed6-a48d-24eb22f2d624";
|
||||
container = containers.Personal.id;
|
||||
url = "https://app.ynab.com";
|
||||
isEssential = true;
|
||||
position = 3;
|
||||
};
|
||||
|
||||
# # School Pins
|
||||
# "Canvas" = {
|
||||
# id = "cfbdc143-6a16-46d7-b33e-e9c964725e59";
|
||||
# workspace = spaces.School.id;
|
||||
# container = containers.School.id;
|
||||
# url = "https://clemson.instructure.com/calendar";
|
||||
# isEssential = true;
|
||||
# position = 104;
|
||||
# };
|
||||
};
|
||||
in {
|
||||
containersForce = true;
|
||||
spacesForce = true;
|
||||
pinsForce = true;
|
||||
inherit containers spaces pins;
|
||||
|
||||
# This is awesome :)
|
||||
# https://nur.nix-community.org/repos/rycee/
|
||||
extensions.packages = with firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [
|
||||
ublock-origin
|
||||
proton-pass
|
||||
istilldontcareaboutcookies
|
||||
better-canvas
|
||||
darkreader
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
.browserContainer > findbar {
|
||||
top: 0 !important;
|
||||
position: fixed !important;
|
||||
width: 1000px !important;
|
||||
right: 0 !important;
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
{ lib, ... }:
|
||||
let
|
||||
publicGitEmail = "22125083+k2on@users.noreply.github.com";
|
||||
publicKey = "/home/max/.ssh/id_maxkey.pub";
|
||||
in
|
||||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
settings = {
|
||||
init.defaultBranch = "main";
|
||||
push.autoSetupRemote = true;
|
||||
|
||||
commit.gpgsign = true;
|
||||
gpg.format = "ssh";
|
||||
|
||||
user.name = "Max Koon";
|
||||
user.email = publicGitEmail;
|
||||
user.signing.key = publicKey;
|
||||
gpg.ssh.allowedSignersFile = "/home/max/.ssh/allowed_signers";
|
||||
};
|
||||
|
||||
signing = {
|
||||
signByDefault = true;
|
||||
key = publicKey;
|
||||
};
|
||||
};
|
||||
|
||||
home.file.".ssh/allowed_signers".text = ''
|
||||
${publicGitEmail} ${lib.fileContents ../keys/id_maxkey.pub}
|
||||
'';
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
xdg.desktopEntries.imv = {
|
||||
name = "imv";
|
||||
exec = "${pkgs.imv}/bin/imv %F";
|
||||
icon = "imv";
|
||||
};
|
||||
|
||||
xdg.mimeApps = let
|
||||
value = "imv.desktop";
|
||||
|
||||
associations = builtins.listToAttrs (map (name: {
|
||||
inherit name value;
|
||||
}) [
|
||||
"image/png"
|
||||
"image/jpeg"
|
||||
"image/gif"
|
||||
"image/bmp"
|
||||
"image/webp"
|
||||
]);
|
||||
in {
|
||||
enable = true;
|
||||
associations.added = associations;
|
||||
defaultApplications = associations;
|
||||
};
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
mpc
|
||||
];
|
||||
|
||||
services.mpd = {
|
||||
enable = true;
|
||||
musicDirectory = "/home/max/media/music";
|
||||
|
||||
# extraConfig = ''
|
||||
# audio_output {
|
||||
# type "pipewire"
|
||||
# name "pipewire"
|
||||
# }
|
||||
# '';
|
||||
|
||||
|
||||
extraConfig = ''
|
||||
audio_output {
|
||||
type "alsa"
|
||||
name "My ALSA"
|
||||
mixer_type "hardware"
|
||||
mixer_device "default"
|
||||
mixer_control "PCM"
|
||||
}
|
||||
'';
|
||||
|
||||
};
|
||||
|
||||
services.mpd-mpris.enable = true;
|
||||
|
||||
programs.ncmpcpp = {
|
||||
enable = true;
|
||||
bindings = [
|
||||
{ key = "j"; command = "scroll_down"; }
|
||||
{ key = "k"; command = "scroll_up"; }
|
||||
{ key = "h"; command = "previous_column"; }
|
||||
{ key = "l"; command = "next_column"; }
|
||||
|
||||
{ key = "J"; command = [ "select_item" "scroll_down" ]; }
|
||||
{ key = "K"; command = [ "select_item" "scroll_up" ]; }
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,282 +0,0 @@
|
||||
{ pkgs, ... }: {
|
||||
programs.nixvim = {
|
||||
enable = true;
|
||||
|
||||
colorschemes.tokyonight.enable = true;
|
||||
|
||||
globals = {
|
||||
mapleader = " ";
|
||||
maplocalleader = " ";
|
||||
};
|
||||
|
||||
clipboard = {
|
||||
providers.wl-copy.enable = true;
|
||||
register = "unnamedplus";
|
||||
};
|
||||
|
||||
opts = {
|
||||
background = "dark";
|
||||
relativenumber = true;
|
||||
cursorline = true;
|
||||
number = true;
|
||||
|
||||
tabstop = 2;
|
||||
expandtab = true;
|
||||
|
||||
signcolumn = "yes";
|
||||
|
||||
updatetime = 250;
|
||||
|
||||
list = true;
|
||||
listchars.__raw = "{ tab = '» ', trail = '·', nbsp = '␣' }";
|
||||
|
||||
};
|
||||
|
||||
extraConfigLua = ''
|
||||
vim.g.transparent_enabled = true
|
||||
require('transparent').setup({ exclude_groups = { "CursorLine" } })
|
||||
require('stay-centered').setup({ enable = true })
|
||||
require('mini.ai').setup()
|
||||
'';
|
||||
|
||||
keymaps = [
|
||||
{
|
||||
mode = "n";
|
||||
key = "<Esc>";
|
||||
action = "<cmd>nohlsearch<CR>";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>a";
|
||||
action.__raw = "function() require'harpoon':list():add() end";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<C-e>";
|
||||
action.__raw =
|
||||
"function() require'harpoon'.ui:toggle_quick_menu(require'harpoon':list()) end";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<C-j>";
|
||||
action.__raw = "function() require'harpoon':list():select(1) end";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<C-k>";
|
||||
action.__raw = "function() require'harpoon':list():select(2) end";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<C-l>";
|
||||
action.__raw = "function() require'harpoon':list():select(3) end";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<C-;>";
|
||||
action.__raw = "function() require'harpoon':list():select(4) end";
|
||||
}
|
||||
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>b";
|
||||
action = "<cmd>Neotree<CR>";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>l";
|
||||
action = "<cmd>Neotree reveal<CR>";
|
||||
}
|
||||
];
|
||||
|
||||
autoCmd = [
|
||||
{
|
||||
event = [ "BufWritePre" ];
|
||||
pattern = "*";
|
||||
command = "lua vim.lsp.buf.format()";
|
||||
}
|
||||
];
|
||||
|
||||
diagnostic.settings.virtual_text = true;
|
||||
|
||||
userCommands.W.command = "w";
|
||||
|
||||
plugins = {
|
||||
|
||||
web-devicons.enable = true;
|
||||
sleuth.enable = true;
|
||||
lastplace.enable = true;
|
||||
|
||||
gitsigns.enable = true;
|
||||
highlight-colors.enable = true;
|
||||
todo-comments.enable = true;
|
||||
goyo.enable = true;
|
||||
|
||||
treesitter = {
|
||||
enable = true;
|
||||
settings = {
|
||||
ensureInstalled =
|
||||
[ "typescript" "rust" "php" "blade" "python" "nix" ];
|
||||
|
||||
highlight = { enable = true; };
|
||||
|
||||
indent = { enable = true; };
|
||||
};
|
||||
};
|
||||
|
||||
lsp = {
|
||||
enable = true;
|
||||
|
||||
servers = {
|
||||
tsgo.enable = true;
|
||||
tailwindcss.enable = false;
|
||||
biome.enable = false;
|
||||
rust_analyzer = {
|
||||
enable = true;
|
||||
installCargo = true;
|
||||
installRustc = true;
|
||||
};
|
||||
clangd.enable = true;
|
||||
phpactor.enable = true;
|
||||
pylsp.enable = true;
|
||||
pyright.enable = true;
|
||||
nixd.enable = true;
|
||||
};
|
||||
|
||||
keymaps = {
|
||||
extra = [
|
||||
{
|
||||
mode = "n";
|
||||
key = "gd";
|
||||
action.__raw = "require('telescope.builtin').lsp_definitions";
|
||||
options = { desc = "LSP: [G]oto [D]efinition"; };
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "gr";
|
||||
action.__raw = "require('telescope.builtin').lsp_references";
|
||||
options = { desc = "LSP: [G]oto [R]eferences"; };
|
||||
}
|
||||
];
|
||||
|
||||
lspBuf = {
|
||||
"<leader>." = {
|
||||
mode = [ "n" "x" ];
|
||||
action = "code_action";
|
||||
desc = "Code action";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
lazydev.enable = true;
|
||||
luasnip.enable = true;
|
||||
|
||||
telescope = {
|
||||
enable = true;
|
||||
|
||||
extensions = {
|
||||
fzf-native.enable = true;
|
||||
ui-select.enable = true;
|
||||
};
|
||||
|
||||
keymaps = {
|
||||
"<leader>sf" = {
|
||||
mode = "n";
|
||||
action = "find_files";
|
||||
options = { desc = "[S]earch [F]iles"; };
|
||||
};
|
||||
"<leader>sk" = {
|
||||
mode = "n";
|
||||
action = "live_grep";
|
||||
options = { desc = "[S]earch [S]tring"; };
|
||||
};
|
||||
};
|
||||
settings = {
|
||||
extensions.__raw =
|
||||
"{ ['ui-select'] = { require('telescope.themes').get_dropdown() } }";
|
||||
};
|
||||
};
|
||||
|
||||
cmp = {
|
||||
enable = true;
|
||||
settings = {
|
||||
snippet = {
|
||||
expand = ''
|
||||
function(args)
|
||||
require('luasnip').lsp_expand(args.body)
|
||||
end
|
||||
'';
|
||||
};
|
||||
|
||||
completion = { completeopt = "menu,menuone,noinsert"; };
|
||||
formatting = {
|
||||
format = ''require("nvim-highlight-colors").format'';
|
||||
};
|
||||
mapping = {
|
||||
"<CR>" = "cmp.mapping.confirm { select = true }";
|
||||
"<Tab>" = "cmp.mapping.select_next_item()";
|
||||
"<S-Tab>" = "cmp.mapping.select_prev_item()";
|
||||
"<Down>" = "cmp.mapping.select_next_item()";
|
||||
"<Up>" = "cmp.mapping.select_prev_item()";
|
||||
"<C-j>" = "cmp.mapping.select_next_item()";
|
||||
"<C-k>" = "cmp.mapping.select_prev_item()";
|
||||
};
|
||||
sources = [
|
||||
{
|
||||
name = "lazydev";
|
||||
|
||||
group_index = 0;
|
||||
}
|
||||
{ name = "nvim_lsp"; }
|
||||
{ name = "luasnip"; }
|
||||
{ name = "path"; }
|
||||
{ name = "nvim_lsp_signature_help"; }
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
harpoon = {
|
||||
enable = true;
|
||||
settings.settings = { save_on_toggle = true; };
|
||||
};
|
||||
neo-tree = {
|
||||
enable = true;
|
||||
settings = {
|
||||
window.width = 25;
|
||||
filesystem = {
|
||||
filtered_items = {
|
||||
visible = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
wakatime.enable = true;
|
||||
autoclose.enable = true;
|
||||
ts-autotag.enable = true;
|
||||
bullets.enable = true;
|
||||
spider = {
|
||||
enable = true;
|
||||
settings = {
|
||||
subwordMovement = true;
|
||||
skipInsignificantPunctuation = false;
|
||||
};
|
||||
keymaps = {
|
||||
motions = {
|
||||
"w" = "w";
|
||||
"e" = "e";
|
||||
"b" = "b";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
transparent.enable = true;
|
||||
};
|
||||
|
||||
extraPlugins = with pkgs.vimPlugins; [
|
||||
stay-centered-nvim
|
||||
mini-ai
|
||||
];
|
||||
|
||||
};
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
sops = {
|
||||
|
||||
age.keyFile = "/home/max/.config/sops/age/keys.txt";
|
||||
|
||||
defaultSopsFile = ../../../secrets/sops/host/max/default.yaml;
|
||||
validateSopsFiles = false;
|
||||
|
||||
secrets = {
|
||||
"ssh_keys/max" = {
|
||||
path = "/home/max/.ssh/id_maxkey";
|
||||
};
|
||||
"waka_config" = {
|
||||
path = "/home/max/.wakatime.cfg";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
|
||||
extraConfig = ''
|
||||
Host m1
|
||||
HostName m1
|
||||
User admin
|
||||
|
||||
Host surface
|
||||
HostName surface
|
||||
User admin
|
||||
|
||||
Host ark
|
||||
HostName ark
|
||||
User admin
|
||||
|
||||
Host pi
|
||||
HostName 192.168.0.143
|
||||
User admin
|
||||
|
||||
Host ssh.koon.us
|
||||
HostName ssh.koon.us
|
||||
ProxyCommand cloudflared access ssh --hostname %h
|
||||
User git
|
||||
|
||||
AddKeysToAgent yes
|
||||
'';
|
||||
|
||||
matchBlocks = {
|
||||
"git" = {
|
||||
host = "github.com";
|
||||
user = "git";
|
||||
identityFile = [
|
||||
"~/.ssh/id_maxkey"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.file = {
|
||||
".ssh/id_maxkey.pub".source = ../keys/id_maxkey.pub;
|
||||
};
|
||||
}
|
||||
@@ -1,137 +0,0 @@
|
||||
{ pkgs, config, ... }: {
|
||||
programs.alacritty = {
|
||||
enable = true;
|
||||
theme = "tokyo_night";
|
||||
settings = {
|
||||
window = {
|
||||
padding = { x = 14; y = 14; };
|
||||
};
|
||||
font = {
|
||||
normal.family = "JetBrainsMono Nerd Font";
|
||||
size = 10;
|
||||
};
|
||||
keyboard.bindings = [
|
||||
{ key = "Insert"; mods = "Shift"; action = "Paste"; }
|
||||
{ key = "Insert"; mods = "Control"; action = "Copy"; }
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
programs.lf = { enable = true; };
|
||||
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
mouse = true;
|
||||
keyMode = "vi";
|
||||
shell = "${pkgs.zsh}/bin/zsh";
|
||||
extraConfig = ''
|
||||
set -g status-style bg=default
|
||||
|
||||
bind h select-pane -L
|
||||
bind j select-pane -D
|
||||
bind k select-pane -U
|
||||
bind l select-pane -R
|
||||
|
||||
set -g default-terminal "tmux-256color"
|
||||
set -ga terminal-overrides ",alacritty:Tc"
|
||||
'';
|
||||
};
|
||||
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
enableCompletion = true;
|
||||
autosuggestion = {
|
||||
enable = true;
|
||||
};
|
||||
syntaxHighlighting.enable = true;
|
||||
dotDir = "${config.home.homeDirectory}/.config/zsh";
|
||||
autocd = true;
|
||||
|
||||
initContent = ''
|
||||
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}'
|
||||
zstyle ':completion:*' menu select
|
||||
|
||||
fzf-project() {
|
||||
selected=$(find ~/dev -mindepth 2 -maxdepth 2 | sed 's|/home/max/dev/||' | fzf --delimiter '/' --nth 2)
|
||||
if [[ -n $selected ]]; then
|
||||
cd ~/dev/$selected
|
||||
zle reset-prompt
|
||||
fi
|
||||
zle redisplay
|
||||
}
|
||||
|
||||
zle -N fzf-project
|
||||
bindkey '^G' fzf-project
|
||||
|
||||
fzf-files() {
|
||||
local selected
|
||||
selected=$(${pkgs.ripgrep}/bin/rg --files | ${pkgs.fzf}/bin/fzf) || return
|
||||
|
||||
if [[ -n $selected ]]; then
|
||||
BUFFER="v $selected"
|
||||
print -s -- "$BUFFER"
|
||||
zle accept-line
|
||||
fi
|
||||
}
|
||||
|
||||
zle -N fzf-files
|
||||
bindkey '^V' fzf-files
|
||||
|
||||
open() {
|
||||
xdg-open "$@" >/dev/null 2>&1 &
|
||||
}
|
||||
'';
|
||||
|
||||
envExtra = ''
|
||||
export PER_DIRECTORY_HISTORY_TOGGLE="^H"
|
||||
export HISTORY_BASE="$HOME/.local/share/directory_history"
|
||||
'';
|
||||
|
||||
shellAliases = {
|
||||
ll = "ls -alh";
|
||||
v = "nvim";
|
||||
vi = "nvim";
|
||||
vim = "nvim";
|
||||
|
||||
p = "pnpm";
|
||||
g = "pnpm run build && ~/dev/personal/genesis/packages/genesis/dist/bin.js";
|
||||
|
||||
ns = "nix-shell --run zsh -p";
|
||||
|
||||
tt = "tt -notheme -n 10";
|
||||
|
||||
bible = "nvim ~/bible.txt -R";
|
||||
notes = "nvim ~/notes";
|
||||
home = "sudo nvim /etc/nixos/home.nix";
|
||||
wttr = "curl wttr.in/Clemson";
|
||||
|
||||
docx-to-pdf = "libreoffice --headless --convert-to pdf";
|
||||
};
|
||||
|
||||
plugins = [
|
||||
{
|
||||
name = "vi-mode";
|
||||
src = pkgs.zsh-vi-mode;
|
||||
file = "share/zsh-vi-mode/zsh-vi-mode.plugin.zsh";
|
||||
}
|
||||
{
|
||||
name = "per-directory-history";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "jimhester";
|
||||
repo = "per-directory-history";
|
||||
rev = "95f06973e9f2ff0ff75f3cebd0a2ee5485e27834";
|
||||
sha256 = "sha256-EV9QPBndwAWzdOcghDXrIIgP0oagVMOTyXzoyt8tXRo=";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
nix-direnv.enable = true;
|
||||
silent = true;
|
||||
};
|
||||
|
||||
programs.starship = { enable = true; };
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
{ ... }: {
|
||||
programs.zathura = {
|
||||
enable = true;
|
||||
options = {
|
||||
selection-clipboard = "clipboard";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIMywmwW37vjQSd9lqYh9IhGYce9Bi24sTyG3zffpdaJrAAAABHNzaDo= max@koon
|
||||
@@ -1,29 +0,0 @@
|
||||
{ config, lib, ... }:
|
||||
{
|
||||
sops = {
|
||||
|
||||
age.keyFile = if builtins.pathExists /var/lib/sops-nix/key.txt then
|
||||
"/var/lib/sops-nix/key.txt"
|
||||
else
|
||||
"/home/max/.config/sops/age/keys.txt" # temp decrypt key
|
||||
;
|
||||
|
||||
defaultSopsFile = ../../secrets/sops/host/max/default.yaml;
|
||||
validateSopsFiles = false;
|
||||
|
||||
secrets = {
|
||||
"host_age_key" = {
|
||||
path = "/var/lib/sops-nix/key.txt";
|
||||
};
|
||||
"yubico/u2f_keys" = {
|
||||
owner = config.users.users.max.name;
|
||||
inherit (config.users.users.max) group;
|
||||
path = "/home/max/.config/Yubico/u2f_keys";
|
||||
};
|
||||
"proton_key" = {};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
environment.sessionVariables.PROTON_PASS_ENCRYPTION_KEY = config.sops.secrets.proton_key.path;
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.tailscale.enable = true;
|
||||
|
||||
systemd.services.tailscale-restart = {
|
||||
description = "Restart Tailscale after waking up";
|
||||
after = [ "suspend.target" ];
|
||||
wantedBy = [ "suspend.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = "${pkgs.systemd}/bin/systemctl restart tailscaled.service";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
{ pkgs, config, ... }: {
|
||||
|
||||
sops.secrets.max-password.neededForUsers = true;
|
||||
users.mutableUsers = false;
|
||||
|
||||
users.users.max = {
|
||||
isNormalUser = true;
|
||||
hashedPasswordFile = config.sops.secrets.max-password.path;
|
||||
extraGroups = [ "wheel" "networkmanager" "video" "kvm" "docker" "ydotool" ];
|
||||
packages = with pkgs; [ tree ];
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
|
||||
programs.adb.enable = true;
|
||||
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
|
||||
rootless = {
|
||||
enable = true;
|
||||
setSocketVariable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
{ config, secrets, ... }: {
|
||||
|
||||
|
||||
services.openvpn.servers = {
|
||||
ris = {
|
||||
config = "config /etc/openvpn/ris/config.ovpn ";
|
||||
updateResolvConf = true;
|
||||
autoStart = false;
|
||||
};
|
||||
};
|
||||
|
||||
sops.secrets = {
|
||||
"ris-vpn/key" = {
|
||||
sopsFile = ../../secrets/sops/host/max/work.yaml;
|
||||
owner = config.users.users.root.name;
|
||||
inherit (config.users.users.root) group;
|
||||
path = "/etc/openvpn/ris/vpnclient.rismedia.com.key";
|
||||
};
|
||||
};
|
||||
|
||||
environment.etc."openvpn/ris/config.ovpn" = {
|
||||
text = secrets.work.ris.vpn.config;
|
||||
};
|
||||
environment.etc."openvpn/ris/vpnclient.rismedia.com.crt" = {
|
||||
text = secrets.work.ris.vpn.crt;
|
||||
};
|
||||
|
||||
networking.extraHosts = ''
|
||||
${secrets.work.ris.extraHosts}
|
||||
'';
|
||||
}
|
||||
Reference in New Issue
Block a user