Compare commits

..

No commits in common. "36eabc0203ba4aaf5ef26deb182a3d26e5f82a67" and "74ade000816e9b3adcd34d44edf5744a1c238634" have entirely different histories.

5 changed files with 55 additions and 136 deletions

8
flake.lock generated
View file

@ -1086,11 +1086,11 @@
]
},
"locked": {
"lastModified": 1762633087,
"narHash": "sha256-eZcPkglvKESSzrtqLQoroIY9KIFZH5rsvWlK0ibZ8dc=",
"lastModified": 1760810038,
"narHash": "sha256-ZmrKFgVn/Ues34j+TRk2W7m8X6/tXVqtV19zE9apI9s=",
"ref": "refs/heads/main",
"rev": "ff344f9d922c5fda41c87d92fa0a22219099c045",
"revCount": 49,
"rev": "56ac08a980247206d96f0efe289e6212f009f6b3",
"revCount": 47,
"type": "git",
"url": "file:///etc/nixos.secrets"
},

View file

@ -9,7 +9,7 @@
# hardware
cachy.enable = true;
cachy.variant = "lts";
cachy.variant = "server";
virtualization = {
docker.enable = true;
@ -54,8 +54,8 @@
networking.firewall.extraCommands =
# ip ban ai crawlers
let
createDropRulesForIpAddress = address: ''
let createDropRulesForIpAddress = address:
''
iptables -A INPUT -s ${address} -j DROP
iptables -A OUTPUT -s ${address} -j DROP
iptables -A FORWARD -s ${address} -j DROP
@ -216,7 +216,7 @@
${createDropRulesForIpAddress "98.84.60.17"}
${createDropRulesForIpAddress "98.84.70.201"}
'';
virtualisation.docker.extraOptions = "--iptables=true";
virtualisation.docker.extraOptions="--iptables=true";
};
}

View file

@ -1,44 +1,27 @@
# 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,
modulesPath,
...
}:
{ config, lib, modulesPath, ... }:
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
services.fstrim.enable = true;
boot.initrd.availableKernelModules = [
"xhci_pci"
"ehci_pci"
"ahci"
"ums_realtek"
"sd_mod"
"sr_mod"
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "ums_realtek" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [
"kvm-intel"
"ip_tables"
"i6table_nat"
"wireguard"
];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/ea03d496-2769-485d-b5cb-de0b58cb698c";
fileSystems."/" =
{ device = "/dev/disk/by-uuid/ea03d496-2769-485d-b5cb-de0b58cb698c";
fsType = "btrfs";
options = [ "subvol=@" ];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/4F5E-11FB";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/4F5E-11FB";
fsType = "vfat";
};

View file

@ -1,16 +1,8 @@
{
config,
lib,
pkgs,
pkgs-stable,
osConfig,
...
}:
{ config, lib, pkgs, pkgs-stable, osConfig, ... }:
let
cfg = config.userSettings.git;
in
{
in {
options = {
userSettings.git = {
enable = lib.mkEnableOption "Enable git";
@ -18,25 +10,15 @@ in
};
config = lib.mkIf cfg.enable {
home.packages = [
pkgs.git
pkgs.git-extras
pkgs.git-filter-repo
pkgs-stable.openssh
];
home.packages = [ pkgs.git pkgs-stable.openssh ];
programs.git.enable = true;
programs.git.userName = config.userSettings.name;
programs.git.userEmail = config.userSettings.email;
programs.git.aliases = {
change-commits = ''!f() { VAR=$1; OLD=$2; NEW=$3; shift 3; FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch --env-filter "if [[ \"$`echo $VAR`\" = '$OLD' ]]; then export $VAR='$NEW'; fi" $@; }; f'';
};
programs.git.extraConfig = {
init.defaultBranch = "main";
safe.directory = [
osConfig.systemSettings.dotfilesDir
safe.directory = [ osConfig.systemSettings.dotfilesDir
osConfig.systemSettings.secretsFlakeDir
(config.home.homeDirectory + "/.cache/nix/tarball-cache")
];
(config.home.homeDirectory + "/.cache/nix/tarball-cache") ];
};
programs.git.lfs.enable = true;
services.ssh-agent.enable = true;

View file

@ -1,14 +1,8 @@
{
config,
lib,
pkgs,
...
}:
{ config, lib, pkgs, ... }:
let
cfg = config.userSettings.zed;
in
{
in {
options = {
userSettings.zed = {
enable = lib.mkEnableOption "Enable zed editor";
@ -64,7 +58,7 @@ in
disable_ai = true;
agent = {
button = false;
model_parameters = [ ];
model_parameters = [];
};
git_panel = {
button = false;
@ -144,61 +138,21 @@ in
"space b n" = "panel::NextPanelTab";
"space b i" = "tab_switcher::ToggleAll";
"ctrl-i" = "tab_switcher::ToggleAll";
"alt-p" = [ "tab_switcher::Toggle" { "select_last" = true; }];
"alt-n" = "tab_switcher::Toggle";
"alt-z" = "terminal_panel::Toggle";
"alt-d" = "debug_panel::ToggleFocus";
};
}
{
context = "OutlinePanel";
bindings = {
"ctrl-h" = "workspace::ActivatePaneLeft";
"ctrl-l" = "workspace::ActivatePaneRight";
"ctrl-j" = "workspace::ActivatePaneDown";
"ctrl-k" = "workspace::ActivatePaneUp";
};
}
{
context = "OutlinePanel && not_editing";
bindings = {
"q" = "workspace::ToggleLeftDock";
};
}
{
context = "ProjectPanel";
bindings = {
"ctrl-h" = "workspace::ActivatePaneLeft";
"ctrl-l" = "workspace::ActivatePaneRight";
"ctrl-j" = "workspace::ActivatePaneDown";
"ctrl-k" = "workspace::ActivatePaneUp";
};
}
{
context = "ProjectPanel && not_editing";
bindings = {
"tab" = "project_panel::OpenPermanent";
"q" = "workspace::ToggleLeftDock";
"r" = "project_panel::Rename";
"D" = "project_panel::Delete";
};
}
{
context = "Terminal";
bindings = {
"ctrl-space w d" = "pane::CloseAllItems";
"ctrl-space b d" = "pane::CloseActiveItem";
"ctrl-space b p" = "panel::PreviousPanelTab";
"ctrl-space b n" = "panel::NextPanelTab";
"ctrl-space b i" = "tab_switcher::ToggleAll";
"ctrl-w" = "pane::CloseActiveItem";
"alt-z" = "terminal_panel::Toggle";
"alt-d" = "debug_panel::ToggleFocus";
"ctrl-i" = "tab_switcher::ToggleAll";
"alt-p" = [
"tab_switcher::Toggle"
{ "select_last" = true; }
];
"ctrl-p" = null;
"ctrl-n" = null;
"alt-p" = [ "tab_switcher::Toggle" { "select_last" = true; }];
"alt-n" = "tab_switcher::Toggle";
};
}
{