Dandellion
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Dandellion:b9ea792ddce47d915779deed29e333528455f305
Branches Tags
Dandellion:master
Dandellion:23.05
..
compare: Dandellion:80fae0b504d622a81c3549770d47d55115fbda41
Branches Tags
Dandellion:master
Dandellion:23.05

No commits in common. "b9ea792ddce47d915779deed29e333528455f305" and "80fae0b504d622a81c3549770d47d55115fbda41" have entirely different histories.
b9ea792ddc ... 80fae0b504

4 changed files with 60 additions and 75 deletions
Show Stats Expand all files Collapse all files

109
flake.lock
View File

@ -1,22 +1,5 @@
{ {
"nodes": { "nodes": {
"all-cabal-json": {
"flake": false,
"locked": {
"lastModified": 1665552503,
"narHash": "sha256-r14RmRSwzv5c+bWKUDaze6pXM7nOsiz1H8nvFHJvufc=",
"owner": "nix-community",
"repo": "all-cabal-json",
"rev": "d7c0434eebffb305071404edcf9d5cd99703878e",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "hackage",
"repo": "all-cabal-json",
"type": "github"
}
},
"crane": { "crane": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -40,27 +23,29 @@
] ]
}, },
"locked": { "locked": {
"host": "git.dodsorf.as",
"lastModified": 1656687988, "lastModified": 1656687988,
"narHash": "sha256-2ywoy3wUvFAyxDTw7VPlz5TGh9mk/um2AWOjhJqJxNQ=", "narHash": "sha256-2ywoy3wUvFAyxDTw7VPlz5TGh9mk/um2AWOjhJqJxNQ=",
"ref": "master", "owner": "Dandellion",
"repo": "NUR",
"rev": "7e85f62e40cd585ce81fa1f3debd5385bb0cad03", "rev": "7e85f62e40cd585ce81fa1f3debd5385bb0cad03",
"revCount": 160, "type": "gitlab"
"type": "git",
"url": "https://git2.dodsorf.as/Dandellion/NUR.git"
}, },
"original": { "original": {
"type": "git", "host": "git.dodsorf.as",
"url": "https://git2.dodsorf.as/Dandellion/NUR.git" "owner": "Dandellion",
"repo": "NUR",
"type": "gitlab"
} }
}, },
"devshell": { "devshell": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1667210711, "lastModified": 1660811669,
"narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=", "narHash": "sha256-V6lmsaLNFz41myppL0yxglta92ijkSvpZ+XVygAh+bU=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7", "rev": "c2feacb46ee69949124c835419861143c4016fb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -76,7 +61,6 @@
"nci", "nci",
"nixpkgs" "nixpkgs"
], ],
"all-cabal-json": "all-cabal-json",
"crane": "crane", "crane": "crane",
"devshell": [ "devshell": [
"helix", "helix",
@ -88,7 +72,6 @@
"nci", "nci",
"nixpkgs" "nixpkgs"
], ],
"ghc-utils": "ghc-utils",
"gomod2nix": [ "gomod2nix": [
"helix", "helix",
"nci", "nci",
@ -116,11 +99,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1667429039, "lastModified": 1662176993,
"narHash": "sha256-Lu6da25JioHzerkLHAHSO9suCQFzJ/XBjkcGCIbasLM=", "narHash": "sha256-Sy7DsGAveDUFBb6YDsUSYZd/AcXfP/MOMIwMt/NgY84=",
"owner": "nix-community", "owner": "nix-community",
"repo": "dream2nix", "repo": "dream2nix",
"rev": "5252794e58eedb02d607fa3187ffead7becc81b0", "rev": "809bc5940214744eb29778a9a0b03f161979c1b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -131,11 +114,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1656928814,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -159,22 +142,6 @@
"type": "github" "type": "github"
} }
}, },
"ghc-utils": {
"flake": false,
"locked": {
"lastModified": 1662774800,
"narHash": "sha256-1Rd2eohGUw/s1tfvkepeYpg8kCEXiIot0RijapUjAkE=",
"ref": "refs/heads/master",
"rev": "bb3a2d3dc52ff0253fb9c2812bd7aa2da03e0fea",
"revCount": 1072,
"type": "git",
"url": "https://gitlab.haskell.org/bgamari/ghc-utils"
},
"original": {
"type": "git",
"url": "https://gitlab.haskell.org/bgamari/ghc-utils"
}
},
"helix": { "helix": {
"inputs": { "inputs": {
"nci": "nci", "nci": "nci",
@ -184,11 +151,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1668522840, "lastModified": 1662645858,
"narHash": "sha256-lM2yg9+wDwBupmtgkARd3yx3Q6viDdbPIeTstL+CyFs=", "narHash": "sha256-KvZpyPfugKwis6lKQpuZYFkqa3HGjfqaRIfRO+qxH/E=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "df6d04425d130f385c4314ed944d5a27963ae9a3", "rev": "5ab85283e944b9b0409c70953c7655b9c5f84067",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -204,11 +171,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1667907331, "lastModified": 1656169755,
"narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5", "rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -232,11 +199,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1667542401, "lastModified": 1662177071,
"narHash": "sha256-mdWjP5tjSf8n6FAtpSgL23kX4+eWBwLrSYo9iY3mA8Q=", "narHash": "sha256-x6XF//RdZlw81tFAYM1TkjY+iQIpyMCWZ46r9o4wVQY=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "nix-cargo-integration", "repo": "nix-cargo-integration",
"rev": "cd5e5cbd81c80dc219455dd3b1e0ddb55fae51ec", "rev": "65270dea87bb82fc02102a15221677eea237680e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -268,11 +235,11 @@
}, },
"nixos-2205": { "nixos-2205": {
"locked": { "locked": {
"lastModified": 1668459637, "lastModified": 1662099760,
"narHash": "sha256-HqnWCKujmtu8v0CjzOT0sr7m2AR7+vpbZJOp1R0rodY=", "narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "16f4e04658c2ab10114545af2f39db17d51bd1bd", "rev": "67e45078141102f45eff1589a831aeaa3182b41e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -284,11 +251,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1668524723, "lastModified": 1662661687,
"narHash": "sha256-JIJ0MtvY23I/6aIsqi8CG67XWZ/34WtDcgFXxgSTvNU=", "narHash": "sha256-ze1bQpIad0S7ofPBteBfl+E4e7FQ87PQFyrZT5QI2VY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "8e8775f99549ba721c11643dfe70f4161d5c2f0b", "rev": "cbd713ef9bb050c5859466d97dc692c29e4e5195",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -317,11 +284,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1667487142, "lastModified": 1662087605,
"narHash": "sha256-bVuzLs1ZVggJAbJmEDVO9G6p8BH3HRaolK70KXvnWnU=", "narHash": "sha256-Gpf2gp2JenKGf+TylX/YJpttY2bzsnvAMLdLaxoZRyU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "cf668f737ac986c0a89e83b6b2e3c5ddbd8cf33b", "rev": "60c2cfaa8b90ed8cebd18b214fac8682dcf222dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -332,11 +299,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1668475027, "lastModified": 1662096612,
"narHash": "sha256-1xDT1pAm+NpH6cnjoC4v+xWGoGimiWZnth2bX899RKA=", "narHash": "sha256-R+Q8l5JuyJryRPdiIaYpO5O3A55rT+/pItBrKcy7LM4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "032b5c19b09e8bb9b80eba484b58d1b525dc609d", "rev": "21de2b973f9fee595a7a1ac4693efff791245c34",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View File

@ -14,7 +14,7 @@
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
nur.inputs.nixpkgs.follows = "unstable"; nur.inputs.nixpkgs.follows = "unstable";
dan.url = "git+https://git2.dodsorf.as/Dandellion/NUR.git"; #"git+https://git.dodsorf.as/Dandellion/NUR"; dan.url = "gitlab:Dandellion/NUR?host=git.dodsorf.as"; #"git+https://git.dodsorf.as/Dandellion/NUR";
dan.inputs.nixpkgs.follows = "unstable"; dan.inputs.nixpkgs.follows = "unstable";
helix.url = "github:helix-editor/helix"; helix.url = "github:helix-editor/helix";

19
overlays/libaom.nix Normal file
View File

@ -0,0 +1,19 @@
self: super:
{
mylibaom = super.libaom.overrideAttrs (old: rec {
version = "1.0.0-a5e3f02b186";
src = super.fetchgit {
url = "https://aomedia.googlesource.com/aom";
rev = "a5e3f02b18668957bbd054a1058cb190f298ca6f";
sha256 = "1i7lk91rdwviqnmxc6k2ihjqx5glf6siirnlhyi50vbqwgpjiyv4";
};
cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_INSTALL_BINDIR=bin"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
];
});
}

5
profiles/base/default.nix
View File

@ -45,7 +45,7 @@ in
home.packages = with pkgs; [ home.packages = with pkgs; [
unstable.nix-output-monitor nix-output-monitor
nix-top nix-top
nix-index nix-index
nix-tree nix-tree
@ -218,7 +218,6 @@ in
}; };
ignores = [ ignores = [
".direnv" ".direnv"
".vscode"
]; ];
extraConfig = { extraConfig = {
pull.rebase = true; pull.rebase = true;
@ -233,7 +232,7 @@ in
cargoDeps = old.cargoDeps.overrideAttrs (oldB: { cargoDeps = old.cargoDeps.overrideAttrs (oldB: {
name = "${oldB.name}"; name = "${oldB.name}";
inherit src; inherit src;
outputHash = "sha256-/I465/PlOckvov9PgSCg7CN5hEKeeQCw8rPsvpKJons="; outputHash = "197dv8hbj4vd9grvhiinpsww3vfmmbl9b8gxk7la4gs8535s08x7";
}); });
}); });
in "${girt}/bin/interactive-rebase-tool"; in "${girt}/bin/interactive-rebase-tool";