From 06d1a6aa166c43a0a851239467ec137e74ddf27a Mon Sep 17 00:00:00 2001 From: Noratrieb <48135649+Noratrieb@users.noreply.github.com> Date: Sun, 26 Oct 2025 22:02:21 +0100 Subject: [PATCH] update --- flake.lock | 54 ++++++++++++++++++++-------------------- home-manager/git.nix | 55 ++++++++++++++++++++++------------------- home-manager/vscode.nix | 1 + nixos/configuration.nix | 3 --- 4 files changed, 58 insertions(+), 55 deletions(-) diff --git a/flake.lock b/flake.lock index eb6b870..5bb1333 100644 --- a/flake.lock +++ b/flake.lock @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1760662441, - "narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=", + "lastModified": 1761510997, + "narHash": "sha256-4j7y341PW5igrw5hTu6k2fxFGV72oXuUtZ79P9K/Jmg=", "owner": "nix-community", "repo": "home-manager", - "rev": "722792af097dff5790f1a66d271a47759f477755", + "rev": "879e4d90607d8918fc5d9edc6603fdf22a49ac0e", "type": "github" }, "original": { @@ -92,11 +92,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1760700290, - "narHash": "sha256-thtIzWn8YB/zXfXR0Cv7pQ0ID8YTc05d9eedk1lu+zI=", + "lastModified": 1761474290, + "narHash": "sha256-ufbchtYD+mTCdhmK8Mld4qzN89TN4cxceOTXtIjLAGA=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b80575644cb2bf9eb0050974dcd988e781ffd340", + "rev": "d68e48d09510bc7b0724e25da8eab868189c7084", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1760524031, - "narHash": "sha256-hcyRViwdsrNUjHTcY0VGygcAawcyU4zYEq7ZZObFwkw=", + "lastModified": 1761460429, + "narHash": "sha256-pJeM23DGMD5AK4gdNaDM1qsIv87NYQJgEh2E8tRd7es=", "owner": "YaLTeR", "repo": "niri", - "rev": "2776005c5fc4fbb85636672213b8b84a319dfb01", + "rev": "e6f3c538da0c646bda43fcde7ef7dc3b771e0c8b", "type": "github" }, "original": { @@ -140,11 +140,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1760580664, - "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=", + "lastModified": 1761173472, + "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389", + "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", "type": "github" }, "original": { @@ -188,11 +188,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -204,11 +204,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -224,11 +224,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1760713169, - "narHash": "sha256-cMg/qFCRn/KGpx9ND7ClRB+BbHt3V4i/+5AY4+H+TxI=", + "lastModified": 1761511178, + "narHash": "sha256-ovwKkvzZcbx/lcX9N1c5b29RHTRr4B5bQGBlCHwgMBc=", "owner": "nix-community", "repo": "NUR", - "rev": "2104f9e6e08ac74addfddb4175f6d5268040edd4", + "rev": "2138a40d14e8ee0e9918fa7060d05c08efc4d23c", "type": "github" }, "original": { @@ -268,11 +268,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1759707084, - "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=", + "lastModified": 1761422250, + "narHash": "sha256-+pN8VAh8OVUSj8zPoI8QfC93JMIKPaAOABrbeeiO/Hk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "a9188e70bd748118b4d56a529871b9de5adb9988", + "rev": "2dd40ecfe882c1659e0e46c761974702c7ab5fde", "type": "github" }, "original": { diff --git a/home-manager/git.nix b/home-manager/git.nix index 020ee74..d523fb8 100644 --- a/home-manager/git.nix +++ b/home-manager/git.nix @@ -2,32 +2,32 @@ programs.git = { enable = true; - userEmail = "48135649+Noratrieb@users.noreply.github.com"; - userName = "Noratrieb"; + settings = { + user = { + name = "Noratrieb"; + email = "48135649+Noratrieb@users.noreply.github.com"; + }; + + alias = { + # simple aliases + c = "checkout"; + st = "status"; + p = "push"; + rc = "rebase --continue"; + ra = "rebase --abort"; + amend = "commit --amend --no-edit"; + # complex renames + hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\""; + fpush = "push --force-with-lease"; + resq = "rebase --autosquash -i"; + autosquash = "!${lib.getExe pkgs.git-revise} -i $(git merge-base HEAD origin/HEAD) --autosquash"; + autosq = "autosquash"; + pfush = "!echo \"hör uf ume z'pfusche und machs richtig\""; + sw = "!git checkout $(git branch --format \"%(refname:lstrip=2)\" | ${lib.getExe' pkgs.fzf "fzf"})"; + # lol + build = "!cargo build"; + }; - aliases = { - # simple aliases - c = "checkout"; - st = "status"; - p = "push"; - rc = "rebase --continue"; - ra = "rebase --abort"; - amend = "commit --amend --no-edit"; - # complex renames - hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\""; - fpush = "push --force-with-lease"; - resq = "rebase --autosquash -i"; - autosquash = "!${lib.getExe pkgs.git-revise} -i $(git merge-base HEAD origin/HEAD) --autosquash"; - autosq = "autosquash"; - pfush = "!echo \"hör uf ume z'pfusche und machs richtig\""; - sw = "!git checkout $(git branch --format \"%(refname:lstrip=2)\" | ${lib.getExe' pkgs.fzf "fzf"})"; - # lol - build = "!cargo build"; - }; - difftastic = { - enable = true; - }; - extraConfig = { # TODO: See https://jvns.ca/blog/2024/02/16/popular-git-config-options core.autocrlf = false; core.editor = "${lib.getExe pkgs.neovim}"; @@ -46,4 +46,9 @@ "url \"git@gist.github.com:\"".pushInsteadOf = "https://gist.github.com/"; }; }; + + programs.difftastic = { + enable = true; + git.enable = true; + }; } diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix index 2757448..cadf51d 100644 --- a/home-manager/vscode.nix +++ b/home-manager/vscode.nix @@ -56,6 +56,7 @@ "terminal.integrated.stickyScroll.enabled" = false; "chat.agent.enabled" = false; "workbench.secondarySideBar.defaultVisibility" = "hidden"; # fuck you for this naming, this is just ai garbage + "chat.disableAIFeatures" = true; }; extensions = with pkgs.vscode-extensions; [ bmalehorn.vscode-fish diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 4f4d3ab..989d599 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -178,9 +178,6 @@ packages = with pkgs; [ fira-code monaspace font-awesome ]; }; - - services.nixseparatedebuginfod.enable = true; - users = { users = { nora = {