Migrate Hyprland to Lua config, drop dead flake inputs, general cleanup
Hyprland - Switch wayland.windowManager.hyprland to configType = "lua" (Hyprland 0.56) - Convert settings, env, monitors, window rules, gesture, animations (hl.curve/hl.animation) and all keybinds to hl.* calls - Add home/system/hyprland/lib.nix with exec/bind/execOnce helpers; every exec-once now runs from a hyprland.start hook - Drop hard-coded default_monitor = "eDP-2" Flake - Remove blog, awesome-wallpapers and default-creds inputs (their repos no longer ship a flake.nix and broke `nix flake update`), along with the server modules and Glance links that used them - Update flake.lock - Replace removed `gcr` with `gcr_4` Fixes - Point configDirectory at /etc/nixos/nixy on home-pc and thinkpad - Fix home-pc git email typo - Remove conflicting openpgp signing format, make pull.rebase a boolean, replace hx/peco in git aliases with nvim/sk - Fix zsh NUL alias (2>&1) and stop forcing bat colors in the cat alias - Require a password for sudo again (nixos-rebuild stays NOPASSWD) - Remove duplicate hardware.graphics block from home-pc flake - Delete unused zen .old files, run alejandra on host files
This commit is contained in:
@@ -21,7 +21,7 @@ in {
|
||||
user.name = username;
|
||||
user.email = email;
|
||||
init.defaultBranch = "main";
|
||||
pull.rebase = "false";
|
||||
pull.rebase = false;
|
||||
push.autoSetupRemote = true;
|
||||
color.ui = "1";
|
||||
alias = {
|
||||
@@ -43,10 +43,10 @@ in {
|
||||
af = "!git add $(git ls-files -m -o --exclude-standard | sk -m)";
|
||||
st = "status";
|
||||
br = "branch";
|
||||
df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
|
||||
df = "!git hist | sk | awk '{print $2}' | xargs -I {} git diff {}^ {}";
|
||||
hist = ''log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
|
||||
llog = ''log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
|
||||
edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
|
||||
edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; nvim `f`";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
home.file.".ssh/allowed_signers".text = "* ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIINhWby7lUUXQNKbRu9/UOrGjWDf3fvoAwGHomWv/+lL";
|
||||
|
||||
programs.git = {
|
||||
signing.format = "openpgp";
|
||||
settings = {
|
||||
commit.gpgsign = true;
|
||||
gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
{
|
||||
wayland.windowManager.hyprland.settings.exec-once = [
|
||||
{lib, ...}: let
|
||||
hl = import ../../system/hyprland/lib.nix {inherit lib;};
|
||||
in {
|
||||
wayland.windowManager.hyprland.settings.on = hl.execOnce [
|
||||
"protonvpn-app --start-minimized &"
|
||||
];
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
cd = "z";
|
||||
ls = "eza --icons=always --no-quotes";
|
||||
tree = "eza --icons=always --tree --no-quotes";
|
||||
cat = "bat --theme=base16 --color=always --paging=never --tabs=2 --wrap=never --plain";
|
||||
cat = "bat --theme=base16 --paging=never --tabs=2 --wrap=never --plain";
|
||||
mkdir = "mkdir -p";
|
||||
|
||||
# Shortcuts
|
||||
@@ -112,7 +112,7 @@
|
||||
alias -g C="| wl-copy"
|
||||
alias -g NE="2>/dev/null"
|
||||
alias -g ND=">/dev/null"
|
||||
alias -g NUL=">/dev/null 2>1"
|
||||
alias -g NUL=">/dev/null 2>&1"
|
||||
|
||||
# search history based on what's typed in the prompt
|
||||
autoload -U history-search-end
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
programs.zen-browser = {
|
||||
enable = true;
|
||||
|
||||
policies = {
|
||||
DisableTelemetry = true;
|
||||
DisableFirefoxStudies = true;
|
||||
DisablePocket = true;
|
||||
|
||||
OfferToSaveLogins = false;
|
||||
PasswordManagerEnabled = false;
|
||||
|
||||
AutofillAddressEnabled = false;
|
||||
AutofillCreditCardEnabled = false;
|
||||
|
||||
DontCheckDefaultBrowser = true;
|
||||
|
||||
DNSOverHTTPS = {
|
||||
Enabled = true;
|
||||
ProviderURL = "https://dns.quad9.net/dns-query";
|
||||
Locked = true;
|
||||
};
|
||||
};
|
||||
|
||||
profiles.default = {
|
||||
search = {
|
||||
force = true;
|
||||
default = "Startpage";
|
||||
};
|
||||
|
||||
settings = {
|
||||
"browser.startup.homepage" = "https://duckduckgo.com";
|
||||
|
||||
"browser.newtabpage.enabled" = false;
|
||||
|
||||
"privacy.resistFingerprinting" = true;
|
||||
"privacy.trackingprotection.enabled" = true;
|
||||
|
||||
"geo.enabled" = false;
|
||||
"dom.webnotifications.enabled" = false;
|
||||
|
||||
"signon.rememberSignons" = false;
|
||||
|
||||
"toolkit.telemetry.enabled" = false;
|
||||
};
|
||||
|
||||
extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
|
||||
ublock-origin
|
||||
firefox-multi-account-containers
|
||||
noscript
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
home.sessionVariables.BROWSER = "zen";
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
{
|
||||
programs.zen-browser = {
|
||||
enable = true;
|
||||
|
||||
policies = {
|
||||
DisableTelemetry = true;
|
||||
DisableFirefoxStudies = true;
|
||||
|
||||
OfferToSaveLogins = false;
|
||||
PasswordManagerEnabled = false;
|
||||
|
||||
DNSOverHTTPS = {
|
||||
Enabled = true;
|
||||
ProviderURL = "https://dns.quad9.net/dns-query";
|
||||
Locked = true;
|
||||
};
|
||||
|
||||
Homepage = {
|
||||
URL = "https://duckduckgo.com";
|
||||
StartPage = "homepage";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user