From 700b48615fad5fb4cef6571b287596b0b333a2ec Mon Sep 17 00:00:00 2001 From: Alexander Date: Tue, 7 Apr 2026 17:16:50 +0200 Subject: [PATCH] Add fuck --- flake.lock | 155 ++++++++++++++++++++++++++++++++++- flake.nix | 2 + machines/fujin/main/home.nix | 5 +- 3 files changed, 156 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 6d3dd45..08dcbf4 100644 --- a/flake.lock +++ b/flake.lock @@ -232,6 +232,24 @@ "inputs": { "systems": "systems_3" }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -895,6 +913,22 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1682134069, "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", @@ -908,7 +942,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1773389992, "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", @@ -972,6 +1006,56 @@ "type": "github" } }, + "pyproject-build-systems": { + "inputs": { + "nixpkgs": [ + "thefuck", + "nixpkgs" + ], + "pyproject-nix": [ + "thefuck", + "pyproject-nix" + ], + "uv2nix": [ + "thefuck", + "uv2nix" + ] + }, + "locked": { + "lastModified": 1773870109, + "narHash": "sha256-ZoTdqZP03DcdoyxvpFHCAek4bkPUTUPUF3oCCgc3dP4=", + "owner": "pyproject-nix", + "repo": "build-system-pkgs", + "rev": "b6e74f433b02fa4b8a7965ee24680f4867e2926f", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "build-system-pkgs", + "type": "github" + } + }, + "pyproject-nix": { + "inputs": { + "nixpkgs": [ + "thefuck", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1775439158, + "narHash": "sha256-NHY9SJNU019n+8NCabBDtmuzRFeE2gZlYKHowp9bV24=", + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "rev": "fb6b728260f3f32761367e9fd1e1a25b4245bcd0", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "type": "github" + } + }, "root": { "inputs": { "copyparty": "copyparty", @@ -988,6 +1072,7 @@ "sops-nix": "sops-nix", "split-monitor-workspaces": "split-monitor-workspaces", "stylix": "stylix", + "thefuck": "thefuck", "unstable": "unstable", "unstable-home-manager": "unstable-home-manager", "vscode-server": "vscode-server", @@ -1114,6 +1199,43 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "thefuck": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_6", + "pyproject-build-systems": "pyproject-build-systems", + "pyproject-nix": "pyproject-nix", + "uv2nix": "uv2nix" + }, + "locked": { + "lastModified": 1775480016, + "narHash": "sha256-DXsHc7JC1Ffm2win6oCZHu966YJR37Hy3J25UGXt9Eo=", + "owner": "LichHunter", + "repo": "thefuck", + "rev": "c1145c95d9bde53ec912e493c7c8e6ccc74b136d", + "type": "github" + }, + "original": { + "owner": "LichHunter", + "repo": "thefuck", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -1232,10 +1354,35 @@ "type": "github" } }, + "uv2nix": { + "inputs": { + "nixpkgs": [ + "thefuck", + "nixpkgs" + ], + "pyproject-nix": [ + "thefuck", + "pyproject-nix" + ] + }, + "locked": { + "lastModified": 1775386139, + "narHash": "sha256-n82p7WF+dYxf5r01pXlqbk8CAF7xX0Tk7wAcmMjkuhc=", + "owner": "pyproject-nix", + "repo": "uv2nix", + "rev": "3cffcee173635d553e213d11418690b5290ff1c9", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "uv2nix", + "type": "github" + } + }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_6" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1770124655, @@ -1295,7 +1442,7 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1774848370, diff --git a/flake.nix b/flake.nix index 4f0967f..8f22d4f 100644 --- a/flake.nix +++ b/flake.nix @@ -67,6 +67,8 @@ zen-browser.url = "github:0xc000022070/zen-browser-flake"; minegrub-theme.url = "github:Lxtharia/minegrub-theme"; + + thefuck.url = "github:LichHunter/thefuck"; }; outputs = { diff --git a/machines/fujin/main/home.nix b/machines/fujin/main/home.nix index c41b5e8..12ee2de 100644 --- a/machines/fujin/main/home.nix +++ b/machines/fujin/main/home.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, username, ... }: +{ inputs, config, lib, pkgs, username, ... }: { home = { @@ -32,6 +32,7 @@ nixos-test = "sudo nixos-rebuild test --flake ~/nixos/#${username}"; nixos-switch = "sudo nixos-rebuild switch --flake ~/nixos/#${username}"; nixos-boot = "sudo nixos-rebuild boot --flake ~/nixos/#${username}"; + fuck = "thefuck $\"(history | last 1 | get command | get 0)\""; }; }; @@ -148,7 +149,7 @@ # gaming prismlauncher - ]; + ] ++ [ inputs.thefuck.packages.${pkgs.system}.default ]; stylix = { enable = true;