disable girt for now
This commit is contained in:
Daniel Olsen
parent
aca058dbae
commit
a8649e9b2f
95
flake.lock
generated
95
flake.lock
generated
@ -3,11 +3,11 @@
|
||||
"crane": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1661875961,
|
||||
"narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=",
|
||||
"lastModified": 1670900067,
|
||||
"narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24",
|
||||
"rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -68,6 +68,7 @@
|
||||
"nci",
|
||||
"devshell"
|
||||
],
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-utils-pre-commit": [
|
||||
"helix",
|
||||
"nci"
|
||||
@ -84,6 +85,10 @@
|
||||
"helix",
|
||||
"nci"
|
||||
],
|
||||
"nix-pypi-fetcher": [
|
||||
"helix",
|
||||
"nci"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"helix",
|
||||
"nci",
|
||||
@ -99,11 +104,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1668851003,
|
||||
"narHash": "sha256-X7RCQQynbxStZR2m7HW38r/msMQwVl3afD6UXOCtvx4=",
|
||||
"lastModified": 1671323629,
|
||||
"narHash": "sha256-9KHTPjIDjfnzZ4NjpE3gGIVHVHopy6weRDYO/7Y3hF8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "dream2nix",
|
||||
"rev": "c77e8379d8fe01213ba072e40946cbfb7b58e628",
|
||||
"rev": "2d7d68505c8619410df2c6b6463985f97cbcba6e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -112,6 +117,24 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1668450977,
|
||||
"narHash": "sha256-cfLhMhnvXn6x1vPm+Jow3RiFAUSCw/l1utktCw5rVA4=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "d591857e9d7dd9ddbfba0ea02b43b927c3c0f1fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1659877975,
|
||||
@ -151,11 +174,11 @@
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1669912658,
|
||||
"narHash": "sha256-U2nF7FyRFD59zHfy+3IaiPmFu7MdgyA5TYDBbUikoA4=",
|
||||
"lastModified": 1671804785,
|
||||
"narHash": "sha256-vQA5zqnAgws8zxR6G/TFAqjBUYPbqWsE6LxRLnffjYg=",
|
||||
"owner": "helix-editor",
|
||||
"repo": "helix",
|
||||
"rev": "a8a54be6bcd0667c50b7c739dbfd072df684b3c3",
|
||||
"rev": "24c3b00d10858a02c6c1c351a7509e204c2bc647",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -172,11 +195,11 @@
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1669724862,
|
||||
"narHash": "sha256-GwLonjmyhnTGQRNfKcUCgMSKYj49ZehjjJulaM/yH18=",
|
||||
"lastModified": 1670253003,
|
||||
"narHash": "sha256-/tJIy4+FbsQyslq1ipyicZ2psOEd8dvl4OJ9lfisjd0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "e891b060e7d11bb8f7dedb86a41d804891a6f5a9",
|
||||
"rev": "0e8125916b420e41bf0d23a0aa33fadd0328beb3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -200,11 +223,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1669011203,
|
||||
"narHash": "sha256-Lymj4HktNEFmVXtwI0Os7srDXHZbZW0Nzw3/+5Hf8ko=",
|
||||
"lastModified": 1671430291,
|
||||
"narHash": "sha256-UIc7H8F3N8rK72J/Vj5YJdV72tvDvYjH+UPsOFvlcsE=",
|
||||
"owner": "yusdacra",
|
||||
"repo": "nix-cargo-integration",
|
||||
"rev": "c5133b91fc1d549087c91228bd213f2518728a4b",
|
||||
"rev": "b1b0d38b8c3b0d0e6a38638d5bbe10b0bc67522c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -236,11 +259,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1669834992,
|
||||
"narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=",
|
||||
"lastModified": 1671752829,
|
||||
"narHash": "sha256-oFeJzAq0iRL6md9Si8Tx9bltjwjLmldvgUmAteMhYW4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502",
|
||||
"rev": "9898811c658d39b2692d0ab744377e02fd85d08b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -250,13 +273,31 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
"lastModified": 1665349835,
|
||||
"narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"dir": "lib",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1669805596,
|
||||
"narHash": "sha256-g1CPQZ+1jGhY4bsjppk+gH5jfzzqmPlqGHg0zSYS3Hw=",
|
||||
"lastModified": 1671811449,
|
||||
"narHash": "sha256-x3lmyHkfaDapYaMgKV3olLAxsdF36xvQFxnEUMVdydM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "c81b1e527f3a220abfa9bf8096153d52784c5007",
|
||||
"rev": "e369ab33b7d8efc7821335b1e369ae0a7cfa62c5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -285,11 +326,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1668998422,
|
||||
"narHash": "sha256-G/BklIplCHZEeDIabaaxqgITdIXtMolRGlwxn9jG2/Q=",
|
||||
"lastModified": 1671416426,
|
||||
"narHash": "sha256-kpSH1Jrxfk2qd0pRPJn1eQdIOseGv5JuE+YaOrqU9s4=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "68ab029c93f8f8eed4cf3ce9a89a9fd4504b2d6e",
|
||||
"rev": "fbaaff24f375ac25ec64268b0a0d63f91e474b7d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -300,11 +341,11 @@
|
||||
},
|
||||
"unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1669867399,
|
||||
"narHash": "sha256-Z8RXSFYOsIsTG96ROKtV0eZ8Q7u4irFWm6ELqfw7mT8=",
|
||||
"lastModified": 1671788672,
|
||||
"narHash": "sha256-tLkPxJuos3jki2f/TZdHn+NuMQAzN9s2E4QudylQLg0=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "38e591dd05ffc8bdf79dc752ba78b05e370416fa",
|
||||
"rev": "2c74fcd6c5fc14a61de158fb796243543f46b217",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@ -139,33 +139,6 @@ in
|
||||
extensions = with pkgs.nur.repos.rycee.firefox-addons; [ bitwarden cookies-txt https-everywhere metamask no-pdf-download sponsorblock ublock-origin ];
|
||||
};
|
||||
|
||||
services.espanso = {
|
||||
enable = config.profiles.gui.enable;
|
||||
settings = {
|
||||
matches = [
|
||||
{ # Dates
|
||||
trigger = ":date";
|
||||
replace = "{{mydate}}";
|
||||
vars = [{
|
||||
name = "mydate";
|
||||
type = "date";
|
||||
params = { format = "%Y-%m-%d"; };
|
||||
}];
|
||||
}
|
||||
{
|
||||
regex = ":c(?P<expr>.*?):";
|
||||
replace = "{{result}}";
|
||||
vars = [{
|
||||
name = "result";
|
||||
type = "shell";
|
||||
params = {
|
||||
cmd = "expr $ESPANSO_EXPR";
|
||||
};
|
||||
}];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
programs.obs-studio.enable = (config.profiles.gui.enable && cfg.plus);
|
||||
|
||||
@ -253,21 +226,21 @@ in
|
||||
];
|
||||
extraConfig = {
|
||||
pull.rebase = true;
|
||||
sequence.editor = let
|
||||
girt = pkgs.unstable.git-interactive-rebase-tool.overrideAttrs (old: rec {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "Dali99";
|
||||
repo = "git-interactive-rebase-tool";
|
||||
rev = "590f87d8ed16992373e214bca5994f89c69fa942";
|
||||
sha256 = "sha256-vUjqnt5ZSpzoohkzDXEqTMhMEkYzPMUZiaYWS0ZQcPQ=";
|
||||
};
|
||||
cargoDeps = old.cargoDeps.overrideAttrs (oldB: {
|
||||
name = "${oldB.name}";
|
||||
inherit src;
|
||||
outputHash = "sha256-/I465/PlOckvov9PgSCg7CN5hEKeeQCw8rPsvpKJons=";
|
||||
});
|
||||
});
|
||||
in "${girt}/bin/interactive-rebase-tool";
|
||||
# sequence.editor = let
|
||||
# girt = pkgs.unstable.git-interactive-rebase-tool.overrideAttrs (old: rec {
|
||||
# src = pkgs.fetchFromGitHub {
|
||||
# owner = "Dali99";
|
||||
# repo = "git-interactive-rebase-tool";
|
||||
# rev = "590f87d8ed16992373e214bca5994f89c69fa942";
|
||||
# sha256 = "sha256-vUjqnt5ZSpzoohkzDXEqTMhMEkYzPMUZiaYWS0ZQcPQ=";
|
||||
# };
|
||||
# cargoDeps = old.cargoDeps.overrideAttrs (oldB: {
|
||||
# name = "${oldB.name}";
|
||||
# inherit src;
|
||||
# outputHash = "sha256-/I465/PlOckvov9PgSCg7CN5hEKeeQCw8rPsvpKJons=";
|
||||
# });
|
||||
# });
|
||||
# in "${girt}/bin/interactive-rebase-tool";
|
||||
};
|
||||
delta.enable = true;
|
||||
};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user