Compare commits
No commits in common. "b60a4e2b535cf0bdf3731ed497700c013db35f52" and "c8509fbf7b7c77e2e72a67cee89d97d02b1cdb8f" have entirely different histories.
b60a4e2b53
...
c8509fbf7b
12 changed files with 211 additions and 617 deletions
444
flake.lock
generated
444
flake.lock
generated
|
|
@ -37,18 +37,17 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"nix-github-actions": "nix-github-actions",
|
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"stable": "stable"
|
"stable": "stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731093438,
|
"lastModified": 1728263678,
|
||||||
"narHash": "sha256-n1UeNT2PrbOlLNa+EhFMrniUN4BtGqCw9R9/qWpzNEA=",
|
"narHash": "sha256-gyUVsPAWY9AgVKjrNPoowrIr5BvK4gI0UkDXvv8iSxA=",
|
||||||
"owner": "zhaofengli",
|
"owner": "zhaofengli",
|
||||||
"repo": "colmena",
|
"repo": "colmena",
|
||||||
"rev": "c4d72269affff3abbe7175d363e6c0edf1b0e167",
|
"rev": "b0a62f234fae02a006123e661ff70e62af16106b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -59,11 +58,11 @@
|
||||||
},
|
},
|
||||||
"crane": {
|
"crane": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730652660,
|
"lastModified": 1730060262,
|
||||||
"narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=",
|
"narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=",
|
||||||
"owner": "ipetkov",
|
"owner": "ipetkov",
|
||||||
"repo": "crane",
|
"repo": "crane",
|
||||||
"rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458",
|
"rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -72,27 +71,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"devshell": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixvim",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1728330715,
|
|
||||||
"narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "devshell",
|
|
||||||
"rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "devshell",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"disko": {
|
"disko": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
@ -140,11 +118,11 @@
|
||||||
"rust-analyzer-src": "rust-analyzer-src"
|
"rust-analyzer-src": "rust-analyzer-src"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730788380,
|
"lastModified": 1730442928,
|
||||||
"narHash": "sha256-jzniRMqEjqYC7yyx0nIiiEnQ4xlZQMnA7R6mvyYZER8=",
|
"narHash": "sha256-U1DWb5c3EfkA7pqx5V1H4AWRA+EaE6UJ0lIRvK1RxgM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "fenix",
|
"repo": "fenix",
|
||||||
"rev": "280efe0e9b7b824518091a5aff76065785f81649",
|
"rev": "87b4d20f896c99018dde4702a9c6157b516f2a76",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -200,46 +178,16 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat_4": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1696426674,
|
|
||||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
|
||||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
|
||||||
"revCount": 57,
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat_5": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1696426674,
|
|
||||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-parts": {
|
"flake-parts": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730504689,
|
"lastModified": 1727826117,
|
||||||
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
|
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
|
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -291,27 +239,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-parts_4": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs-lib": [
|
|
||||||
"nixvim",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1730504689,
|
|
||||||
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1659877975,
|
"lastModified": 1659877975,
|
||||||
|
|
@ -347,7 +274,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils_3": {
|
"flake-utils_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_3"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726560853,
|
"lastModified": 1726560853,
|
||||||
|
|
@ -365,7 +292,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils_4": {
|
"flake-utils_4": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_4"
|
"systems": "systems_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1710146030,
|
||||||
|
|
@ -396,77 +323,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"git-hooks": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-compat": "flake-compat_5",
|
|
||||||
"gitignore": "gitignore",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixvim",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"nixpkgs-stable": [
|
|
||||||
"nixvim",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1730814269,
|
|
||||||
"narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "git-hooks.nix",
|
|
||||||
"rev": "d70155fdc00df4628446352fc58adc640cd705c2",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "git-hooks.nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"gitignore": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixvim",
|
|
||||||
"git-hooks",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1709087332,
|
|
||||||
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "gitignore.nix",
|
|
||||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "gitignore.nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixvim",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1726989464,
|
|
||||||
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"ref": "release-24.05",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"jay": {
|
"jay": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -489,11 +345,11 @@
|
||||||
"nixpkgs-lib": "nixpkgs-lib_2"
|
"nixpkgs-lib": "nixpkgs-lib_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730635946,
|
"lastModified": 1730031145,
|
||||||
"narHash": "sha256-CdeoMnMXpCq4wBWEWHfUUs68zoyAJLfp1JmfXWtmAgc=",
|
"narHash": "sha256-GZz0LGkeduajnF7zUuPu5evNyoOATcSsRZCkG1OqiwY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "lib-aggregate",
|
"repo": "lib-aggregate",
|
||||||
"rev": "d0ecc1890f77e9e170f2de279d6902d84a0cbc51",
|
"rev": "7d235f23a84b54c39b1579b68b13e1ff83f5b1ad",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -514,32 +370,11 @@
|
||||||
"url": "https://www.stefanjunker.de/downloads/Logseq-0.10.9.AppImage"
|
"url": "https://www.stefanjunker.de/downloads/Logseq-0.10.9.AppImage"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nix-darwin": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixvim",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1731153869,
|
|
||||||
"narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=",
|
|
||||||
"owner": "lnl7",
|
|
||||||
"repo": "nix-darwin",
|
|
||||||
"rev": "5c74ab862c8070cbf6400128a1b56abb213656da",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "lnl7",
|
|
||||||
"repo": "nix-darwin",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nix-eval-jobs": {
|
"nix-eval-jobs": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts_3",
|
"flake-parts": "flake-parts_3",
|
||||||
"nix-github-actions": "nix-github-actions_2",
|
"nix-github-actions": "nix-github-actions",
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"treefmt-nix": "treefmt-nix_2"
|
"treefmt-nix": "treefmt-nix_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -557,27 +392,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nix-github-actions": {
|
"nix-github-actions": {
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"colmena",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1729742964,
|
|
||||||
"narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "nix-github-actions",
|
|
||||||
"rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "nix-github-actions",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nix-github-actions_2": {
|
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs-wayland",
|
"nixpkgs-wayland",
|
||||||
|
|
@ -606,11 +420,11 @@
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731030477,
|
"lastModified": 1730426202,
|
||||||
"narHash": "sha256-RhkVjPXsfkqK0Dn3zmaRIBkb0L7kexTdpOJ7ldByHtM=",
|
"narHash": "sha256-swwKpE3lrdvcSh6Hjyf/eSe/zPnsZgeVlSl+B4yBpeo=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-vscode-extensions",
|
"repo": "nix-vscode-extensions",
|
||||||
"rev": "35de68b66b5ac51a18c707fa7069151fc6dca168",
|
"rev": "96dcbddd24edc60ad47f41bb2a73e06099eba4af",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -619,26 +433,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nix4vscode": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs_2",
|
|
||||||
"rust-overlay": "rust-overlay",
|
|
||||||
"systems": "systems_2"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1730496654,
|
|
||||||
"narHash": "sha256-gRoV9Xa6l0Kz0Vzr3hL+KSb+lGyWob98ha+OqK+QjwM=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "nix4vscode",
|
|
||||||
"rev": "719a109d0e2357be98a00145e557e9eef85ec059",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "nix4vscode",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixos-anywhere": {
|
"nixos-anywhere": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"disko": "disko",
|
"disko": "disko",
|
||||||
|
|
@ -772,11 +566,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-2405": {
|
"nixpkgs-2405": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730741070,
|
"lastModified": 1730327045,
|
||||||
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
|
"narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
|
"rev": "080166c15633801df010977d9d7474b4a6c549d7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -804,23 +598,23 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730504152,
|
"lastModified": 1727825735,
|
||||||
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
|
"narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-lib_2": {
|
"nixpkgs-lib_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730595754,
|
"lastModified": 1729990941,
|
||||||
"narHash": "sha256-F6DyPKY2WAUf8fpaT9vQwwRUs74InQM36ng//h9wNhY=",
|
"narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "2376a861a1a15f05339245fbaa4422f2d1bdf485",
|
"rev": "7d68864343650322045894951602d6e82b5296d7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -831,11 +625,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730602179,
|
"lastModified": 1729973466,
|
||||||
"narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=",
|
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c",
|
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -847,11 +641,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730531603,
|
"lastModified": 1730200266,
|
||||||
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
|
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
|
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -863,11 +657,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-vscodium": {
|
"nixpkgs-vscodium": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730785428,
|
"lastModified": 1730200266,
|
||||||
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
|
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
|
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -882,14 +676,14 @@
|
||||||
"flake-compat": "flake-compat_3",
|
"flake-compat": "flake-compat_3",
|
||||||
"lib-aggregate": "lib-aggregate",
|
"lib-aggregate": "lib-aggregate",
|
||||||
"nix-eval-jobs": "nix-eval-jobs",
|
"nix-eval-jobs": "nix-eval-jobs",
|
||||||
"nixpkgs": "nixpkgs_5"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730824362,
|
"lastModified": 1730425081,
|
||||||
"narHash": "sha256-gRQr2K0vo2xuaPC8v11ZkViVlvj3SSn5DwzLYLhlEJ4=",
|
"narHash": "sha256-c8JK1Zuc9QjfLfbnAEtB3uHz5pd+RMgMiR263TEtwAs=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "c20dd1acb20fb0bb10671f43435ee7df7c6b8657",
|
"rev": "968d7a95604a2ec252ce9912199dfa9ec6410ff0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -899,38 +693,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1722421184,
|
|
||||||
"narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_3": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1722415718,
|
|
||||||
"narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "c3392ad349a5227f4a3464dce87bcc5046692fce",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixpkgs-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_4": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723221148,
|
"lastModified": 1723221148,
|
||||||
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
|
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
|
||||||
|
|
@ -946,13 +708,13 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730531603,
|
"lastModified": 1730200266,
|
||||||
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
|
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
|
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -962,34 +724,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixvim": {
|
|
||||||
"inputs": {
|
|
||||||
"devshell": "devshell",
|
|
||||||
"flake-compat": "flake-compat_4",
|
|
||||||
"flake-parts": "flake-parts_4",
|
|
||||||
"git-hooks": "git-hooks",
|
|
||||||
"home-manager": "home-manager",
|
|
||||||
"nix-darwin": "nix-darwin",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"treefmt-nix": "treefmt-nix_3"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1730550779,
|
|
||||||
"narHash": "sha256-2stntmqw/GBOVEoPV4oCLHZljpeSBfZn8wkcJpei+ng=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "nixvim",
|
|
||||||
"rev": "91c06026075f08a3c865fdc46cc6db8e2af35a1e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"ref": "nixos-24.05",
|
|
||||||
"repo": "nixvim",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ofi-pass": {
|
"ofi-pass": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -1057,7 +791,6 @@
|
||||||
"jay": "jay",
|
"jay": "jay",
|
||||||
"logseq_0_10_9_aarch64_appimage": "logseq_0_10_9_aarch64_appimage",
|
"logseq_0_10_9_aarch64_appimage": "logseq_0_10_9_aarch64_appimage",
|
||||||
"nix-vscode-extensions": "nix-vscode-extensions",
|
"nix-vscode-extensions": "nix-vscode-extensions",
|
||||||
"nix4vscode": "nix4vscode",
|
|
||||||
"nixos-anywhere": "nixos-anywhere",
|
"nixos-anywhere": "nixos-anywhere",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs-2405"
|
"nixpkgs-2405"
|
||||||
|
|
@ -1070,7 +803,6 @@
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"nixpkgs-vscodium": "nixpkgs-vscodium",
|
"nixpkgs-vscodium": "nixpkgs-vscodium",
|
||||||
"nixpkgs-wayland": "nixpkgs-wayland",
|
"nixpkgs-wayland": "nixpkgs-wayland",
|
||||||
"nixvim": "nixvim",
|
|
||||||
"ofi-pass": "ofi-pass",
|
"ofi-pass": "ofi-pass",
|
||||||
"openvscode-server": "openvscode-server",
|
"openvscode-server": "openvscode-server",
|
||||||
"prs": "prs",
|
"prs": "prs",
|
||||||
|
|
@ -1103,11 +835,11 @@
|
||||||
"rust-analyzer-src": {
|
"rust-analyzer-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730749868,
|
"lastModified": 1730386175,
|
||||||
"narHash": "sha256-b8UMpLh61z6T4J1NObustAuFGoJiAKBTaPTrEf3Amts=",
|
"narHash": "sha256-0Uq+/B8eu7pw8B8pxuGdFYKjcVLwNMcHfDxU9sXh7rg=",
|
||||||
"owner": "rust-lang",
|
"owner": "rust-lang",
|
||||||
"repo": "rust-analyzer",
|
"repo": "rust-analyzer",
|
||||||
"rev": "b51f9bc736dc0472481a47d7c05de2901323e543",
|
"rev": "0ba893e1a00d92557ac91efb771d72eee36ca687",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1117,24 +849,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-overlay": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs_3"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1722565199,
|
|
||||||
"narHash": "sha256-2eek4vZKsYg8jip2WQWvAOGMMboQ40DIrllpsI6AlU4=",
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"rev": "a9cd2009fb2eeacfea785b45bdbbc33612bba1f1",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"sops-nix": {
|
"sops-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
@ -1143,11 +857,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730746162,
|
"lastModified": 1729999681,
|
||||||
"narHash": "sha256-ZGmI+3AbT8NkDdBQujF+HIxZ+sWXuyT6X8B49etWY2g=",
|
"narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "59d6988329626132eaf107761643f55eb979eef1",
|
"rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1163,11 +877,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730682372,
|
"lastModified": 1730335989,
|
||||||
"narHash": "sha256-GU8ghhVS7ctcV4Cy1W3X/N6KtmJNVptirIzkA7NMxp8=",
|
"narHash": "sha256-hG7H+EcNZfNa5tsUzMX+NBYpG4viCTvfRp5t7ZUnKW8=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "srvos",
|
"repo": "srvos",
|
||||||
"rev": "a9f2ae9fb213b6175c71cd6aecfdb366979d2e0c",
|
"rev": "b80b3ffabd20e39b579f45a33e638bbb1b297b60",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1178,11 +892,11 @@
|
||||||
},
|
},
|
||||||
"stable": {
|
"stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730883749,
|
"lastModified": 1724316499,
|
||||||
"narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=",
|
"narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "dba414932936fde69f0606b4f1d87c5bc0003ede",
|
"rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1237,21 +951,6 @@
|
||||||
"type": "github"
|
"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"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"treefmt-nix": {
|
"treefmt-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
@ -1295,27 +994,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"treefmt-nix_3": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixvim",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1730321837,
|
|
||||||
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "treefmt-nix",
|
|
||||||
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "treefmt-nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"x13s-bt-firmware": {
|
"x13s-bt-firmware": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
|
||||||
|
|
@ -74,8 +74,10 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
prs = {
|
prs = {
|
||||||
# url = "gitlab:timvisee/prs/v0.5.2";
|
# https://gitlab.com/timvisee/prs/-/merge_requests/42/
|
||||||
|
# $ find "$(dirname $(readlink $(which prs)))/.." -name "_prs"
|
||||||
url = "gitlab:timvisee/prs/07f17a93d19fb6bc92c9c7f3ae3f5cc750b1f973";
|
url = "gitlab:timvisee/prs/07f17a93d19fb6bc92c9c7f3ae3f5cc750b1f973";
|
||||||
|
# url = "gitlab:steveej/prs/zsh-autocomplete-query";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -120,11 +122,6 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs-kanidm.url = "github:steveej-forks/nixpkgs/kanidm";
|
nixpkgs-kanidm.url = "github:steveej-forks/nixpkgs/kanidm";
|
||||||
nix4vscode.url = "github:nix-community/nix4vscode";
|
|
||||||
nixvim = {
|
|
||||||
url = "github:nix-community/nixvim/nixos-24.05";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs @ {
|
outputs = inputs @ {
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,6 @@ in {
|
||||||
screen
|
screen
|
||||||
|
|
||||||
inputs'.nixpkgs-kanidm.legacyPackages.kanidm
|
inputs'.nixpkgs-kanidm.legacyPackages.kanidm
|
||||||
inputs'.nix4vscode.packages.default
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Set Environment Variables
|
# Set Environment Variables
|
||||||
|
|
|
||||||
|
|
@ -8,9 +8,8 @@
|
||||||
packages',
|
packages',
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
pkgsUnstable =
|
# pkgsMaster = nodeFlake.inputs.nixpkgs-master.legacyPackages.${pkgs.system};
|
||||||
pkgs.pkgsUnstable
|
pkgsUnstable = import nodeFlake.inputs.nixpkgs-unstable {inherit (pkgs) system config;};
|
||||||
or (import nodeFlake.inputs.nixpkgs-unstable {inherit (pkgs) system config overlays;});
|
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
../profiles/common.nix
|
../profiles/common.nix
|
||||||
|
|
@ -34,11 +33,6 @@ in {
|
||||||
../programs/libreoffice.nix
|
../programs/libreoffice.nix
|
||||||
../programs/neovim.nix
|
../programs/neovim.nix
|
||||||
../programs/vscode
|
../programs/vscode
|
||||||
{
|
|
||||||
home.packages = [
|
|
||||||
pkgsUnstable.markdown-oxide
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
|
|
||||||
home.sessionVariables.HM_CONFIG = "graphical-fullblown";
|
home.sessionVariables.HM_CONFIG = "graphical-fullblown";
|
||||||
|
|
|
||||||
|
|
@ -1,167 +1,131 @@
|
||||||
{
|
{
|
||||||
repoFlake,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: {
|
}: let
|
||||||
imports = [
|
in {
|
||||||
repoFlake.inputs.nixvim.homeManagerModules.nixvim
|
# FIXME: this doesn't work
|
||||||
];
|
home.sessionVariables.EDITOR = "nvim";
|
||||||
|
|
||||||
programs.nixvim = {
|
programs.neovim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultEditor = true;
|
|
||||||
vimdiffAlias = true;
|
|
||||||
vimAlias = true;
|
|
||||||
|
|
||||||
extraPython3Packages = ps: with ps; [];
|
extraPython3Packages = ps: with ps; [];
|
||||||
|
|
||||||
# extraConfigVim = builtins.readFile ./neovim/vimrc;
|
extraConfig = builtins.readFile ./neovim/vimrc;
|
||||||
|
|
||||||
clipboard = {
|
plugins = with pkgs;
|
||||||
register = "unnamedplus";
|
[
|
||||||
providers.wl-copy.enable = true;
|
# yaml-folds
|
||||||
};
|
{
|
||||||
|
plugin = vimUtils.buildVimPlugin {
|
||||||
|
name = "vim-yaml-folds";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "pedrohdz";
|
||||||
|
repo = "vim-yaml-folds";
|
||||||
|
rev = "890ccd8e5370808d569e96dbb06cbeca2cf5993a";
|
||||||
|
sha256 = "018z6xcwrq58q6lj6gwhrifjaxkmrlkkg0n86s6mjjlwkbs2qa4m";
|
||||||
|
};
|
||||||
|
buildInputs = [zip vim];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
plugins = {
|
{
|
||||||
airline = {
|
plugin = vimUtils.buildVimPlugin {
|
||||||
enable = true;
|
name = "vim-yaml";
|
||||||
settings = {
|
src = fetchFromGitHub {
|
||||||
powerline_fonts = true;
|
owner = "stephpy";
|
||||||
skip_empty_sections = true;
|
repo = "vim-yaml";
|
||||||
theme = "papercolor";
|
rev = "e97e063b16eba4e593d620676a0a15fa98613979";
|
||||||
};
|
sha256 = "0vqahbrnr43lxanpziyrmzaqqb3cmyny8ry1xvmy2xyd1larzfrk";
|
||||||
};
|
};
|
||||||
fugitive.enable = true;
|
};
|
||||||
gitblame.enable = true;
|
}
|
||||||
lsp = {
|
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
nix.enable = true;
|
# broken 2021-06-08
|
||||||
|
# {
|
||||||
|
# plugin = vimUtils.buildVimPlugin {
|
||||||
|
# name = "vim-markdown-toc";
|
||||||
|
# src = fetchFromGitHub {
|
||||||
|
# owner = "mzlogin";
|
||||||
|
# repo = "vim-markdown-toc";
|
||||||
|
# rev = "b7bb6c37033d3a6c93906af48dc0e689bd948638";
|
||||||
|
# sha256 = "026xf2gid4qivwawh7if3nfk7zja9di0flhdzdx82lvil9x48lyz";
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
# }
|
||||||
|
|
||||||
# TODO: enable in next release
|
# broken 2021-06-08
|
||||||
# numbertoggle.enable = true;
|
# {
|
||||||
|
# plugin = vimUtils.buildVimPlugin {
|
||||||
|
# name = "vim-perl";
|
||||||
|
# src = fetchFromGitHub {
|
||||||
|
# owner = "vim-perl";
|
||||||
|
# repo = "vim-perl";
|
||||||
|
# rev = "f330b5d474c44e6cfae22ba50868093dea3e9adb";
|
||||||
|
# sha256 = "1dy40ixgixj0536c5ggra51b4yd1lbw4j6l0j5zc3diasb7m2gvr";
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
# }
|
||||||
|
|
||||||
# successfor to ctrlp and fzf
|
{
|
||||||
telescope.enable = true;
|
plugin = vimUtils.buildVimPlugin {
|
||||||
|
name = "git-blame";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
"owner" = "zivyangll";
|
||||||
|
"repo" = "git-blame.vim";
|
||||||
|
"rev" = "9d144b7bed5d8f1c9259551768b7f3b3d1294917";
|
||||||
|
"sha256" = "06zb5xcc59k25rpwl46j82fcqckiznmj97v6i0mwlb8jhqqrhy9j";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
]
|
||||||
|
++ (with pkgs.vimPlugins; [
|
||||||
|
delimitMate
|
||||||
|
vim-airline
|
||||||
|
vim-airline-themes
|
||||||
|
ctrlp
|
||||||
|
vim-css-color
|
||||||
|
rainbow_parentheses
|
||||||
|
vim-colorschemes
|
||||||
|
vim-colorstepper
|
||||||
|
vim-signify
|
||||||
|
fugitive
|
||||||
|
vim-indent-guides
|
||||||
|
UltiSnips
|
||||||
|
fzfWrapper
|
||||||
|
|
||||||
todo-comments.enable = true;
|
ncm2
|
||||||
|
ncm2-bufword
|
||||||
|
ncm2-path
|
||||||
|
ncm2-tmux
|
||||||
|
ncm2-ultisnips
|
||||||
|
nvim-yarp
|
||||||
|
|
||||||
toggleterm.enable = true;
|
LanguageClient-neovim
|
||||||
|
|
||||||
treesitter = {
|
Improved-AnsiEsc
|
||||||
enable = true;
|
tabular
|
||||||
|
|
||||||
grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
|
# Nix
|
||||||
bash
|
vim-addon-nix
|
||||||
json
|
tlib
|
||||||
lua
|
vim-addon-vim2nix
|
||||||
make
|
|
||||||
markdown
|
|
||||||
nix
|
|
||||||
regex
|
|
||||||
toml
|
|
||||||
vim
|
|
||||||
vimdoc
|
|
||||||
xml
|
|
||||||
yaml
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
treesitter-context.enable = true;
|
# LaTeX
|
||||||
treesitter-refactor.enable = true;
|
vim-latex-live-preview
|
||||||
|
vimtex
|
||||||
|
|
||||||
# This plugin trims trailing whitespace and lines.
|
# YAML
|
||||||
trim.enable = true;
|
vim-yaml
|
||||||
};
|
|
||||||
|
|
||||||
# plugins = with pkgs;
|
# markdown
|
||||||
# [
|
vim-markdown
|
||||||
# # yaml-folds
|
vim-markdown-toc
|
||||||
# {
|
|
||||||
# plugin = vimUtils.buildVimPlugin {
|
|
||||||
# name = "vim-yaml-folds";
|
|
||||||
# src = fetchFromGitHub {
|
|
||||||
# owner = "pedrohdz";
|
|
||||||
# repo = "vim-yaml-folds";
|
|
||||||
# rev = "890ccd8e5370808d569e96dbb06cbeca2cf5993a";
|
|
||||||
# sha256 = "018z6xcwrq58q6lj6gwhrifjaxkmrlkkg0n86s6mjjlwkbs2qa4m";
|
|
||||||
# };
|
|
||||||
# buildInputs = [zip vim];
|
|
||||||
# };
|
|
||||||
# }
|
|
||||||
|
|
||||||
# {
|
# misc syntax support
|
||||||
# plugin = vimUtils.buildVimPlugin {
|
vim-bazel
|
||||||
# name = "vim-yaml";
|
maktaba
|
||||||
# src = fetchFromGitHub {
|
]);
|
||||||
# owner = "stephpy";
|
|
||||||
# repo = "vim-yaml";
|
|
||||||
# rev = "e97e063b16eba4e593d620676a0a15fa98613979";
|
|
||||||
# sha256 = "0vqahbrnr43lxanpziyrmzaqqb3cmyny8ry1xvmy2xyd1larzfrk";
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
# }
|
|
||||||
|
|
||||||
# {
|
|
||||||
# plugin = vimUtils.buildVimPlugin {
|
|
||||||
# name = "git-blame";
|
|
||||||
# src = fetchFromGitHub {
|
|
||||||
# "owner" = "zivyangll";
|
|
||||||
# "repo" = "git-blame.vim";
|
|
||||||
# "rev" = "9d144b7bed5d8f1c9259551768b7f3b3d1294917";
|
|
||||||
# "sha256" = "06zb5xcc59k25rpwl46j82fcqckiznmj97v6i0mwlb8jhqqrhy9j";
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
# }
|
|
||||||
# ]
|
|
||||||
# ++ (with pkgs.vimPlugins; [
|
|
||||||
# delimitMate
|
|
||||||
# vim-airline
|
|
||||||
# vim-airline-themes
|
|
||||||
# ctrlp
|
|
||||||
# vim-css-color
|
|
||||||
# rainbow_parentheses
|
|
||||||
# vim-colorschemes
|
|
||||||
# vim-colorstepper
|
|
||||||
# vim-signify
|
|
||||||
# fugitive
|
|
||||||
# vim-indent-guides
|
|
||||||
# UltiSnips
|
|
||||||
# fzfWrapper
|
|
||||||
|
|
||||||
# ncm2
|
|
||||||
# ncm2-bufword
|
|
||||||
# ncm2-path
|
|
||||||
# ncm2-tmux
|
|
||||||
# ncm2-ultisnips
|
|
||||||
# nvim-yarp
|
|
||||||
|
|
||||||
# LanguageClient-neovim
|
|
||||||
|
|
||||||
# Improved-AnsiEsc
|
|
||||||
# tabular
|
|
||||||
|
|
||||||
# # Nix
|
|
||||||
# vim-addon-nix
|
|
||||||
# tlib
|
|
||||||
# vim-addon-vim2nix
|
|
||||||
|
|
||||||
# # LaTeX
|
|
||||||
# vim-latex-live-preview
|
|
||||||
# vimtex
|
|
||||||
|
|
||||||
# # YAML
|
|
||||||
# vim-yaml
|
|
||||||
|
|
||||||
# # markdown
|
|
||||||
# vim-markdown
|
|
||||||
# vim-markdown-toc
|
|
||||||
|
|
||||||
# # misc syntax support
|
|
||||||
# vim-bazel
|
|
||||||
# maktaba
|
|
||||||
# ]);
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -32,8 +32,8 @@ in {
|
||||||
|
|
||||||
(pkgsVscodium.openvscode-server.overrideAttrs (attrs: {
|
(pkgsVscodium.openvscode-server.overrideAttrs (attrs: {
|
||||||
src = repoFlake.inputs.openvscode-server;
|
src = repoFlake.inputs.openvscode-server;
|
||||||
version = "1.94.2";
|
version = "1.88.1";
|
||||||
yarnCache = attrs.yarnCache.overrideAttrs (_: {outputHash = "sha256-89c6GYLT2RzHqwxBKegYqB6g5rEJ6/nH53cnfV7b0Tt=";});
|
yarnCache = attrs.yarnCache.overrideAttrs (_: {outputHash = "sha256-89c6GYLT2RzHqwxBKegYqB6g5rEJ6/nH53cnfV7b0Ts=";});
|
||||||
}))
|
}))
|
||||||
|
|
||||||
pkgs.waypipe
|
pkgs.waypipe
|
||||||
|
|
|
||||||
|
|
@ -46,30 +46,18 @@ in {
|
||||||
]
|
]
|
||||||
++ (let
|
++ (let
|
||||||
extensions = repoFlake.inputs.nix-vscode-extensions.extensions.${pkgs.system};
|
extensions = repoFlake.inputs.nix-vscode-extensions.extensions.${pkgs.system};
|
||||||
in (
|
in (with extensions.vscode-marketplace; [
|
||||||
with extensions.vscode-marketplace;
|
tamasfe.even-better-toml
|
||||||
with extensions.vscode-marketplace-release; [
|
|
||||||
tamasfe.even-better-toml
|
|
||||||
|
|
||||||
serayuzgur.crates
|
serayuzgur.crates
|
||||||
rust-lang.rust-analyzer
|
rust-lang.rust-analyzer
|
||||||
swellaby.vscode-rust-test-adapter
|
swellaby.vscode-rust-test-adapter
|
||||||
|
|
||||||
golang.go
|
golang.go
|
||||||
jeff-hykin.better-go-syntax
|
jeff-hykin.better-go-syntax
|
||||||
|
|
||||||
ibecker.treefmt-vscode
|
ibecker.treefmt-vscode
|
||||||
]
|
])));
|
||||||
)))
|
|
||||||
++ [
|
|
||||||
(pkgsVscodium.vscode-utils.extensionFromVscodeMarketplace
|
|
||||||
{
|
|
||||||
name = "markdown-oxide";
|
|
||||||
publisher = "felixzeller";
|
|
||||||
version = "1.1.0";
|
|
||||||
sha256 = "07l37hkg106m3nl9530l7i39iw1kibckv1zi4n23gbp7srdrwbs3";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
mutableExtensionsDir = true;
|
mutableExtensionsDir = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
34
nix/os/devices/steveej-x13s/flake.lock
generated
34
nix/os/devices/steveej-x13s/flake.lock
generated
|
|
@ -28,11 +28,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731060864,
|
"lastModified": 1730190761,
|
||||||
"narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=",
|
"narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f",
|
"rev": "3979285062d6781525cded0f6c4ff92e71376b55",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -165,16 +165,16 @@
|
||||||
"linux-jhovold": {
|
"linux-jhovold": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730883079,
|
"lastModified": 1730186574,
|
||||||
"narHash": "sha256-+ZU70M+mqo9SZNLkVtCM0+TdXEh7X39Kxmk6z58GMaM=",
|
"narHash": "sha256-QjStPt3c/v55lJUgn4Rdx/WTaQKdUxNL9nwkIKQ8O2Q=",
|
||||||
"owner": "jhovold",
|
"owner": "jhovold",
|
||||||
"repo": "linux",
|
"repo": "linux",
|
||||||
"rev": "9e9890798b6b4e81db66c572ee6acd291cf8cb77",
|
"rev": "699d5b0ccdc1a343ded65aa876f0b720ca7dada9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "jhovold",
|
"owner": "jhovold",
|
||||||
"ref": "wip/sc8280xp-6.12-rc6",
|
"ref": "wip/sc8280xp-6.12-rc5",
|
||||||
"repo": "linux",
|
"repo": "linux",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -247,11 +247,11 @@
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731101150,
|
"lastModified": 1730215039,
|
||||||
"narHash": "sha256-M9xa6UX6eidLFEfwHWkHkFJ+OgjuFqCIvuqsDSReyy4=",
|
"narHash": "sha256-GxhtLAsdpZX2SndSu/AoKugk/vht5RZ47FTcrYILDew=",
|
||||||
"ref": "bump",
|
"ref": "bump",
|
||||||
"rev": "b74e8bfe82f059a5854cfc40f7206191edff365d",
|
"rev": "ff41877fbdf32f2029ade902f10142afb053d2da",
|
||||||
"revCount": 117,
|
"revCount": 116,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git"
|
"url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git"
|
||||||
},
|
},
|
||||||
|
|
@ -291,11 +291,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730883749,
|
"lastModified": 1730327045,
|
||||||
"narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=",
|
"narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "dba414932936fde69f0606b4f1d87c5bc0003ede",
|
"rev": "080166c15633801df010977d9d7474b4a6c549d7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -307,11 +307,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730785428,
|
"lastModified": 1730200266,
|
||||||
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
|
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
|
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -85,12 +85,7 @@
|
||||||
inherit mkNixosConfiguration;
|
inherit mkNixosConfiguration;
|
||||||
};
|
};
|
||||||
|
|
||||||
overlays.libcamera = final: previous: let
|
overlays.libcamera = final: previous: {
|
||||||
webkitgtkPreConfigure = ''
|
|
||||||
export NIX_BUILD_CORES="$((NIX_BUILD_CORES > 2 ? 2 : NIX_BUILD_CORES))"
|
|
||||||
export NUMBER_OF_PROCESSORS="$NIX_BUILD_CORES"
|
|
||||||
'';
|
|
||||||
in {
|
|
||||||
wireplumber = previous.wireplumber.overrideAttrs (_: {
|
wireplumber = previous.wireplumber.overrideAttrs (_: {
|
||||||
version = "git";
|
version = "git";
|
||||||
src = previous.fetchFromGitLab {
|
src = previous.fetchFromGitLab {
|
||||||
|
|
@ -113,21 +108,6 @@
|
||||||
../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa_*.so
|
../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa_*.so
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
webkitgtk = previous.webkitgtk.overrideAttrs (attrs: {
|
|
||||||
preConfigure =
|
|
||||||
attrs.preConfigure + webkitgtkPreConfigure;
|
|
||||||
});
|
|
||||||
|
|
||||||
webkitgtk_4_1 = previous.webkitgtk_4_1.overrideAttrs (attrs: {
|
|
||||||
preConfigure =
|
|
||||||
attrs.preConfigure + webkitgtkPreConfigure;
|
|
||||||
});
|
|
||||||
|
|
||||||
webkitgtk_6_0 = previous.webkitgtk_6_0.overrideAttrs (attrs: {
|
|
||||||
preConfigure =
|
|
||||||
attrs.preConfigure + webkitgtkPreConfigure;
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
overlays.default = final: previous: let
|
overlays.default = final: previous: let
|
||||||
|
|
@ -137,14 +117,19 @@
|
||||||
overlays = [self.overlays.libcamera];
|
overlays = [self.overlays.libcamera];
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
inherit pkgsUnstable;
|
|
||||||
inherit
|
inherit
|
||||||
(pkgsUnstable)
|
(pkgsUnstable)
|
||||||
libcamera
|
libcamera
|
||||||
webkitgtk
|
|
||||||
webkitgtk_4_1
|
|
||||||
webkitgtk_6_0
|
|
||||||
;
|
;
|
||||||
|
|
||||||
|
webkitgtk = previous.webkitgtk.overrideAttrs (attrs: {
|
||||||
|
preConfigure =
|
||||||
|
attrs.preConfigure
|
||||||
|
+ ''
|
||||||
|
export NIX_BUILD_CORES="$((NIX_BUILD_CORES > 8 ? 8 : NIX_BUILD_CORES))"
|
||||||
|
export NUMBER_OF_PROCESSORS="$NIX_BUILD_CORES"
|
||||||
|
'';
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,6 @@ in {
|
||||||
"adbusers"
|
"adbusers"
|
||||||
"scanner"
|
"scanner"
|
||||||
"lp"
|
"lp"
|
||||||
"kvm"
|
|
||||||
];
|
];
|
||||||
openssh.authorizedKeys.keys = keys.users.steveej.openssh;
|
openssh.authorizedKeys.keys = keys.users.steveej.openssh;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,10 +18,5 @@
|
||||||
dnsovertls = "opportunistic";
|
dnsovertls = "opportunistic";
|
||||||
|
|
||||||
fallbackDns = lib.mkForce [];
|
fallbackDns = lib.mkForce [];
|
||||||
|
|
||||||
# TODO: IPv6
|
|
||||||
# extraConfig = ''
|
|
||||||
# DNSStubListenerExtra=[::1]:53
|
|
||||||
# '';
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
vscode_version = "1.94.2"
|
|
||||||
|
|
||||||
[[extensions]]
|
|
||||||
publisher_name = "FelixZeller"
|
|
||||||
extension_name = "markdown-oxide"
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue