kjdsjkasdk

This commit is contained in:
2026-01-19 03:23:40 +01:00
parent e9d84f5633
commit 4d86def5ff
8 changed files with 39 additions and 25 deletions

View File

@@ -20,7 +20,7 @@ let
in
pkgs.runCommandNoCC "nspawn-setup-${hostname}.sh" {
pkgs.runCommand "nspawn-setup-${hostname}.sh" {
nativeBuildInputs = with pkgs; [ makeself ];
} ''
mkdir -p archive/

View File

@@ -35,7 +35,7 @@
# ./home/profiles/desktop (gnome)
home-manager.users.pbsds.imports = [
(
if config.services.xserver.desktopManager.gnome.enable then
if config.services.desktopManager.gnome.enable then
./home/profiles/desktop/gnome
else
./home/profiles/comfy

View File

@@ -19,7 +19,7 @@
unstable.deadnix
unstable.statix
# unstable.nixtract
unstable.nixfmt-rfc-style
unstable.nixfmt
nurl
# manix
# comma # collides with nix-index-database

View File

@@ -8,7 +8,7 @@
# onChange = ''
# ${lib.getExe pkgs.ghostty} +validate-config --config-file=${./ghosty.config}
# '';
source = pkgs.runCommandNoCC "validated-ghosty.config" {
source = pkgs.runCommand "validated-ghosty.config" {
preferLocalBuild = true;
nativeBuildInputs = [ pkgs.ghostty ];
} ''

View File

@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p dconf2nix sd nixfmt-rfc-style
#!nix-shell -i bash -p dconf2nix sd nixfmt
set -euo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"

View File

@@ -23,7 +23,7 @@
shfmt # bash
nixd # nix
nil # nix
unstable.nixfmt-rfc-style # nix
unstable.nixfmt # nix
harper # harper
# vale-ls vale # vale, will nag a lot if no vale config present in project
typos-lsp # typos

View File

@@ -1,12 +1,13 @@
{ config, lib, ... }:
{
programs.git.enable = true;
#programs.git.userName = "pbsds"
programs.git.userName = "Peder Bergebakken Sundt";
programs.git.userEmail = "pbsds@hotmail.com";
#programs.git.settings.user.name = "pbsds"
programs.git.settings.user.name = "Peder Bergebakken Sundt";
programs.git.settings.user.email = "pbsds@hotmail.com";
programs.git.delta.enable = true;
programs.git.delta.options = {
programs.delta.enable = true;
programs.delta.enableGitIntegration = true;
programs.delta.options = {
# Delta uses ~/.gitconfig even when not invoked by git
tabs = 4;
max-line-length = 0;
@@ -14,22 +15,22 @@
};
# # sign commits with ssh key
# programs.git.extraConfig.gpg.format = "ssh";
# programs.git.settings.gpg.format = "ssh";
# programs.git.signing.key = "${config.home.homeDirectory}/.ssh/my-key.pub";
# programs.git.signing.signByDefault = true;
# https://jvns.ca/blog/2024/02/16/popular-git-config-options/
programs.git.extraConfig.rerere.enabled = true;
#programs.git.extraConfig.help.autocorrect = "prompt";
programs.git.extraConfig.transfer.fsckobjects = true;
programs.git.extraConfig.fetch.fsckobjects = true;
programs.git.extraConfig.receive.fsckObjects = true;
programs.git.extraConfig.branch.sort = "-committerdate";
programs.git.extraConfig.tag.sort = "taggerdate";
programs.git.extraConfig.fetch.prune = true;
programs.git.extraConfig.fetch.prunetags = true;
programs.git.extraConfig.log.date = "iso";
# programs.git.extraConfig.interactive.singleKey = true;
programs.git.settings.rerere.enabled = true;
#programs.git.settings.help.autocorrect = "prompt";
programs.git.settings.transfer.fsckobjects = true;
programs.git.settings.fetch.fsckobjects = true;
programs.git.settings.receive.fsckObjects = true;
programs.git.settings.branch.sort = "-committerdate";
programs.git.settings.tag.sort = "taggerdate";
programs.git.settings.fetch.prune = true;
programs.git.settings.fetch.prunetags = true;
programs.git.settings.log.date = "iso";
# programs.git.settings.interactive.singleKey = true;
programs.git.iniContent.init.defaultBranch = "main";
programs.git.ignores = [

View File

@@ -22,8 +22,21 @@
'';
programs.ssh.enable = true;
programs.ssh.controlMaster = "yes";
programs.ssh.compression = true;
programs.ssh.enableDefaultConfig = false;
# programs.ssh.matchBlocks."*".controlMaster = "yes";
# programs.ssh.matchBlocks."*".compression = true;
programs.ssh.matchBlocks."*" = {
# forwardAgent = false;
# addKeysToAgent = "no";
# serverAliveInterval = 0;
# serverAliveCountMax = 3;
# hashKnownHosts = false;
compression = true;
userKnownHostsFile = "~/.ssh/known_hosts";
controlMaster = "yes";
controlPath = "~/.ssh/master-%r@%n:%p";
controlPersist = "no";
};
programs.ssh.includes = [ "~/.ssh/config.d/*" ];
programs.ssh.matchBlocks = {
"*".serverAliveInterval = 10;