steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

feat: update flakes, attempt to repair espanso

Browse source
This commit is contained in:
steveej 2024-05-02 09:48:15 +02:00
parent a58b498d3e
commit 4b5ddd8934
9 changed files with 215 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

240
flake.lock generated
View file

@ -3,11 +3,11 @@
"adamcstephens_stop-export": { "adamcstephens_stop-export": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1706405938, "lastModified": 1710028874,
"narHash": "sha256-L+MeX7m78uM09h/7b0jtyGOlgJC1ETQHCBphcJRa5V0=", "narHash": "sha256-D15vE/boUSGSig3EMx1dCeu7N7S92wiRMJKZ1h9mBjM=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "823b14873da7cc0a8a6bf37eaab71d10863272d3", "rev": "3404021b7caf7dea1ce9c8d4ece36dc26575bc47",
"revCount": 16, "revCount": 17,
"type": "git", "type": "git",
"url": "https://codeberg.org/adamcstephens/stop-export.git" "url": "https://codeberg.org/adamcstephens/stop-export.git"
}, },
@ -19,11 +19,11 @@
"aphorme_launcher": { "aphorme_launcher": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1699523648, "lastModified": 1713530567,
"narHash": "sha256-OmeelrddWuPQL84W/1Fi3FczKfrR+XdosRfKofc2o6w=", "narHash": "sha256-p1ZIMMDyQWVzoeyHb3sbeV6XQwbIDoQwJU8ynI8hGUI=",
"owner": "Iaphetes", "owner": "Iaphetes",
"repo": "aphorme_launcher", "repo": "aphorme_launcher",
"rev": "3404dd1ac0c448d517efc0a20f554da0f1d5550c", "rev": "abc42c3d9e98dfd2c910cf348110232ff25129b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,11 +60,11 @@
"stable": "stable" "stable": "stable"
}, },
"locked": { "locked": {
"lastModified": 1706509311, "lastModified": 1711386353,
"narHash": "sha256-QQKQ6r3CID8aXn2ZXZ79ZJxdCOeVP+JTnOctDALErOw=", "narHash": "sha256-gWEpb8Hybnoqb4O4tmpohGZk6+aerAbJpywKcFIiMlg=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "colmena", "repo": "colmena",
"rev": "c84ccd0a7a712475e861c2b111574472b1a8d0cd", "rev": "cd65ef7a25cdc75052fbd04b120aeb066c3881db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -80,11 +80,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707075082, "lastModified": 1713459701,
"narHash": "sha256-PUplk5F5jlIyofxqn/xEDN9pbjrd0tnkd0pDsZ52db0=", "narHash": "sha256-LjQ11ASxnv/FXfb8QnrIyMkyqSqcBPX+lFK8gu0jSQE=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "7d5b46c17d857ee9ddb2e8d88185729a3e5637b6", "rev": "45ea0059fb325132fdc3c39faffb0941d25d08d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -131,6 +131,23 @@
"type": "gitlab" "type": "gitlab"
} }
}, },
"espanso": {
"flake": false,
"locked": {
"lastModified": 1711840403,
"narHash": "sha256-4y5yHFfA8SmtSJVC2YleoHCUXkgqee+k9A2pRUzqzDo=",
"owner": "espanso",
"repo": "espanso",
"rev": "db97658d1d80697a635b57801696c594eacf057b",
"type": "github"
},
"original": {
"owner": "espanso",
"repo": "espanso",
"rev": "db97658d1d80697a635b57801696c594eacf057b",
"type": "github"
}
},
"fenix": { "fenix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -139,11 +156,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1706941198, "lastModified": 1713421495,
"narHash": "sha256-t6/qloMYdknVJ9a3QzjylQIZnQfgefJ5kMim50B7dwA=", "narHash": "sha256-5vVF9W1tJT+WdfpWAEG76KywktKDAW/71mVmNHEHjac=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "28dbd8b43ea328ee708f7da538c63e03d5ed93c8", "rev": "fd47b1f9404fae02a4f38bd9f4b12bad7833c96b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -171,11 +188,11 @@
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1696426674,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -204,11 +221,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1706830856, "lastModified": 1712014858,
"narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -260,27 +277,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_4": {
"inputs": {
"nixpkgs-lib": [
"srvos",
"nixpkgs"
]
},
"locked": {
"lastModified": 1706830856,
"narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
@ -301,11 +297,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1710146030,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -319,11 +315,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1710146030,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -333,12 +329,15 @@
} }
}, },
"flake-utils_4": { "flake-utils_4": {
"inputs": {
"systems": "systems_3"
},
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1710146030,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -365,11 +364,11 @@
"jay": { "jay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1707233644, "lastModified": 1713529603,
"narHash": "sha256-VMbqnbhmevlWjVaabBgwB62CKQay6LrTyQ7XvDv/lC0=", "narHash": "sha256-PjHxMABsAbQ6ZkjsmdREQ5D4CTtxCF1aRlyEqKsXMls=",
"owner": "mahkoh", "owner": "mahkoh",
"repo": "jay", "repo": "jay",
"rev": "e7709f695f3cfcf9bb9e857cb488f0c7f269d719", "rev": "670588fe4dc5ea1051e34d51c99282f6c8c4d2b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -384,11 +383,11 @@
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib_2"
}, },
"locked": { "locked": {
"lastModified": 1707048513, "lastModified": 1713105314,
"narHash": "sha256-gZh1mHkjtOmXrlgWWdl6G27NlKuNuruz1lOnhgmg1Nk=", "narHash": "sha256-X3URKbcgIy4UaQGrsy3DmY5x+fePQ5IYaa76YewoUE0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "83a014ca34f5cf6ef441b760e12d503856f20b35", "rev": "f347ed9a1cab12c27541ed4d173e2f2d5c9bc0bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -476,11 +475,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1711934525, "lastModified": 1713549455,
"narHash": "sha256-nMRgXVApeacHoO+R6ap5Y1Did+qng0z/eBG8L7jFgJY=", "narHash": "sha256-wMHTvhl7Yl+nNVspchN7e337DBAM2LhHlcHnfAPhGEY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "b2ca2718d4953bc2b41592d2a6b76e3d28236e69", "rev": "15529741a0f9c2b90a725ef5eb2262468a2f40a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -501,11 +500,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1704629536, "lastModified": 1712738767,
"narHash": "sha256-hCMBZ61Kpj54JD/miAhhoSHWMyP6NWrOmYOSHd0rB4E=", "narHash": "sha256-H02MqBYW6ekafiO8ol8gZq1JwGM1eQYLXhHrnFouBJg=",
"owner": "numtide", "owner": "numtide",
"repo": "nixos-anywhere", "repo": "nixos-anywhere",
"rev": "4c94cecf3dd551adf1359fb06aa926330f44e5a6", "rev": "05854a92a58f4332e9e55ef3aef1570b8ae8bc72",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -558,16 +557,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1684570954, "lastModified": 1712222121,
"narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", "narHash": "sha256-8f3glF4uwsPlDvaKDRgXD9xGe4YoCH4jA8ICxy/NbCo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3", "rev": "23ff7d9dc4f3d553939e7bfe0d2667198f993536",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -606,11 +605,11 @@
}, },
"nixpkgs-2311": { "nixpkgs-2311": {
"locked": { "locked": {
"lastModified": 1707091808, "lastModified": 1713344939,
"narHash": "sha256-LahKBAfGbY836gtpVNnWwBTIzN7yf/uYM/S0g393r0Y=", "narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e", "rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -623,11 +622,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1706550542, "lastModified": 1711703276,
"narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -640,11 +639,11 @@
}, },
"nixpkgs-lib_2": { "nixpkgs-lib_2": {
"locked": { "locked": {
"lastModified": 1707007541, "lastModified": 1713055793,
"narHash": "sha256-fuFppCuZO4wJAfodUkiWhtSxTb+pkBW+lJP2S51jRNU=", "narHash": "sha256-vIrZQykYW32RnlI2lT/gCcB59BOIqqrAmPirBdiirrc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "948ff77600f9fff8c904d1e1ffb87a60773991af", "rev": "361d8a4f443bbfab20bd6d222f9022b8c6665906",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -655,27 +654,27 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1705957679, "lastModified": 1713434076,
"narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", "narHash": "sha256-+/p5edwlkqKZc6GDAQl+92Hoe1f3NNbUF9uj+X9H3pU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9a333eaa80901efe01df07eade2c16d183761fa3", "rev": "8494ae076b7878d61a7d2d25e89a847fe8f8364c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-23.05", "ref": "release-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1711703276, "lastModified": 1713297878,
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -687,11 +686,11 @@
}, },
"nixpkgs-vscodium": { "nixpkgs-vscodium": {
"locked": { "locked": {
"lastModified": 1711703276, "lastModified": 1713297878,
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -709,11 +708,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1707290091, "lastModified": 1713543674,
"narHash": "sha256-QX1lZCenEuNe/yFnPUuxEA5B3QJx3D5UEeLvWQ4QK1w=", "narHash": "sha256-vQPF8Y36O99EuS0aVIZDlO9SuwlXzGfzQGNKeaBTFxg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "2a54a12e504659a36b20bfce96522b403fa73fdd", "rev": "ee21b656ea43b305c8f7e25ab2994aec375083eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -740,11 +739,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1707092692, "lastModified": 1713297878,
"narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "faf912b086576fd1a15fca610166c98d47bc667e", "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -773,16 +772,16 @@
"openvscode-server": { "openvscode-server": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1708067838, "lastModified": 1710222452,
"narHash": "sha256-GNqDYqi40X7/og3TacvKyPj6c5amkxTYr/1DsnGV2AI=", "narHash": "sha256-v9q0+qhgDhqejSI6ioAUNsAKK27o/Uo0KUtuAuSQYig=",
"owner": "gitpod-io", "owner": "gitpod-io",
"repo": "openvscode-server", "repo": "openvscode-server",
"rev": "fa212cab64faaac10741979e96a0662d14f61c81", "rev": "aca758f19920d86e66dd5066ed290b9999b177ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "gitpod-io", "owner": "gitpod-io",
"ref": "openvscode-server-v1.86.2", "ref": "openvscode-server-v1.87.1",
"repo": "openvscode-server", "repo": "openvscode-server",
"type": "github" "type": "github"
} }
@ -790,11 +789,11 @@
"prs": { "prs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1692545676, "lastModified": 1710690510,
"narHash": "sha256-jA97WxXBgWtttXnTBxfb4lPEEFqRMflL1BYfDCYeVfo=", "narHash": "sha256-MvQ0B35NF/AuGHBMa201FkFlU/UX0WXMcBRxTJwpUFw=",
"owner": "timvisee", "owner": "timvisee",
"repo": "prs", "repo": "prs",
"rev": "308e753f769e5ddcda14d13eeeb7b40c5887e0ca", "rev": "b0d7c2f193de501c880c41e486299c420c1f6e6b",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -816,6 +815,7 @@
"disko" "disko"
], ],
"dotfiles": "dotfiles", "dotfiles": "dotfiles",
"espanso": "espanso",
"fenix": "fenix", "fenix": "fenix",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"get-flake": "get-flake", "get-flake": "get-flake",
@ -865,11 +865,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1706875368, "lastModified": 1713373173,
"narHash": "sha256-KOBXxNurIU2lEmO6lR2A5El32X9x8ITt25McxKZ/Ew0=", "narHash": "sha256-octd9BFY9G/Gbr4KfwK4itZp4Lx+qvJeRRcYnN+dEH8=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "8f6a72871ec87ed53cfe43a09fb284168a284e7e", "rev": "46702ffc1a02a2ac153f1d1ce619ec917af8f3a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -903,11 +903,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1707015547, "lastModified": 1713532771,
"narHash": "sha256-YZr0OrqWPdbwBhxpBu69D32ngJZw8AMgZtJeaJn0e94=", "narHash": "sha256-vfKxhYVMzG2tg48/1rewBoSLCrKIjQsG1j7Nm/Y2gf4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "23f61b897c00b66855074db471ba016e0cda20dd", "rev": "a929a011a09db735abc45a8a45d1ff7fdee62755",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -918,17 +918,16 @@
}, },
"srvos": { "srvos": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1707160670, "lastModified": 1713533513,
"narHash": "sha256-svt/yQB8l/edU9yhYB78lIGKiaO7mXzUQvu/uJLZAVs=", "narHash": "sha256-nv5GmWaGryyZU8ihQIYLZWasqaXTZKGTjsypG0TRw9Q=",
"owner": "numtide", "owner": "numtide",
"repo": "srvos", "repo": "srvos",
"rev": "977371a151fc3c96d6fac923b3032d07000e9490", "rev": "d8945920cb8e98dc737d1fc2d42607f5916c34cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -983,6 +982,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"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": [
@ -1034,11 +1048,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707043587, "lastModified": 1710356110,
"narHash": "sha256-bSuJX5BNN31XMFPinZhteeJO0M8ZHaSoXQXXwZ5MR1c=", "narHash": "sha256-dLYYHNiimcY5WMOnYs9zHVKdjqoPhdFhbEJa2h5hel0=",
"owner": "l4l", "owner": "l4l",
"repo": "yofi", "repo": "yofi",
"rev": "5b67f8db1ee9bd1e09b3bf3354d08bd5e89f596e", "rev": "0d7af4653fa8f119a4aee0b7981edc88a6c7e892",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
flake.nix
View file

@ -26,7 +26,7 @@
nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
nixpkgs-vscodium.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-vscodium.url = "github:nixos/nixpkgs/nixos-unstable";
openvscode-server.url = "github:gitpod-io/openvscode-server/openvscode-server-v1.86.2"; openvscode-server.url = "github:gitpod-io/openvscode-server/openvscode-server-v1.87.1";
openvscode-server.flake = false; openvscode-server.flake = false;
colmena = { colmena = {
@ -108,6 +108,11 @@
flake = false; flake = false;
url = "https://www.stefanjunker.de/downloads/Logseq-0.10.5.AppImage"; url = "https://www.stefanjunker.de/downloads/Logseq-0.10.5.AppImage";
}; };
espanso = {
flake = false;
url = "github:espanso/espanso/db97658d1d80697a635b57801696c594eacf057b";
};
}; };
outputs = inputs @ { outputs = inputs @ {
@ -278,7 +283,7 @@
}) })
{}; {};
nomad = inputs'.nixpkgs-unstable-small.legacyPackages.nomad_1_6; nomad = inputs'.nixpkgs-unstable.legacyPackages.nomad_1_6;
ledger-live-desktop-wrapped = pkgs.writeShellScriptBin "ledger-live-desktop-wrapped" '' ledger-live-desktop-wrapped = pkgs.writeShellScriptBin "ledger-live-desktop-wrapped" ''
set -x set -x

65
nix/home-manager/configuration/graphical-fullblown.nix
View file

@ -9,7 +9,7 @@
... ...
}: let }: let
# pkgsMaster = nodeFlake.inputs.nixpkgs-master.legacyPackages.${pkgs.system}; # pkgsMaster = nodeFlake.inputs.nixpkgs-master.legacyPackages.${pkgs.system};
pkgsUnstableSmall = import nodeFlake.inputs.nixpkgs-unstable-small {inherit (pkgs) system config;}; pkgsUnstable = import nodeFlake.inputs.nixpkgs-unstable {inherit (pkgs) system config;};
in { in {
imports = [ imports = [
../profiles/common.nix ../profiles/common.nix
@ -107,24 +107,7 @@ in {
# FIXME: depends on insecure openssl 1.1.1t # FIXME: depends on insecure openssl 1.1.1t
# kotatogram-desktop # kotatogram-desktop
tdesktop tdesktop
signal-desktop
(
let
version = "6.46.0";
in
pkgsUnstableSmall.signal-desktop.overrideAttrs (old:
lib.attrsets.optionalAttrs pkgs.stdenv.isAarch64 {
inherit version;
src =
builtins.fetchurl
{
url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/108f9dd03ac5658457de1b23aae539ef8ab0a716/builds/release/signal-desktop_${version}_arm64.deb";
sha256 =
# lib.fakeSha256
"sha256:15sn0p0jxfs7hka6qhg77vjwblwxcdc10ybrfxc0p5gkpbcqcydc";
};
})
)
thunderbird thunderbird
@ -156,8 +139,8 @@ in {
nethogs nethogs
# Code Editing and Programming # Code Editing and Programming
pkgsUnstableSmall.lapce pkgsUnstable.lapce
pkgsUnstableSmall.helix pkgsUnstable.helix
# Image/Graphic/Design Tools # Image/Graphic/Design Tools
gnome.eog gnome.eog
@ -251,48 +234,14 @@ in {
++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [ ++ (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
pkgs.banana-accounting.overrideDerivation
(attrs:
with nodeFlake.inputs'.nixpkgs-2211.legacyPackages; {
# dontWrapGApps = true;
srcs = builtins.fetchurl {
# hosted via https://web3.storage
url = "https://bafybeiabi4m2i4izummipbl5wzhwxjyjt2rylgsrahhkh7i63piwd37n4u.ipfs.w3s.link/mfpcksczayaqqx8fdacp0627zm36c001-bananaplus.tgz";
sha256 = "09666iqzqdw2526pf6bg5kd0hfw0wblw8ag636ki72dsiw6bmbf1";
};
# nativeBuildInputs =
# attrs.nativeBuildInputs
# ++ [
# qt5.qtbase
# qt5.wrapQtAppsHook
# ];
# buildInputs =
# attrs.buildInputs
# ++ [
# qt5.qtwayland
# ];
# preFixup =
# (attrs.preFixup or "")
# + ''
# qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
# '';
})
)
pkgsUnstableSmall.ledger-live-desktop
# unsupported on aarch64-linux # unsupported on aarch64-linux
pkgs.androidenv.androidPkgs_9_0.platform-tools pkgs.androidenv.androidPkgs_9_0.platform-tools
pkgs.teamviewer pkgs.teamviewer
pkgs.discord pkgs.discord
pkgsUnstableSmall.session-desktop pkgsUnstable.session-desktop
pkgsUnstableSmall.rustdesk pkgsUnstable.rustdesk
]); ]);
systemd.user.startServices = true; systemd.user.startServices = true;

24
nix/home-manager/programs/espanso.nix
View file

@ -1,9 +1,23 @@
{pkgs, ...}: { {
pkgs,
repoFlake,
...
}: {
services.espanso = { services.espanso = {
# package = pkgs.espanso.overrideAttrs(_: { package = pkgs.espanso-wayland;
# # src = # package = pkgs.espanso-wayland.overrideAttrs (_: {
# }) # src = repoFlake.inputs.espanso;
enable = true;
# cargoLock = {
# # lockFile = "${repoFlake.inputs.espanso.outPath}/Cargo.lock";
# lockFile = repoFlake.inputs.espanso + "/Cargo.lock";
# outputHashes = {
# "yaml-rust-0.4.6" = "sha256-wXFy0/s4y6wB3UO19jsLwBdzMy7CGX4JoUt5V6cU7LU=";
# };
# };
# });
enable = false;
configs = { configs = {
default = { default = {
# backend = "Inject"; # backend = "Inject";

38
nix/os/devices/router0-dmz0/flake.lock generated
View file

@ -49,11 +49,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711934712, "lastModified": 1714405407,
"narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=", "narHash": "sha256-h3pOvHCXkSdp1KOZqtkQmHgkR7VaOJXDhqhumk7sZLY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "611c9ea53250f7bb22286b3d26872280a0e608f9", "rev": "5eaf747af38dd272e1ab28a8ec4bd972424b07cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -64,11 +64,11 @@
}, },
"get-flake": { "get-flake": {
"locked": { "locked": {
"lastModified": 1694475786, "lastModified": 1714237590,
"narHash": "sha256-s5wDmPooMUNIAAsxxCMMh9g68AueGg63DYk2hVZJbc8=", "narHash": "sha256-9gtHdGbzFHaR20xORN8IYd67ROWS+1nqQ5CsPf9MD8I=",
"owner": "ursi", "owner": "ursi",
"repo": "get-flake", "repo": "get-flake",
"rev": "ac54750e3b95dab6ec0726d77f440efe6045bec1", "rev": "a6c57417d1b857b8be53aba4095869a0f438c502",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -84,11 +84,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710888565, "lastModified": 1714043624,
"narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -101,11 +101,11 @@
"hostapd": { "hostapd": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1712252662, "lastModified": 1713985129,
"narHash": "sha256-eQ6SiquqNFL/uewktFYFASQOC3qKbKDnG5l4VHcDouk=", "narHash": "sha256-TBC+vZMFPApHAlw5FDPGqgZeYNskdvF56mJsSBoAm1M=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "e2ae53e1dbce10161a90bf2e64fd7241e40f4b71", "rev": "1dda619ed291edddf979d4513ddc59abf0a30c9e",
"revCount": 19445, "revCount": 19546,
"type": "git", "type": "git",
"url": "git://w1.fi/hostap.git?branch=main" "url": "git://w1.fi/hostap.git?branch=main"
}, },
@ -137,11 +137,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1712168706, "lastModified": 1714409183,
"narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=", "narHash": "sha256-Wacm/DrzLD7mjFGnSxxyGkJgg2unU/dNdNgdngBH+RU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb", "rev": "576ecd43d3b864966b4423a853412d6177775e8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -189,11 +189,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712191870, "lastModified": 1714444742,
"narHash": "sha256-+MzSZ4IuZNT4QJS8b+gM48thfWkrJ7vL4NV5zG8Lqx8=", "narHash": "sha256-FOWYXEEtwYKAGmXgKVYli/VsA8XpeR+4wNKt+3M/9b4=",
"owner": "numtide", "owner": "numtide",
"repo": "srvos", "repo": "srvos",
"rev": "ddafe2fd3547f63e6bf75b6e1a99ecfa61c59687", "rev": "b18e74f2245eaae150bc753821079c2512fe1516",
"type": "github" "type": "github"
}, },
"original": { "original": {

21
nix/os/devices/sj-bm-hostkey0/configuration.nix
View file

@ -10,7 +10,7 @@
system, system,
... ...
}: let }: let
pkgsUnstableSmall = import nodeFlake.inputs.nixpkgs-unstable-small {inherit (pkgs) system config;}; pkgsUnstable = import nodeFlake.inputs.nixpkgs-unstable {inherit (pkgs) system config;};
pkgsVscodium = import repoFlake.inputs.nixpkgs-vscodium {inherit (pkgs) system config;}; pkgsVscodium = import repoFlake.inputs.nixpkgs-vscodium {inherit (pkgs) system config;};
in { in {
disabledModules = [ disabledModules = [
@ -57,14 +57,27 @@ in {
pkgs.alejandra pkgs.alejandra
pkgs.nixfmt pkgs.nixfmt
repoFlake.packages.${system}.rperf
# TODO: automate linking this # TODO: automate linking this
# 1. get the commit with: `codium --version` # 1. get the commit with: `codium --version`
# 2. create the binary directory: `mkdir -p /home/steveej/.vscodium-server/bin/c8ce3ba4bc6b30b3b10edc61481cb85b1d2396bc/bin/` # 2. create the binary directory: `mkdir -p /home/steveej/.vscodium-server/bin/c8ce3ba4bc6b30b3b10edc61481cb85b1d2396bc/bin/`
# 3. link the binary. this relies on the client-side setting `"remote.SSH.experimental.serverBinaryName": "openvscode-server"` : ln -s $(which openvscode-server) /home/steveej/.vscodium-server/bin/c8ce3ba4bc6b30b3b10edc61481cb85b1d2396bc/bin/ # 3. link the binary. this relies on the client-side setting `"remote.SSH.experimental.serverBinaryName": "openvscode-server"` : ln -s $(which openvscode-server) /home/steveej/.vscodium-server/bin/c8ce3ba4bc6b30b3b10edc61481cb85b1d2396bc/bin/
(pkgsVscodium.openvscode-server.overrideAttrs(attrs: {
/*
e.g.:
```
(
set -e
export COMMIT=$(codium --version | rg '^[0-9a-f]{40}$')
ssh bm-hostkey0 "rm -rf /home/steveej/.vscodium-server/bin/$COMMIT; mkdir -p /home/steveej/.vscodium-server/bin/$COMMIT/bin/; ln -s \$(which openvscode-server) /home/steveej/.vscodium-server/bin/$COMMIT/bin/"
)
```
*/
(pkgsVscodium.openvscode-server.overrideAttrs (attrs: {
src = repoFlake.inputs.openvscode-server; src = repoFlake.inputs.openvscode-server;
version = "1.86.2"; version = "1.87.1";
yarnCache = attrs.yarnCache.overrideAttrs (_: {outputHash = "sha256-mB7Fw/5pCBJNGtH3PvGhZOAIP/C2MoSvBvZy17TPN9U=";}); yarnCache = attrs.yarnCache.overrideAttrs (_: {outputHash = "sha256-oRuy7PjVv3Y24GQlvX4tPPndvKTgxbv7TR8ytTBY2DQ=";});
})) }))
]; ];
}; };

17
nix/os/devices/sj-bm-hostkey0/flake.lock generated
View file

@ -72,12 +72,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1713714899,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"disko": "disko", "disko": "disko",
"get-flake": "get-flake", "get-flake": "get-flake",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"srvos": "srvos" "srvos": "srvos"
} }
}, },

1
nix/os/devices/sj-bm-hostkey0/flake.nix
View file

@ -1,6 +1,7 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
get-flake.url = "github:ursi/get-flake"; get-flake.url = "github:ursi/get-flake";

1
nix/os/devices/steveej-t14/flake.nix
View file

@ -3,7 +3,6 @@
inputs.nixpkgs-2305.url = "github:nixos/nixpkgs/nixos-23.05"; inputs.nixpkgs-2305.url = "github:nixos/nixpkgs/nixos-23.05";
inputs.nixpkgs-2311.url = "github:nixos/nixpkgs/nixos-23.11"; inputs.nixpkgs-2311.url = "github:nixos/nixpkgs/nixos-23.11";
inputs.nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; inputs.nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
inputs.nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
inputs.nixpkgs-master.url = "github:nixos/nixpkgs/master"; inputs.nixpkgs-master.url = "github:nixos/nixpkgs/master";
inputs.nixpkgs.follows = "nixpkgs-2311"; inputs.nixpkgs.follows = "nixpkgs-2311";