Compare commits
No commits in common. "b782ec6f1d4d3063bb967bbc4de725c9588a0e3d" and "229b3cb0d39fd8dfe88f3ca4bb8d46f889f1d929" have entirely different histories.
b782ec6f1d
...
229b3cb0d3
11 changed files with 598 additions and 472 deletions
353
flake.lock
generated
353
flake.lock
generated
|
|
@ -20,11 +20,11 @@
|
||||||
"ath11k-firmware": {
|
"ath11k-firmware": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731586248,
|
"lastModified": 1729352325,
|
||||||
"narHash": "sha256-tbBbkJcvPMWGhnoUXgWVOs/+G6OqDDF2QzS0MiuYqHg=",
|
"narHash": "sha256-U2rdpaKV09mLDIt7MNdbolE8HBzXawXoo7uo3HY5gBk=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "a162f69e038fca67a875c78baec684aed39a99f1",
|
"rev": "4c8ae2fb2b78d5b0bebed63fe8b0f348f9fbc33e",
|
||||||
"revCount": 161,
|
"revCount": 160,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git"
|
"url": "https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git"
|
||||||
},
|
},
|
||||||
|
|
@ -44,11 +44,11 @@
|
||||||
"stable": "stable"
|
"stable": "stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731527002,
|
"lastModified": 1731093438,
|
||||||
"narHash": "sha256-dI9I6suECoIAmbS4xcrqF8r2pbmed8WWm5LIF1yWPw8=",
|
"narHash": "sha256-n1UeNT2PrbOlLNa+EhFMrniUN4BtGqCw9R9/qWpzNEA=",
|
||||||
"owner": "zhaofengli",
|
"owner": "zhaofengli",
|
||||||
"repo": "colmena",
|
"repo": "colmena",
|
||||||
"rev": "e3ad42138015fcdf2524518dd564a13145c72ea1",
|
"rev": "c4d72269affff3abbe7175d363e6c0edf1b0e167",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -59,11 +59,11 @@
|
||||||
},
|
},
|
||||||
"crane": {
|
"crane": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731974733,
|
"lastModified": 1730652660,
|
||||||
"narHash": "sha256-enYSSZVVl15FI5p+0Y5/Ckf5DZAvXe6fBrHxyhA/njc=",
|
"narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=",
|
||||||
"owner": "ipetkov",
|
"owner": "ipetkov",
|
||||||
"repo": "crane",
|
"repo": "crane",
|
||||||
"rev": "3cb338ce81076ce5e461cf77f7824476addb0e1c",
|
"rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -140,11 +140,11 @@
|
||||||
"rust-analyzer-src": "rust-analyzer-src"
|
"rust-analyzer-src": "rust-analyzer-src"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732343620,
|
"lastModified": 1730788380,
|
||||||
"narHash": "sha256-IuOzr1HjFK8RxeDITfe1LQKgbUjgqlgeGc8jf9tKAuY=",
|
"narHash": "sha256-jzniRMqEjqYC7yyx0nIiiEnQ4xlZQMnA7R6mvyYZER8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "fenix",
|
"repo": "fenix",
|
||||||
"rev": "cb6515f398908e1c74dea085e72b3e3a0a81c6e2",
|
"rev": "280efe0e9b7b824518091a5aff76065785f81649",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -214,6 +214,22 @@
|
||||||
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
|
"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"
|
||||||
|
|
@ -311,24 +327,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_10": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems_5"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1710146030,
|
|
||||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils_2": {
|
"flake-utils_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
|
|
@ -427,11 +425,11 @@
|
||||||
"systems": "systems_3"
|
"systems": "systems_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731533236,
|
"lastModified": 1726560853,
|
||||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -445,11 +443,11 @@
|
||||||
"systems": "systems_4"
|
"systems": "systems_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731533236,
|
"lastModified": 1710146030,
|
||||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -475,10 +473,7 @@
|
||||||
},
|
},
|
||||||
"git-hooks": {
|
"git-hooks": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": [
|
"flake-compat": "flake-compat_5",
|
||||||
"nixvim",
|
|
||||||
"flake-compat"
|
|
||||||
],
|
|
||||||
"gitignore": "gitignore",
|
"gitignore": "gitignore",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixvim",
|
"nixvim",
|
||||||
|
|
@ -490,11 +485,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732021966,
|
"lastModified": 1730814269,
|
||||||
"narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
|
"narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
|
"rev": "d70155fdc00df4628446352fc58adc640cd705c2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -533,55 +528,28 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732025103,
|
"lastModified": 1726989464,
|
||||||
"narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
|
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "a46e702093a5c46e192243edbd977d5749e7f294",
|
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
|
"ref": "release-24.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ixx": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": [
|
|
||||||
"nixvim",
|
|
||||||
"nuschtosSearch",
|
|
||||||
"flake-utils"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixvim",
|
|
||||||
"nuschtosSearch",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1729958008,
|
|
||||||
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
|
|
||||||
"owner": "NuschtOS",
|
|
||||||
"repo": "ixx",
|
|
||||||
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NuschtOS",
|
|
||||||
"ref": "v0.0.6",
|
|
||||||
"repo": "ixx",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"jay": {
|
"jay": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732192756,
|
"lastModified": 1730371037,
|
||||||
"narHash": "sha256-gI7HULlHkPTnO2kXihafN0fsHwN2ekxC9jFcmbxDh04=",
|
"narHash": "sha256-oMVScShS67LZz3BeZTABDQWHv8hZqBXuj+ng14OIr9E=",
|
||||||
"owner": "mahkoh",
|
"owner": "mahkoh",
|
||||||
"repo": "jay",
|
"repo": "jay",
|
||||||
"rev": "723608ce771d8f8393c660f0d9cfb66663b47048",
|
"rev": "f36993eb6eea000f386fbf5bfa3d08dac1bd43c1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -596,11 +564,11 @@
|
||||||
"nixpkgs-lib": "nixpkgs-lib_2"
|
"nixpkgs-lib": "nixpkgs-lib_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731845570,
|
"lastModified": 1730635946,
|
||||||
"narHash": "sha256-5reOtlm18XLnh3ezruPOg2wQO+MB7ztsFaIzSUAzeh8=",
|
"narHash": "sha256-CdeoMnMXpCq4wBWEWHfUUs68zoyAJLfp1JmfXWtmAgc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "lib-aggregate",
|
"repo": "lib-aggregate",
|
||||||
"rev": "7a1d37b2b16f32536628df9cea6a2003d79a49f9",
|
"rev": "d0ecc1890f77e9e170f2de279d6902d84a0cbc51",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -609,6 +577,18 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"logseq_0_10_9_aarch64_appimage": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"narHash": "sha256-b/zzQ3hNfaSUAJmhKuZaYTY0LX7Jwch182vbNrWBh6w=",
|
||||||
|
"type": "file",
|
||||||
|
"url": "https://www.stefanjunker.de/downloads/Logseq-0.10.9.AppImage"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "file",
|
||||||
|
"url": "https://www.stefanjunker.de/downloads/Logseq-0.10.9.AppImage"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nix-darwin": {
|
"nix-darwin": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
@ -617,11 +597,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732016537,
|
"lastModified": 1731153869,
|
||||||
"narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=",
|
"narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4",
|
"rev": "5c74ab862c8070cbf6400128a1b56abb213656da",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -638,11 +618,11 @@
|
||||||
"treefmt-nix": "treefmt-nix_2"
|
"treefmt-nix": "treefmt-nix_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731682758,
|
"lastModified": 1730389079,
|
||||||
"narHash": "sha256-o54e8oNPPNmU7zHm3uTvsbbQLi7EKX3S6EEndXFG594=",
|
"narHash": "sha256-g/CJ/KKe5MGsVx1oCBl0F9aCdcNSDeOw8H7e5QDGa2c=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-eval-jobs",
|
"repo": "nix-eval-jobs",
|
||||||
"rev": "d926bcd5206c0b7afe47bed92557c8cd5e882b36",
|
"rev": "7f9159a16584ee86eed077c8a73e845690b7d513",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -701,11 +681,11 @@
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732326629,
|
"lastModified": 1731030477,
|
||||||
"narHash": "sha256-JOnNXfPTm/Ge3JyKd5TXytIEr1Tn11tnmrEiRBiDZLQ=",
|
"narHash": "sha256-RhkVjPXsfkqK0Dn3zmaRIBkb0L7kexTdpOJ7ldByHtM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-vscode-extensions",
|
"repo": "nix-vscode-extensions",
|
||||||
"rev": "b2dbcc5bbfc981ef7a9e02b502c3b64ae0ee60d5",
|
"rev": "35de68b66b5ac51a18c707fa7069151fc6dca168",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -866,11 +846,11 @@
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731763758,
|
"lastModified": 1729496181,
|
||||||
"narHash": "sha256-zcoxeMRGPpOd46dLeo2bgGLkjW5w50VC5DwZlvZD+A4=",
|
"narHash": "sha256-LrCxIU6laEf4JD1QtOBNr+PASY6CbNPpUrjLIUizt+Y=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "nixos-anywhere",
|
"repo": "nixos-anywhere",
|
||||||
"rev": "80a2e7d6d9816a80fd412befd5f173836e675185",
|
"rev": "51d347d35caec995d36d1450cb5bb183318c7fb7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -953,18 +933,50 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-2411": {
|
"nixpkgs-2305": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731755305,
|
"lastModified": 1704290814,
|
||||||
"narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
|
"narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
|
"rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-24.11",
|
"ref": "nixos-23.05",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs-2311": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1720535198,
|
||||||
|
"narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-23.11",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs-2405": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1730741070,
|
||||||
|
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-24.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -999,11 +1011,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-lib_2": {
|
"nixpkgs-lib_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731805462,
|
"lastModified": 1730595754,
|
||||||
"narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=",
|
"narHash": "sha256-F6DyPKY2WAUf8fpaT9vQwwRUs74InQM36ng//h9wNhY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734",
|
"rev": "2376a861a1a15f05339245fbaa4422f2d1bdf485",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1012,29 +1024,29 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-logseq": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732454357,
|
"lastModified": 1730602179,
|
||||||
"narHash": "sha256-HIGUjCmPRHdjHHnq8Jb7Nr+atCZ5fIX15fNruoFwY0U=",
|
"narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=",
|
||||||
"owner": "steveej-forks",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5eac36380d52534313b1c139c07a04bd0fcb3fdf",
|
"rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "steveej-forks",
|
"owner": "NixOS",
|
||||||
"ref": "logseq-linux-arm64",
|
"ref": "release-24.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732014248,
|
"lastModified": 1731319897,
|
||||||
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
|
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
|
"rev": "dc460ec76cbff0e66e269457d7b728432263166c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1046,11 +1058,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-vscodium": {
|
"nixpkgs-vscodium": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732014248,
|
"lastModified": 1730785428,
|
||||||
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
|
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
|
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1068,11 +1080,11 @@
|
||||||
"nixpkgs": "nixpkgs_5"
|
"nixpkgs": "nixpkgs_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732358371,
|
"lastModified": 1730824362,
|
||||||
"narHash": "sha256-u5O4gq5SgWNuYR/8X9GECB3QO3JFAwwl+o2sVEMIveA=",
|
"narHash": "sha256-gRQr2K0vo2xuaPC8v11ZkViVlvj3SSn5DwzLYLhlEJ4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "74c2d35df49f9c8090654a7be11710e627dc9811",
|
"rev": "c20dd1acb20fb0bb10671f43435ee7df7c6b8657",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1083,11 +1095,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732014248,
|
"lastModified": 1722421184,
|
||||||
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
|
"narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
|
"rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1115,11 +1127,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730958623,
|
"lastModified": 1723221148,
|
||||||
"narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
|
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "85f7e662eda4fa3a995556527c87b2524b691933",
|
"rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1131,11 +1143,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732014248,
|
"lastModified": 1730531603,
|
||||||
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
|
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
|
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1156,46 +1168,23 @@
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"nuschtosSearch": "nuschtosSearch",
|
|
||||||
"treefmt-nix": "treefmt-nix_3"
|
"treefmt-nix": "treefmt-nix_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732315025,
|
"lastModified": 1730550779,
|
||||||
"narHash": "sha256-vPAMWd5/akE3U3B8uXzi05X/9fUd71sZaOnfBrX4AR0=",
|
"narHash": "sha256-2stntmqw/GBOVEoPV4oCLHZljpeSBfZn8wkcJpei+ng=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "c1271fa10a54a3b35db6040dd6e779f349af52bf",
|
"rev": "91c06026075f08a3c865fdc46cc6db8e2af35a1e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
|
"ref": "nixos-24.05",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nuschtosSearch": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": "flake-utils_9",
|
|
||||||
"ixx": "ixx",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixvim",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1731936508,
|
|
||||||
"narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
|
|
||||||
"owner": "NuschtOS",
|
|
||||||
"repo": "search",
|
|
||||||
"rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NuschtOS",
|
|
||||||
"repo": "search",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ofi-pass": {
|
"ofi-pass": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -1261,17 +1250,19 @@
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
"get-flake": "get-flake",
|
"get-flake": "get-flake",
|
||||||
"jay": "jay",
|
"jay": "jay",
|
||||||
|
"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",
|
"nix4vscode": "nix4vscode",
|
||||||
"nixago": "nixago",
|
"nixago": "nixago",
|
||||||
"nixos-anywhere": "nixos-anywhere",
|
"nixos-anywhere": "nixos-anywhere",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs-2411"
|
"nixpkgs-2405"
|
||||||
],
|
],
|
||||||
"nixpkgs-2211": "nixpkgs-2211",
|
"nixpkgs-2211": "nixpkgs-2211",
|
||||||
"nixpkgs-2411": "nixpkgs-2411",
|
"nixpkgs-2305": "nixpkgs-2305",
|
||||||
|
"nixpkgs-2311": "nixpkgs-2311",
|
||||||
|
"nixpkgs-2405": "nixpkgs-2405",
|
||||||
"nixpkgs-kanidm": "nixpkgs-kanidm",
|
"nixpkgs-kanidm": "nixpkgs-kanidm",
|
||||||
"nixpkgs-logseq": "nixpkgs-logseq",
|
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"nixpkgs-vscodium": "nixpkgs-vscodium",
|
"nixpkgs-vscodium": "nixpkgs-vscodium",
|
||||||
"nixpkgs-wayland": "nixpkgs-wayland",
|
"nixpkgs-wayland": "nixpkgs-wayland",
|
||||||
|
|
@ -1309,11 +1300,11 @@
|
||||||
"rust-analyzer-src": {
|
"rust-analyzer-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732050317,
|
"lastModified": 1730749868,
|
||||||
"narHash": "sha256-G5LUEOC4kvB/Xbkglv0Noi04HnCfryur7dVjzlHkgpI=",
|
"narHash": "sha256-b8UMpLh61z6T4J1NObustAuFGoJiAKBTaPTrEf3Amts=",
|
||||||
"owner": "rust-lang",
|
"owner": "rust-lang",
|
||||||
"repo": "rust-analyzer",
|
"repo": "rust-analyzer",
|
||||||
"rev": "c0bbbb3e5d7d1d1d60308c8270bfd5b250032bb4",
|
"rev": "b51f9bc736dc0472481a47d7c05de2901323e543",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1345,14 +1336,15 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
],
|
||||||
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732186149,
|
"lastModified": 1730746162,
|
||||||
"narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=",
|
"narHash": "sha256-ZGmI+3AbT8NkDdBQujF+HIxZ+sWXuyT6X8B49etWY2g=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699",
|
"rev": "59d6988329626132eaf107761643f55eb979eef1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1368,11 +1360,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732285851,
|
"lastModified": 1730682372,
|
||||||
"narHash": "sha256-I7bH3fiSr01AT7zj+bQA8IrtD08cP5NgQU11gZ6OEFc=",
|
"narHash": "sha256-GU8ghhVS7ctcV4Cy1W3X/N6KtmJNVptirIzkA7NMxp8=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "srvos",
|
"repo": "srvos",
|
||||||
"rev": "8f6d75e9636d54319752b166ccbe86a66113e999",
|
"rev": "a9f2ae9fb213b6175c71cd6aecfdb366979d2e0c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1457,21 +1449,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_5": {
|
|
||||||
"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": [
|
||||||
|
|
@ -1523,11 +1500,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732111664,
|
"lastModified": 1730321837,
|
||||||
"narHash": "sha256-XWHuPWcP59QnHEewdZJXBX1TA2lAP78Vz4daG6tfIr4=",
|
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "62003fdad7a5ab7b6af3ea9bd7290e4c220277d0",
|
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1543,11 +1520,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732292307,
|
"lastModified": 1730321837,
|
||||||
"narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=",
|
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "705df92694af7093dfbb27109ce16d828a79155f",
|
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1570,7 +1547,7 @@
|
||||||
},
|
},
|
||||||
"yofi": {
|
"yofi": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_10",
|
"flake-utils": "flake-utils_9",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
|
|
|
||||||
98
flake.nix
98
flake.nix
|
|
@ -10,9 +10,11 @@
|
||||||
# flake and infra basics
|
# flake and infra basics
|
||||||
nixpkgs-2211.url = "github:nixos/nixpkgs/nixos-22.11";
|
nixpkgs-2211.url = "github:nixos/nixpkgs/nixos-22.11";
|
||||||
radicalePkgs.follows = "nixpkgs-2211";
|
radicalePkgs.follows = "nixpkgs-2211";
|
||||||
nixpkgs-2411.url = "github:nixos/nixpkgs/nixos-24.11";
|
nixpkgs-2305.url = "github:nixos/nixpkgs/nixos-23.05";
|
||||||
|
nixpkgs-2311.url = "github:nixos/nixpkgs/nixos-23.11";
|
||||||
|
nixpkgs-2405.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
nixpkgs.follows = "nixpkgs-2411";
|
nixpkgs.follows = "nixpkgs-2405";
|
||||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||||
get-flake.url = "github:ursi/get-flake";
|
get-flake.url = "github:ursi/get-flake";
|
||||||
|
|
||||||
|
|
@ -43,10 +45,8 @@
|
||||||
};
|
};
|
||||||
crane.url = "github:ipetkov/crane";
|
crane.url = "github:ipetkov/crane";
|
||||||
|
|
||||||
sops-nix = {
|
sops-nix.url = "github:Mic92/sops-nix";
|
||||||
url = "github:Mic92/sops-nix";
|
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
# applications
|
# applications
|
||||||
aphorme_launcher = {
|
aphorme_launcher = {
|
||||||
|
|
@ -81,7 +81,10 @@
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs-logseq.url = "github:steveej-forks/nixpkgs/logseq-linux-arm64";
|
logseq_0_10_9_aarch64_appimage = {
|
||||||
|
flake = false;
|
||||||
|
url = "https://www.stefanjunker.de/downloads/Logseq-0.10.9.AppImage";
|
||||||
|
};
|
||||||
|
|
||||||
espanso = {
|
espanso = {
|
||||||
flake = false;
|
flake = false;
|
||||||
|
|
@ -114,23 +117,17 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs-kanidm.url = "github:steveej-forks/nixpkgs/kanidm";
|
nixpkgs-kanidm.url = "github:steveej-forks/nixpkgs/kanidm";
|
||||||
nix4vscode = {
|
nix4vscode.url = "github:nix-community/nix4vscode";
|
||||||
url = "github:nix-community/nix4vscode";
|
|
||||||
# inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
nixvim = {
|
nixvim = {
|
||||||
# TODO: pin to nixos-24.11 once available
|
url = "github:nix-community/nixvim/nixos-24.05";
|
||||||
url = "github:nix-community/nixvim";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
treefmt-nix = {
|
treefmt-nix = {
|
||||||
url = "github:numtide/treefmt-nix";
|
url = "github:numtide/treefmt-nix";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
nixago = {
|
nixago.url = "github:jmgilman/nixago";
|
||||||
url = "github:jmgilman/nixago";
|
nixago.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
|
|
@ -203,8 +200,7 @@
|
||||||
# nixos-rebuild switch --flake .\#router0-dmz0_cross --build-host localhost --target-host root@192.168.10.1
|
# nixos-rebuild switch --flake .\#router0-dmz0_cross --build-host localhost --target-host root@192.168.10.1
|
||||||
router0-dmz0_cross = router0-dmz0.cross;
|
router0-dmz0_cross = router0-dmz0.cross;
|
||||||
|
|
||||||
steveej-x13s_cross =
|
steveej-x13s_cross = (inputs.get-flake (self + "./nix/os/devices/steveej-x13s")).nixosConfigurations.cross;
|
||||||
(inputs.get-flake (self + "./nix/os/devices/steveej-x13s")).nixosConfigurations.cross;
|
|
||||||
steveej-x13s-rmvbl_cross =
|
steveej-x13s-rmvbl_cross =
|
||||||
(inputs.get-flake ./nix/os/devices/steveej-x13s-rmvbl).nixosConfigurations.cross;
|
(inputs.get-flake ./nix/os/devices/steveej-x13s-rmvbl).nixosConfigurations.cross;
|
||||||
};
|
};
|
||||||
|
|
@ -231,65 +227,6 @@
|
||||||
craneLibFn = (inputs.crane.mkLib inputs.nixpkgs.legacyPackages.${system}).overrideToolchain;
|
craneLibFn = (inputs.crane.mkLib inputs.nixpkgs.legacyPackages.${system}).overrideToolchain;
|
||||||
|
|
||||||
craneLib = craneLibFn inputs'.fenix.packages.stable.toolchain;
|
craneLib = craneLibFn inputs'.fenix.packages.stable.toolchain;
|
||||||
|
|
||||||
_prsPackage =
|
|
||||||
{
|
|
||||||
lib,
|
|
||||||
rustPlatform,
|
|
||||||
installShellFiles,
|
|
||||||
pkg-config,
|
|
||||||
python3,
|
|
||||||
glib,
|
|
||||||
gpgme,
|
|
||||||
gtk3,
|
|
||||||
stdenv,
|
|
||||||
cargoHash ? "sha256-T57RqIzurpYLHyeFhvqxmC+DoB6zUf+iTu1YkMmwtp8=",
|
|
||||||
src,
|
|
||||||
version,
|
|
||||||
}:
|
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
|
||||||
pname = "prs";
|
|
||||||
|
|
||||||
inherit src version cargoHash;
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
gpgme
|
|
||||||
installShellFiles
|
|
||||||
pkg-config
|
|
||||||
python3
|
|
||||||
];
|
|
||||||
|
|
||||||
cargoBuildFlags = [
|
|
||||||
"--no-default-features"
|
|
||||||
"--features=alias,backend-gpgme,clipboard,notify,select-fzf-bin,select-skim-bin,tomb,totp"
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
glib
|
|
||||||
gpgme
|
|
||||||
gtk3
|
|
||||||
];
|
|
||||||
|
|
||||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
|
||||||
for shell in bash fish zsh; do
|
|
||||||
installShellCompletion --cmd prs --$shell <($out/bin/prs internal completions $shell --stdout)
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Secure, fast & convenient password manager CLI using GPG and git to sync";
|
|
||||||
homepage = "https://gitlab.com/timvisee/prs";
|
|
||||||
changelog = "https://gitlab.com/timvisee/prs/-/blob/v${version}/CHANGELOG.md";
|
|
||||||
license = with licenses; [
|
|
||||||
lgpl3Only # lib
|
|
||||||
gpl3Only # everything else
|
|
||||||
];
|
|
||||||
maintainers = with maintainers; [ dotlambda ];
|
|
||||||
mainProgram = "prs";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
dcpj4110dwDriver = dcpj4110dw.driver;
|
dcpj4110dwDriver = dcpj4110dw.driver;
|
||||||
|
|
@ -297,11 +234,10 @@
|
||||||
|
|
||||||
inherit (inputs'.colmena.packages) colmena;
|
inherit (inputs'.colmena.packages) colmena;
|
||||||
|
|
||||||
prs = pkgs.callPackage _prsPackage {
|
prs = pkgs.prs.overrideAttrs(_: {
|
||||||
src = inputs.prs;
|
src = inputs.prs;
|
||||||
version = inputs.prs.shortRev;
|
version = inputs.prs.shortRev;
|
||||||
cargoHash = "sha256-oXuAKOHIfwUvcS0qXDTe68DN+MUNS4TAKV986vxdeh8=";
|
});
|
||||||
};
|
|
||||||
|
|
||||||
nomad = inputs'.nixpkgs-unstable.legacyPackages.nomad_1_6;
|
nomad = inputs'.nixpkgs-unstable.legacyPackages.nomad_1_6;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,10 +11,6 @@ let
|
||||||
pkgsUnstable =
|
pkgsUnstable =
|
||||||
pkgs.pkgsUnstable
|
pkgs.pkgsUnstable
|
||||||
or (import nodeFlake.inputs.nixpkgs-unstable { inherit (pkgs) system config overlays; });
|
or (import nodeFlake.inputs.nixpkgs-unstable { inherit (pkgs) system config overlays; });
|
||||||
|
|
||||||
pkgsLogseq =
|
|
||||||
pkgs.pkgsLogseq
|
|
||||||
or (import repoFlake.inputs.nixpkgs-logseq { inherit (pkgs) system config overlays; });
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -147,7 +143,7 @@ in
|
||||||
# freerdp
|
# freerdp
|
||||||
|
|
||||||
# Audio/Video Players
|
# Audio/Video Players
|
||||||
# ffmpeg
|
ffmpeg
|
||||||
vlc
|
vlc
|
||||||
# v4l-utils
|
# v4l-utils
|
||||||
# audacity
|
# audacity
|
||||||
|
|
@ -250,8 +246,24 @@ in
|
||||||
# libretro.snes9x2010
|
# libretro.snes9x2010
|
||||||
# retroarchFull
|
# retroarchFull
|
||||||
|
|
||||||
pkgsLogseq.logseq
|
(pkgs.logseq.overrideAttrs (
|
||||||
|
attrs:
|
||||||
|
lib.attrsets.recursiveUpdate attrs (
|
||||||
|
lib.attrsets.optionalAttrs pkgs.stdenv.isAarch64 {
|
||||||
|
src = repoFlake.inputs.logseq_0_10_9_aarch64_appimage;
|
||||||
|
meta.platforms = [ "aarch64-linux" ];
|
||||||
|
}
|
||||||
|
)
|
||||||
|
))
|
||||||
|
|
||||||
|
# (
|
||||||
|
# pkgsUnstable.callPackage (repoFlake + "/nix/pkgs/logseq")
|
||||||
|
# (lib.attrsets.optionalAttrs pkgs.stdenv.isAarch64 {
|
||||||
|
# overrideSrc = repoFlake.inputs.logseq_0_10_9_aarch64_appimage;
|
||||||
|
# })
|
||||||
|
# )
|
||||||
])
|
])
|
||||||
|
++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [ ])
|
||||||
++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [
|
++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [
|
||||||
pkgsUnstable.ledger-live-desktop
|
pkgsUnstable.ledger-live-desktop
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,8 +21,8 @@
|
||||||
airline = {
|
airline = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
powerline_fonts = 1;
|
powerline_fonts = true;
|
||||||
skip_empty_sections = 1;
|
skip_empty_sections = true;
|
||||||
theme = "papercolor";
|
theme = "papercolor";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgsVscodium.vscodium;
|
package = pkgsVscodium.vscodium;
|
||||||
extensions =
|
extensions =
|
||||||
|
(
|
||||||
with pkgsVscodium.vscode-extensions;
|
with pkgsVscodium.vscode-extensions;
|
||||||
[
|
[
|
||||||
eamodio.gitlens
|
eamodio.gitlens
|
||||||
|
|
@ -55,6 +56,7 @@ in
|
||||||
jeff-hykin.better-go-syntax
|
jeff-hykin.better-go-syntax
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
)
|
||||||
++ (
|
++ (
|
||||||
let
|
let
|
||||||
nix4vscodeToml = pkgs.writeText "nix4vscode.toml" ''
|
nix4vscodeToml = pkgs.writeText "nix4vscode.toml" ''
|
||||||
|
|
@ -77,7 +79,7 @@ in
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pkgs.nix
|
pkgs.nix
|
||||||
pkgs.cacert
|
pkgs.cacert
|
||||||
(pkgs.callPackage "${repoFlake.inputs.nix4vscode.outPath}/nix/package.nix" { })
|
repoFlake.inputs.nix4vscode.packages.${pkgs.stdenv.system}.default
|
||||||
# pkgs.strace
|
# pkgs.strace
|
||||||
];
|
];
|
||||||
# outputHashAlgo = "sha256";
|
# outputHashAlgo = "sha256";
|
||||||
|
|
|
||||||
|
|
@ -125,6 +125,91 @@ in
|
||||||
|
|
||||||
containers = { };
|
containers = { };
|
||||||
|
|
||||||
|
# sops.secrets.holochain-nomad-agent-ca = {
|
||||||
|
# sopsFile = ../../../../secrets/holochain-infra/nomad.yaml;
|
||||||
|
# owner = config.users.extraUsers.nomad.name;
|
||||||
|
# group = config.users.groups.nomad.name;
|
||||||
|
# };
|
||||||
|
# sops.secrets.holochain-global-nomad-client-cert = {
|
||||||
|
# sopsFile = ../../../../secrets/holochain-infra/nomad.yaml;
|
||||||
|
# owner = config.users.extraUsers.nomad.name;
|
||||||
|
# group = config.users.groups.nomad.name;
|
||||||
|
# };
|
||||||
|
# sops.secrets.holochain-global-client-nomad-key = {
|
||||||
|
# sopsFile = ../../../../secrets/holochain-infra/nomad.yaml;
|
||||||
|
# owner = config.users.extraUsers.nomad.name;
|
||||||
|
# group = config.users.groups.nomad.name;
|
||||||
|
# };
|
||||||
|
|
||||||
|
# services.nomad = {
|
||||||
|
# enable = true;
|
||||||
|
# package = packages'.nomad;
|
||||||
|
# enableDocker = false;
|
||||||
|
# dropPrivileges = false;
|
||||||
|
|
||||||
|
# extraPackages = [
|
||||||
|
# pkgs.coreutils
|
||||||
|
# pkgs.nix
|
||||||
|
# pkgs.bash
|
||||||
|
# pkgs.gitFull
|
||||||
|
# pkgs.cacert
|
||||||
|
# ];
|
||||||
|
|
||||||
|
# settings = {
|
||||||
|
# server.enabled = false;
|
||||||
|
|
||||||
|
# client = {
|
||||||
|
# enabled = true;
|
||||||
|
# server_join = {
|
||||||
|
# retry_join = [
|
||||||
|
# "infra.holochain.org"
|
||||||
|
# ];
|
||||||
|
# retry_interval = "60s";
|
||||||
|
# };
|
||||||
|
|
||||||
|
# node_class = "testing";
|
||||||
|
|
||||||
|
# meta = {
|
||||||
|
# inherit (pkgs.targetPlatform) system;
|
||||||
|
|
||||||
|
# features = builtins.concatStringsSep "," [
|
||||||
|
# "poc-1"
|
||||||
|
# "poc-2"
|
||||||
|
# "ipv4-nat"
|
||||||
|
# "nix"
|
||||||
|
# "nixos"
|
||||||
|
# "holoport"
|
||||||
|
# ];
|
||||||
|
|
||||||
|
# machine_type = "baremetal";
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
|
||||||
|
# tls = {
|
||||||
|
# http = true;
|
||||||
|
# rpc = true;
|
||||||
|
# ca_file = config.sops.secrets.holochain-nomad-agent-ca.path;
|
||||||
|
# cert_file = config.sops.secrets.holochain-global-nomad-client-cert.path;
|
||||||
|
# key_file = config.sops.secrets.holochain-global-client-nomad-key.path;
|
||||||
|
|
||||||
|
# verify_server_hostname = true;
|
||||||
|
# verify_https_client = true;
|
||||||
|
# };
|
||||||
|
|
||||||
|
# plugin.raw_exec.config.enabled = true;
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
|
||||||
|
# users.extraUsers.nomad.isNormalUser = true;
|
||||||
|
# users.extraUsers.nomad.isSystemUser = false;
|
||||||
|
# users.extraUsers.nomad.group = "nomad";
|
||||||
|
# users.extraUsers.nomad.home = config.services.nomad.settings.data_dir;
|
||||||
|
# users.extraUsers.nomad.createHome = true;
|
||||||
|
# users.groups.nomad.members = ["nomad"];
|
||||||
|
|
||||||
|
# systemd.services.nomad.serviceConfig.User = "nomad";
|
||||||
|
# systemd.services.nomad.serviceConfig.Group = "nomad";
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
|
|
||||||
|
|
@ -83,8 +83,7 @@
|
||||||
../../snippets/nix-settings.nix
|
../../snippets/nix-settings.nix
|
||||||
../../snippets/nix-settings-holo-chain.nix
|
../../snippets/nix-settings-holo-chain.nix
|
||||||
../../snippets/mycelium.nix
|
../../snippets/mycelium.nix
|
||||||
|
../../snippets/obs-studio.nix
|
||||||
# ../../snippets/obs-studio.nix
|
|
||||||
|
|
||||||
{
|
{
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
|
|
|
||||||
42
nix/os/devices/steveej-x13s/flake.lock
generated
42
nix/os/devices/steveej-x13s/flake.lock
generated
|
|
@ -28,11 +28,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732284644,
|
"lastModified": 1731060864,
|
||||||
"narHash": "sha256-REGLarOB5McRMmFtOgNihEXXQILY6+2UBAY8lw8CJCI=",
|
"narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "abc8baff333ac9dca930fc4921a26a8fc248e442",
|
"rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -148,16 +148,16 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732319136,
|
"lastModified": 1726989464,
|
||||||
"narHash": "sha256-wpmPl6FkAF9Jj5C/rzANgpUjfzQrUYOn267LnzKU2uI=",
|
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "f8831cc700030e11fc91da9ef6270593e6440edc",
|
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-24.11",
|
"ref": "release-24.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -190,11 +190,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732269459,
|
"lastModified": 1730381857,
|
||||||
"narHash": "sha256-KIn7TfNknBiCoM/RedPqW3Im9X0Iiwig3hHAAhkTDLg=",
|
"narHash": "sha256-PbEoM+AnZTuo9xtwcDcTH9FZAzPzfBhX41+zVVTdgRo=",
|
||||||
"owner": "threefoldtech",
|
"owner": "threefoldtech",
|
||||||
"repo": "mycelium",
|
"repo": "mycelium",
|
||||||
"rev": "430ec6b272a4654d0ccbf053bfad8a594eff4016",
|
"rev": "8a2b564c8e279d4afd0a10058b4481799a7513e1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -247,11 +247,11 @@
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731796298,
|
"lastModified": 1731793780,
|
||||||
"narHash": "sha256-ZjIcp1WskJw+fH5AjrYbb+GoKGsVmPcXsmLFiS6L0NI=",
|
"narHash": "sha256-gOpR24dG7PUktUmlF2nDg0nqvlli7ZC179ngYMpGlfw=",
|
||||||
"ref": "bump",
|
"ref": "bump",
|
||||||
"rev": "b78fc5d593e6f7b85f8b1d3585098ac333b5dc76",
|
"rev": "b957608c2a0b7808f17588be2f38d8ddb6321b2f",
|
||||||
"revCount": 119,
|
"revCount": 118,
|
||||||
"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,27 +291,27 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731755305,
|
"lastModified": 1730883749,
|
||||||
"narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
|
"narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
|
"rev": "dba414932936fde69f0606b4f1d87c5bc0003ede",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-24.11",
|
"ref": "nixos-24.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732014248,
|
"lastModified": 1730785428,
|
||||||
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
|
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
|
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.follows = "nixpkgs-stable";
|
nixpkgs.follows = "nixpkgs-stable";
|
||||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
|
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
get-flake.url = "github:ursi/get-flake";
|
get-flake.url = "github:ursi/get-flake";
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
# url = "github:nix-community/home-manager/master";
|
# url = "github:nix-community/home-manager/master";
|
||||||
url = "github:nix-community/home-manager/release-24.11";
|
url = "github:nix-community/home-manager/release-24.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -127,14 +127,23 @@
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
overlays.default = _final: _previous: {
|
overlays.default =
|
||||||
# inherit pkgsUnstable;
|
_final: previous:
|
||||||
# inherit (pkgsUnstable)
|
let
|
||||||
# libcamera
|
inherit (previous.stdenv) system;
|
||||||
# webkitgtk
|
pkgsUnstable = import self.inputs.nixpkgs-unstable.outPath {
|
||||||
# webkitgtk_4_1
|
inherit system;
|
||||||
# webkitgtk_6_0
|
overlays = [ self.overlays.libcamera ];
|
||||||
# ;
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
inherit pkgsUnstable;
|
||||||
|
inherit (pkgsUnstable)
|
||||||
|
libcamera
|
||||||
|
webkitgtk
|
||||||
|
webkitgtk_4_1
|
||||||
|
webkitgtk_6_0
|
||||||
|
;
|
||||||
};
|
};
|
||||||
|
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
|
|
|
||||||
106
nix/pkgs/logseq/default.nix
Normal file
106
nix/pkgs/logseq/default.nix
Normal file
|
|
@ -0,0 +1,106 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenv,
|
||||||
|
fetchurl,
|
||||||
|
appimageTools,
|
||||||
|
unzip,
|
||||||
|
makeWrapper,
|
||||||
|
# Notice: graphs will not sync without matching upstream's major electron version
|
||||||
|
# the specific electron version is set at top-level file to preserve override interface.
|
||||||
|
# whenever updating this package also sync electron version at top-level file.
|
||||||
|
electron_27,
|
||||||
|
autoPatchelfHook,
|
||||||
|
git,
|
||||||
|
nix-update-script,
|
||||||
|
overrideSrc ? null,
|
||||||
|
}:
|
||||||
|
stdenv.mkDerivation (
|
||||||
|
finalAttrs:
|
||||||
|
let
|
||||||
|
inherit (finalAttrs) pname version src;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
pname = "logseq";
|
||||||
|
version = "0.10.9";
|
||||||
|
|
||||||
|
src =
|
||||||
|
if overrideSrc != null then
|
||||||
|
overrideSrc
|
||||||
|
else
|
||||||
|
(fetchurl {
|
||||||
|
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||||
|
hash = "sha256-F3YbqgvL04P0nXaIVkJlCq/z8hUE0M0UutkBs2omuBe=";
|
||||||
|
name = "${pname}-${version}.AppImage";
|
||||||
|
});
|
||||||
|
|
||||||
|
nativeBuildInputs =
|
||||||
|
[ makeWrapper ]
|
||||||
|
++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]
|
||||||
|
++ lib.optionals stdenv.hostPlatform.isDarwin [ unzip ];
|
||||||
|
buildInputs = [ stdenv.cc.cc.lib ];
|
||||||
|
|
||||||
|
dontUnpack = stdenv.hostPlatform.isLinux;
|
||||||
|
dontConfigure = true;
|
||||||
|
dontBuild = true;
|
||||||
|
|
||||||
|
installPhase =
|
||||||
|
''
|
||||||
|
runHook preInstall
|
||||||
|
''
|
||||||
|
+ lib.optionalString stdenv.hostPlatform.isLinux (
|
||||||
|
let
|
||||||
|
appimageContents = appimageTools.extract { inherit pname src version; };
|
||||||
|
in
|
||||||
|
''
|
||||||
|
mkdir -p $out/bin $out/share/logseq $out/share/applications
|
||||||
|
cp -a ${appimageContents}/{locales,resources} $out/share/logseq
|
||||||
|
cp -a ${appimageContents}/Logseq.desktop $out/share/applications/logseq.desktop
|
||||||
|
|
||||||
|
# remove the `git` in `dugite` because we want the `git` in `nixpkgs`
|
||||||
|
chmod +w -R $out/share/logseq/resources/app/node_modules/dugite/git
|
||||||
|
chmod +w $out/share/logseq/resources/app/node_modules/dugite
|
||||||
|
rm -rf $out/share/logseq/resources/app/node_modules/dugite/git
|
||||||
|
chmod -w $out/share/logseq/resources/app/node_modules/dugite
|
||||||
|
|
||||||
|
mkdir -p $out/share/pixmaps
|
||||||
|
ln -s $out/share/logseq/resources/app/icons/logseq.png $out/share/pixmaps/logseq.png
|
||||||
|
|
||||||
|
substituteInPlace $out/share/applications/logseq.desktop \
|
||||||
|
--replace Exec=Logseq Exec=logseq \
|
||||||
|
--replace Icon=Logseq Icon=logseq
|
||||||
|
''
|
||||||
|
)
|
||||||
|
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||||
|
mkdir -p $out/{Applications/Logseq.app,bin}
|
||||||
|
cp -R . $out/Applications/Logseq.app
|
||||||
|
makeWrapper $out/Applications/Logseq.app/Contents/MacOS/Logseq $out/bin/logseq
|
||||||
|
''
|
||||||
|
+ ''
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||||
|
# set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs
|
||||||
|
makeWrapper ${electron_27}/bin/electron $out/bin/logseq \
|
||||||
|
--set "LOCAL_GIT_DIRECTORY" ${git} \
|
||||||
|
--add-flags $out/share/logseq/resources/app \
|
||||||
|
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Local-first, non-linear, outliner notebook for organizing and sharing your personal knowledge base";
|
||||||
|
homepage = "https://github.com/logseq/logseq";
|
||||||
|
changelog = "https://github.com/logseq/logseq/releases/tag/${version}";
|
||||||
|
license = lib.licenses.agpl3Plus;
|
||||||
|
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||||
|
maintainers = with lib.maintainers; [ cheeseecake ];
|
||||||
|
platforms = [
|
||||||
|
"x86_64-linux"
|
||||||
|
"aarch64-linux"
|
||||||
|
] ++ lib.platforms.darwin;
|
||||||
|
mainProgram = "logseq";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
)
|
||||||
Loading…
Add table
Add a link
Reference in a new issue