push changes
This commit is contained in:
parent
6ea10852a9
commit
9aa6f3fdbe
20 changed files with 573 additions and 277 deletions
349
flake.lock
generated
349
flake.lock
generated
|
|
@ -85,11 +85,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729527199,
|
"lastModified": 1730968822,
|
||||||
"narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=",
|
"narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "aquamarine",
|
"repo": "aquamarine",
|
||||||
"rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72",
|
"rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -120,11 +120,11 @@
|
||||||
},
|
},
|
||||||
"catppuccin": {
|
"catppuccin": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730036420,
|
"lastModified": 1731232837,
|
||||||
"narHash": "sha256-rv2bz7J6Wo7AenPiu4+ptCB1AFyaMcS77y89zbRAtI8=",
|
"narHash": "sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa+EPlDEs=",
|
||||||
"owner": "catppuccin",
|
"owner": "catppuccin",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"rev": "0b7bf04628414a402d255924f65e9a0d1a53d92b",
|
"rev": "32359bf226fe874d3b7a0a5753d291a4da9616fe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -168,16 +168,15 @@
|
||||||
},
|
},
|
||||||
"emacs-overlay": {
|
"emacs-overlay": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs_4",
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730424076,
|
"lastModified": 1731489158,
|
||||||
"narHash": "sha256-C7fGtktmYk3ZQn/sFSPvRWod2DRZuZzzEmVhkaf0Qoc=",
|
"narHash": "sha256-xxhjjRBM9P6536SATfoGkKcMBKPZxcgs3yx/cyQxbb0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "a0196e4a9da85a7f06d9f79110e70d97e57cfbed",
|
"rev": "98672e8948813f132851fb6768fa1265a8cab324",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -395,11 +394,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727826117,
|
"lastModified": 1730504689,
|
||||||
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
|
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
|
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -456,11 +455,11 @@
|
||||||
"nixpkgs-lib": "nixpkgs-lib_2"
|
"nixpkgs-lib": "nixpkgs-lib_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727826117,
|
"lastModified": 1730504689,
|
||||||
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
|
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
|
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -563,25 +562,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils_2": {
|
"flake-utils_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_6"
|
"systems": "systems_8"
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1726560853,
|
|
||||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils_3": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems_9"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1705309234,
|
"lastModified": 1705309234,
|
||||||
|
|
@ -597,9 +578,9 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_4": {
|
"flake-utils_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_10"
|
"systems": "systems_9"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681202837,
|
"lastModified": 1681202837,
|
||||||
|
|
@ -615,9 +596,9 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_5": {
|
"flake-utils_4": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_11"
|
"systems": "systems_10"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726560853,
|
"lastModified": 1726560853,
|
||||||
|
|
@ -633,6 +614,24 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-utils_5": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems_11"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1701680307,
|
||||||
|
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-utils_6": {
|
"flake-utils_6": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_14"
|
"systems": "systems_14"
|
||||||
|
|
@ -683,11 +682,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729104314,
|
"lastModified": 1731363552,
|
||||||
"narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
|
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
|
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -771,11 +770,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1724947644,
|
"lastModified": 1730903510,
|
||||||
"narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=",
|
"narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "hercules-ci-effects",
|
"repo": "hercules-ci-effects",
|
||||||
"rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef",
|
"rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -812,11 +811,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730016908,
|
"lastModified": 1731235328,
|
||||||
"narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
|
"narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "e83414058edd339148dc142a8437edb9450574c8",
|
"rev": "60bb110917844d354f3c18e05450606a435d2d10",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -862,14 +861,14 @@
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"systems": "systems_7"
|
"systems": "systems_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729679960,
|
"lastModified": 1730561387,
|
||||||
"narHash": "sha256-RoFKwZsx4RHKUwO8LhEZtmI08VBVrWt3TdzoJgx1HJ0=",
|
"narHash": "sha256-esE2L7+9CsmlSjTIHwU9VAhzvsFSMC3kO7EiutCPQpg=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hypridle",
|
"repo": "hypridle",
|
||||||
"rev": "4d2fb9e73eb6b75336ed3eb198e900f94ada24f4",
|
"rev": "26780ac51f6e7273e3934885036b7a7ed1a5af01",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -888,15 +887,15 @@
|
||||||
"hyprwayland-scanner": "hyprwayland-scanner",
|
"hyprwayland-scanner": "hyprwayland-scanner",
|
||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_5",
|
||||||
"pre-commit-hooks": "pre-commit-hooks",
|
"pre-commit-hooks": "pre-commit-hooks",
|
||||||
"systems": "systems_8",
|
"systems": "systems_7",
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730373668,
|
"lastModified": 1731425185,
|
||||||
"narHash": "sha256-8p5JTUGFuhnyuF9lD98ioeE3zYaCmsizLWk4Y3KszAI=",
|
"narHash": "sha256-hhmwtcOncg/RMmi2KDuvQfhYeahrhc4UsL36/NNdqYI=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "93b4478e70af6ffb08a4a66a6d0364c3296db296",
|
"rev": "bb160cfe377da2d2b2e4431a3399fa60114f3911",
|
||||||
"revCount": 5396,
|
"revCount": 5450,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland"
|
"url": "https://github.com/hyprwm/Hyprland"
|
||||||
|
|
@ -1027,11 +1026,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728941256,
|
"lastModified": 1731163338,
|
||||||
"narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=",
|
"narHash": "sha256-Qflei0JBeqQ0c8jxA8e982xAxJvfMwfx4Aci2eJi84s=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprutils",
|
"repo": "hyprutils",
|
||||||
"rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85",
|
"rev": "60d3dece30f98e8ad85131829c8529950630d6bc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1096,7 +1095,7 @@
|
||||||
"crane": "crane",
|
"crane": "crane",
|
||||||
"flake-compat": "flake-compat_2",
|
"flake-compat": "flake-compat_2",
|
||||||
"flake-parts": "flake-parts_2",
|
"flake-parts": "flake-parts_2",
|
||||||
"flake-utils": "flake-utils_4",
|
"flake-utils": "flake-utils_3",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
|
|
@ -1121,7 +1120,7 @@
|
||||||
"lexical": {
|
"lexical": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts_8",
|
"flake-parts": "flake-parts_8",
|
||||||
"nixpkgs": "nixpkgs_14",
|
"nixpkgs": "nixpkgs_15",
|
||||||
"systems": "systems_17"
|
"systems": "systems_17"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -1140,15 +1139,15 @@
|
||||||
},
|
},
|
||||||
"lib-aggregate": {
|
"lib-aggregate": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_5",
|
"flake-utils": "flake-utils_4",
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730031145,
|
"lastModified": 1731240728,
|
||||||
"narHash": "sha256-GZz0LGkeduajnF7zUuPu5evNyoOATcSsRZCkG1OqiwY=",
|
"narHash": "sha256-a0xQE3cwZLMsycd9NneFC3z29E+z1PSD/ozhISM7qYQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "lib-aggregate",
|
"repo": "lib-aggregate",
|
||||||
"rev": "7d235f23a84b54c39b1579b68b13e1ff83f5b1ad",
|
"rev": "807ab623e6d01e931269a28a07c59dcfd6474173",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1167,11 +1166,11 @@
|
||||||
"nixpkgs": "nixpkgs_7"
|
"nixpkgs": "nixpkgs_7"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730088025,
|
"lastModified": 1731500640,
|
||||||
"narHash": "sha256-FIdIaN7f6karwtDV65VXTV8VThNrR63nwykfgXpm4p4=",
|
"narHash": "sha256-bxtcbR33ftcSA+7+E52i+cqWAdoCQNFpxR1180HRX48=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "neovim-nightly-overlay",
|
"repo": "neovim-nightly-overlay",
|
||||||
"rev": "f35afbe60a4ff71fd65fec3839fc38943f961951",
|
"rev": "1329ddcc318e77e4629eb629d39f7f7c9b2632f6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1183,11 +1182,11 @@
|
||||||
"neovim-src": {
|
"neovim-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729121305,
|
"lastModified": 1731454739,
|
||||||
"narHash": "sha256-c94xkA/RuszC4PfmB+MWqOo2vbO66GTO6XKer0mbltA=",
|
"narHash": "sha256-ihuASDo2BVZpUpsW6Z8Ll/xvczRPgGT/EGrrNt7NnwU=",
|
||||||
"owner": "neovim",
|
"owner": "neovim",
|
||||||
"repo": "neovim",
|
"repo": "neovim",
|
||||||
"rev": "852954ff6d96adce0158f74ca494fdcef3aa1921",
|
"rev": "1128d75550fa0b481b8953a194bae890d733a166",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1204,11 +1203,11 @@
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730389079,
|
"lastModified": 1731250407,
|
||||||
"narHash": "sha256-g/CJ/KKe5MGsVx1oCBl0F9aCdcNSDeOw8H7e5QDGa2c=",
|
"narHash": "sha256-AwyDiazOqBZBUPp0vqYEzvBseZo3Eg16mfjAFvKv2lc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-eval-jobs",
|
"repo": "nix-eval-jobs",
|
||||||
"rev": "7f9159a16584ee86eed077c8a73e845690b7d513",
|
"rev": "96902c4573cd03ea7e533634cb49861148f49a7a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1241,11 +1240,11 @@
|
||||||
},
|
},
|
||||||
"nixlib": {
|
"nixlib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729386149,
|
"lastModified": 1729990941,
|
||||||
"narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
|
"narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "cce4521b6df014e79a7b7afc58c703ed683c916e",
|
"rev": "7d68864343650322045894951602d6e82b5296d7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1262,11 +1261,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729472750,
|
"lastModified": 1731341898,
|
||||||
"narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=",
|
"narHash": "sha256-2L34Jrd73o6q6t8xMVVK7cj4qk5uHYbSIh72qtIKWWs=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixos-generators",
|
"repo": "nixos-generators",
|
||||||
"rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565",
|
"rev": "3a5bf194b6b25ee27a2c61afed039f3cb3a0fbfc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1293,11 +1292,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729990941,
|
"lastModified": 1731200463,
|
||||||
"narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
|
"narHash": "sha256-qDaAweJjdFbVExqs8aG27urUgcgKufkIngHW3Rzustg=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "7d68864343650322045894951602d6e82b5296d7",
|
"rev": "e04234d263750db01c78a412690363dc2226e68a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1308,14 +1307,14 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-lib_2": {
|
"nixpkgs-lib_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727825735,
|
"lastModified": 1730504152,
|
||||||
"narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
|
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
|
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
|
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-lib_3": {
|
"nixpkgs-lib_3": {
|
||||||
|
|
@ -1344,11 +1343,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730137625,
|
"lastModified": 1731239293,
|
||||||
"narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
|
"narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
|
"rev": "9256f7c71a195ebe7a218043d9f93390d49e6884",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1360,11 +1359,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable_2": {
|
"nixpkgs-stable_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720386169,
|
"lastModified": 1730741070,
|
||||||
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
|
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
|
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1392,11 +1391,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730272153,
|
"lastModified": 1731245184,
|
||||||
"narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=",
|
"narHash": "sha256-vmLS8+x+gHRv1yzj3n+GTAEObwmhxmkkukB2DwtJRdU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53",
|
"rev": "aebe249544837ce42588aa4b2e7972222ba12e8f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1414,11 +1413,11 @@
|
||||||
"nixpkgs": "nixpkgs_10"
|
"nixpkgs": "nixpkgs_10"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730425081,
|
"lastModified": 1731435944,
|
||||||
"narHash": "sha256-c8JK1Zuc9QjfLfbnAEtB3uHz5pd+RMgMiR263TEtwAs=",
|
"narHash": "sha256-4pxvlMcGGjW1ZcaoOFuwPJsu3lxYZLcUaOIik5x6LeM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "968d7a95604a2ec252ce9912199dfa9ec6410ff0",
|
"rev": "c7648f36d9ae0d5e38aa0f7417b05e317eb162ba",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1429,11 +1428,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_10": {
|
"nixpkgs_10": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730200266,
|
"lastModified": 1731139594,
|
||||||
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
|
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
|
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1444,6 +1443,22 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_11": {
|
"nixpkgs_11": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1702151865,
|
||||||
|
"narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_12": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712883908,
|
"lastModified": 1712883908,
|
||||||
"narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=",
|
"narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=",
|
||||||
|
|
@ -1459,7 +1474,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_12": {
|
"nixpkgs_13": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728538411,
|
"lastModified": 1728538411,
|
||||||
"narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
|
"narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
|
||||||
|
|
@ -1475,7 +1490,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_13": {
|
"nixpkgs_14": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727348695,
|
"lastModified": 1727348695,
|
||||||
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
|
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
|
||||||
|
|
@ -1491,7 +1506,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_14": {
|
"nixpkgs_15": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719931832,
|
"lastModified": 1719931832,
|
||||||
"narHash": "sha256-0LD+KePCKKEb4CcPsTBOwf019wDtZJanjoKm1S8q3Do=",
|
"narHash": "sha256-0LD+KePCKKEb4CcPsTBOwf019wDtZJanjoKm1S8q3Do=",
|
||||||
|
|
@ -1505,7 +1520,7 @@
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_15": {
|
"nixpkgs_16": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 0,
|
"lastModified": 0,
|
||||||
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
|
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
|
||||||
|
|
@ -1551,11 +1566,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730200266,
|
"lastModified": 1731139594,
|
||||||
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
|
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
|
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1567,11 +1582,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729413321,
|
"lastModified": 1730785428,
|
||||||
"narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
|
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
|
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1599,11 +1614,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_7": {
|
"nixpkgs_7": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728863046,
|
"lastModified": 1731245184,
|
||||||
"narHash": "sha256-DZBO2465PL5V89e8hFSJewyH4QbCPpW3ssws7ckT/0A=",
|
"narHash": "sha256-vmLS8+x+gHRv1yzj3n+GTAEObwmhxmkkukB2DwtJRdU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d4f247e89f6e10120f911e2e2d2254a050d0f732",
|
"rev": "aebe249544837ce42588aa4b2e7972222ba12e8f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1615,11 +1630,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_8": {
|
"nixpkgs_8": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730200266,
|
"lastModified": 1731139594,
|
||||||
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
|
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
|
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1631,11 +1646,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_9": {
|
"nixpkgs_9": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723221148,
|
"lastModified": 1730958623,
|
||||||
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
|
"narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6",
|
"rev": "85f7e662eda4fa3a995556527c87b2524b691933",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1664,6 +1679,25 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"pnpm2nix_2": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils_5",
|
||||||
|
"nixpkgs": "nixpkgs_11"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1706694632,
|
||||||
|
"narHash": "sha256-ytyTwNPiUR8aq74QlxFI+Wv3MyvXz5POO1xZxQIoi0c=",
|
||||||
|
"owner": "nzbr",
|
||||||
|
"repo": "pnpm2nix-nzbr",
|
||||||
|
"rev": "0366b7344171accc2522525710e52a8abbf03579",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nzbr",
|
||||||
|
"repo": "pnpm2nix-nzbr",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"pre-commit-hooks": {
|
"pre-commit-hooks": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
|
|
@ -1675,11 +1709,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729104314,
|
"lastModified": 1730814269,
|
||||||
"narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
|
"narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
|
"rev": "d70155fdc00df4628446352fc58adc640cd705c2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1736,7 +1770,7 @@
|
||||||
},
|
},
|
||||||
"resume": {
|
"resume": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_11",
|
"nixpkgs": "nixpkgs_12",
|
||||||
"systems": "systems_12"
|
"systems": "systems_12"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -1763,11 +1797,11 @@
|
||||||
"systems": "systems_13"
|
"systems": "systems_13"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730390610,
|
"lastModified": 1731456097,
|
||||||
"narHash": "sha256-w0cvFyBxRODo/KHzKelVlc+yLwcLqSlYaAdwK9ARktE=",
|
"narHash": "sha256-moAGKMHAVW2EE+GN3CzRNBca/mYjqHQg1FErwR1p1LA=",
|
||||||
"owner": "raphamorim",
|
"owner": "raphamorim",
|
||||||
"repo": "rio",
|
"repo": "rio",
|
||||||
"rev": "4dbd7c89568ae87ce1731b658cd1b6b93404c216",
|
"rev": "29484e7a2ed964d742fed3f6ef8fedab090b650c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1794,6 +1828,7 @@
|
||||||
"nixpkgs": "nixpkgs_8",
|
"nixpkgs": "nixpkgs_8",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"nixpkgs-wayland": "nixpkgs-wayland",
|
"nixpkgs-wayland": "nixpkgs-wayland",
|
||||||
|
"pnpm2nix": "pnpm2nix_2",
|
||||||
"resume": "resume",
|
"resume": "resume",
|
||||||
"rio-term": "rio-term",
|
"rio-term": "rio-term",
|
||||||
"rust-overlay": "rust-overlay_4",
|
"rust-overlay": "rust-overlay_4",
|
||||||
|
|
@ -1808,7 +1843,7 @@
|
||||||
},
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils_2",
|
||||||
"nixpkgs": "nixpkgs_6"
|
"nixpkgs": "nixpkgs_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -1852,14 +1887,14 @@
|
||||||
},
|
},
|
||||||
"rust-overlay_3": {
|
"rust-overlay_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_12"
|
"nixpkgs": "nixpkgs_13"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729909612,
|
"lastModified": 1731119076,
|
||||||
"narHash": "sha256-eXqxxbOagphPfjPptSlv0pQONB3fH15CQ4G8uCu1BW4=",
|
"narHash": "sha256-2eVhmocCZHJlFAz6Mt3EwPdFFVAtGgIySJc1EHQVxcc=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "17cadbc36da05e75197d082decb382a5f4208e30",
|
"rev": "23c4b3ba5f806fcf25d5a3b6b54fa0d07854c032",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1875,11 +1910,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730341826,
|
"lastModified": 1731464916,
|
||||||
"narHash": "sha256-RFaeY7EWzXOmAL2IQEACbnrEza3TgD5UQApHR4hGHhY=",
|
"narHash": "sha256-WZ5rpjr/wCt7yBOUsvDE2i22hYz9g8W921jlwVktRQ4=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "815d1b3ee71716fc91a7bd149801e1f04d45fbc5",
|
"rev": "2c19bad6e881b5a154cafb7f9106879b5b356d1f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1965,11 +2000,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730348281,
|
"lastModified": 1731471404,
|
||||||
"narHash": "sha256-c5lP7JFqWlrEScvPXKxg7Z2+f5wdlznYZPjEa5jmEkw=",
|
"narHash": "sha256-xrqZLeXOI5qm90iN5sgyINMU2621jf+WBMJivpTNEWc=",
|
||||||
"owner": "Gerg-L",
|
"owner": "Gerg-L",
|
||||||
"repo": "spicetify-nix",
|
"repo": "spicetify-nix",
|
||||||
"rev": "22d250d6a4dcc492a2d8836d3f2c901a09e7cb76",
|
"rev": "c80ea8541d55731f143828a574e00d50553e9c7c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -2191,16 +2226,16 @@
|
||||||
},
|
},
|
||||||
"systems_6": {
|
"systems_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1689347949,
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
"repo": "default",
|
"repo": "default-linux",
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
"repo": "default",
|
"repo": "default-linux",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -2221,16 +2256,16 @@
|
||||||
},
|
},
|
||||||
"systems_8": {
|
"systems_8": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1689347949,
|
"lastModified": 1681028828,
|
||||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
"repo": "default-linux",
|
"repo": "default",
|
||||||
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
"repo": "default-linux",
|
"repo": "default",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -2279,11 +2314,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729839164,
|
"lastModified": 1731512188,
|
||||||
"narHash": "sha256-kA+oY+B/0shEGVpEZxmMOOjJv8JB6ZifQn21V/tM5o8=",
|
"narHash": "sha256-fELrde5IDAgdYQQL/EAPBPFZIN73p/zd33rtfJQsA4s=",
|
||||||
"owner": "Alexays",
|
"owner": "Alexays",
|
||||||
"repo": "Waybar",
|
"repo": "Waybar",
|
||||||
"rev": "5f260516af9a3e5791c26c7fc18a85a47da5b23f",
|
"rev": "86451156190e69afafb2162fb5891c0fc68c26e7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -2320,11 +2355,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728166987,
|
"lastModified": 1730743262,
|
||||||
"narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=",
|
"narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
"rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787",
|
"rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -2335,7 +2370,7 @@
|
||||||
},
|
},
|
||||||
"zen-browser": {
|
"zen-browser": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_13"
|
"nixpkgs": "nixpkgs_14"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727721329,
|
"lastModified": 1727721329,
|
||||||
|
|
@ -2355,7 +2390,7 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts_7",
|
"flake-parts": "flake-parts_7",
|
||||||
"lexical": "lexical",
|
"lexical": "lexical",
|
||||||
"nixpkgs": "nixpkgs_15",
|
"nixpkgs": "nixpkgs_16",
|
||||||
"process-compose-flake": "process-compose-flake",
|
"process-compose-flake": "process-compose-flake",
|
||||||
"systems": "systems_18"
|
"systems": "systems_18"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,8 @@
|
||||||
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
agenix.inputs.darwin.follows = "";
|
agenix.inputs.darwin.follows = "";
|
||||||
|
|
||||||
|
pnpm2nix.url = "github:nzbr/pnpm2nix-nzbr";
|
||||||
|
|
||||||
solaar = {
|
solaar = {
|
||||||
#url = "https://flakehub.com/f/Svenum/Solaar-Flake/*.tar.gz" # For latest stable version
|
#url = "https://flakehub.com/f/Svenum/Solaar-Flake/*.tar.gz" # For latest stable version
|
||||||
#url = "https://flakehub.com/f/Svenum/Solaar-Flake/0.1.1.tar.gz" # uncomment line for solaar version 1.1.13
|
#url = "https://flakehub.com/f/Svenum/Solaar-Flake/0.1.1.tar.gz" # uncomment line for solaar version 1.1.13
|
||||||
|
|
|
||||||
|
|
@ -30,5 +30,5 @@
|
||||||
"news": {
|
"news": {
|
||||||
"NEWS.md": "6520"
|
"NEWS.md": "6520"
|
||||||
},
|
},
|
||||||
"version": 6
|
"version": 7
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,37 +1,34 @@
|
||||||
function confirm(opts)
|
|
||||||
local cmp = require("blink.cmp")
|
|
||||||
opts = vim.tbl_extend("force", { select = true }, opts or {})
|
|
||||||
return function(fallback) end
|
|
||||||
end
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"LazyVim/LazyVim",
|
"LazyVim/LazyVim",
|
||||||
opts = {
|
opts = {
|
||||||
colorscheme = "catppuccin",
|
colorscheme = "catppuccin",
|
||||||
|
news = { lazyvim = false },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
"f-person/git-blame.nvim",
|
||||||
{ "nvim-lualine/lualine.nvim", enabled = false },
|
{ "nvim-lualine/lualine.nvim", enabled = false },
|
||||||
|
-- {
|
||||||
|
-- "nvim-neorg/neorg",
|
||||||
|
-- lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default
|
||||||
|
-- version = "*", -- Pin Neorg to the latest stable release
|
||||||
|
-- config = true,
|
||||||
|
-- opts = {
|
||||||
|
-- load = {
|
||||||
|
-- ["core.defaults"] = {},
|
||||||
|
-- ["core.concealer"] = {},
|
||||||
|
-- },
|
||||||
|
-- },
|
||||||
|
-- },
|
||||||
{ "echasnovski/mini.statusline", opts = {} },
|
{ "echasnovski/mini.statusline", opts = {} },
|
||||||
{
|
|
||||||
"L3MON4D3/LuaSnip",
|
|
||||||
dependencies = {
|
|
||||||
"rafamadriz/friendly-snippets",
|
|
||||||
},
|
|
||||||
config = function()
|
|
||||||
require("luasnip.loaders.from_vscode").lazy_load()
|
|
||||||
require("luasnip.loaders.from_vscode").lazy_load({
|
|
||||||
paths = vim.fn.stdpath("config") .. "/snippets/",
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
"direnv/direnv.vim",
|
|
||||||
{
|
{
|
||||||
"stevearc/conform.nvim",
|
"stevearc/conform.nvim",
|
||||||
opts = {
|
opts = {
|
||||||
formatters_by_ft = {
|
formatters_by_ft = {
|
||||||
nix = { "alejandra" },
|
nix = { "alejandra" },
|
||||||
typescript = { "prettierd" },
|
typescript = { "prettierd" },
|
||||||
|
typescriptreact = { "prettierd" },
|
||||||
|
javascriptreact = { "prettierd" },
|
||||||
javascript = { "prettierd" },
|
javascript = { "prettierd" },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
@ -49,6 +46,13 @@ return {
|
||||||
-- whitespace = { highlight = "Whitespace", "NonText" },
|
-- whitespace = { highlight = "Whitespace", "NonText" },
|
||||||
-- },
|
-- },
|
||||||
},
|
},
|
||||||
|
-- lua with lazy.nvim
|
||||||
|
{
|
||||||
|
"max397574/better-escape.nvim",
|
||||||
|
config = function()
|
||||||
|
require("better_escape").setup()
|
||||||
|
end,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"jake-stewart/force-cul.nvim",
|
"jake-stewart/force-cul.nvim",
|
||||||
config = function()
|
config = function()
|
||||||
|
|
|
||||||
|
|
@ -5,85 +5,77 @@
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib; let
|
||||||
with lib.custom; let
|
|
||||||
cfg = config.apps.tools.starship;
|
cfg = config.apps.tools.starship;
|
||||||
in {
|
in {
|
||||||
options.apps.tools.starship = with types; {
|
options.apps.tools.starship = with types; {
|
||||||
enable = mkBoolOpt false "Enable Tmux";
|
enable = mkEnableOption "Starship prompt";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home.packages = [
|
|
||||||
pkgs.custom.getgithost
|
|
||||||
];
|
|
||||||
|
|
||||||
programs.starship = {
|
programs.starship = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableZshIntegration = config.programs.zsh.enable;
|
enableZshIntegration = config.programs.zsh.enable;
|
||||||
settings = {
|
settings = {
|
||||||
add_newline = false;
|
add_newline = false;
|
||||||
command_timeout = 1000;
|
format = "$username$directory$git_branch$git_status$python$rust$nodejs$nix_shell$cmd_duration$line_break$character";
|
||||||
scan_timeout = 10;
|
|
||||||
format = ''
|
# Username display
|
||||||
$username$shlvl$kubernetes''${custom.dir}''${custom.home_dir}$directory''${custom.git_host}$git_branch$git_commit$git_state$git_status$hg_branch$docker_context$package$cmake$dart$dotnet$elixir$elm$erlang$golang$helm$java$julia$kotlin$nim$nodejs$ocaml$perl$php$purescript$python$ruby$rust$swift$terraform$vagrant$zig$nix_shell$conda$aws$gcloud$openstack$env_var$crystal$custom$cmd_duration$lua$line_break$jobs$status$character
|
username = {
|
||||||
'';
|
style_user = "blue bold";
|
||||||
character = {
|
style_root = "red bold";
|
||||||
success_symbol = "[>](#89b4fa)[>](#f5c2e7)[>](#f2cdcd)";
|
format = "[$user]($style) ";
|
||||||
error_symbol = "[>>>](red)";
|
show_always = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Modern minimal prompt character
|
||||||
|
character = {
|
||||||
|
success_symbol = "[>](blue)";
|
||||||
|
error_symbol = "[>](red)";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Simplified directory display
|
||||||
directory = {
|
directory = {
|
||||||
truncation_length = 1;
|
truncation_length = 1;
|
||||||
format = "[ $path ]($style)[$read_only]($read_only_style) ";
|
style = "bold lavender";
|
||||||
style = "fg:white bg:black bold";
|
format = "[$path]($style) ";
|
||||||
read_only = " ";
|
read_only = " ";
|
||||||
read_only_style = "fg:black bg:red";
|
|
||||||
};
|
};
|
||||||
git_commit = {commit_hash_length = 7;};
|
|
||||||
git_branch = {format = "[$symbol$branch]($style) ";};
|
# Streamlined git status indicators
|
||||||
|
git_branch = {
|
||||||
|
format = "[$symbol$branch]($style) ";
|
||||||
|
style = "mauve";
|
||||||
|
};
|
||||||
|
|
||||||
git_status = {
|
git_status = {
|
||||||
conflicted = "[<](white)=[$count](bright-white bold)[>](white)";
|
format = "[$all_status$ahead_behind]($style) ";
|
||||||
ahead = "[<](white)⇡[$count](bright-white bold)[>](white)";
|
style = "bold peach";
|
||||||
behind = "[<](white)⇣[$count](bright-white bold)[>](white)";
|
conflicted = "=";
|
||||||
diverged = "[<](white)⇕⇡[$ahead_count](bright-white bold)⇣[$behind_count](bright-white)[>](white)";
|
ahead = "⇡";
|
||||||
untracked = "[<](white)?[$count](bright-white bold)[>](white)";
|
behind = "⇣";
|
||||||
stashed = "[<](white)$[$count](bright-white bold)[>](white)";
|
diverged = "⇕";
|
||||||
modified = "[<](white)[>](white)";
|
untracked = "?";
|
||||||
staged = "[<](white)+[$count](bright-white bold)[>](white)";
|
stashed = "$";
|
||||||
renamed = "[<](white)»[$count](bright-white bold)[>](white)";
|
modified = "!";
|
||||||
deleted = "[<](white)✗[$count](bright-white bold)[>](white)";
|
staged = "+";
|
||||||
|
renamed = "»";
|
||||||
|
deleted = "✗";
|
||||||
};
|
};
|
||||||
custom = {
|
|
||||||
home_dir = {
|
# Language modules with minimal styling
|
||||||
command = "echo ";
|
python.symbol = "[](yellow) ";
|
||||||
when = "[ \"$PWD\" == \"$HOME\" ]";
|
rust.symbol = "[](peach) ";
|
||||||
shell = "[\"bash\",\"--norc\",\"--noprofile\"]";
|
nodejs.symbol = "[](green) ";
|
||||||
style = "fg:bright-white bg:bright-black";
|
nix_shell.symbol = "[](blue) ";
|
||||||
format = "[ $output ]($style)";
|
|
||||||
};
|
# Command duration and line break
|
||||||
dir = {
|
cmd_duration = {
|
||||||
command = "echo ";
|
format = "[$duration]($style) ";
|
||||||
when = "[ \"$PWD\" != \"$HOME\" ]";
|
style = "yellow";
|
||||||
shell = "[\"bash\",\"--norc\",\"--noprofile\"]";
|
|
||||||
style = "fg:blue bg:bright-black";
|
|
||||||
format = "[ $output ]($style)";
|
|
||||||
};
|
|
||||||
git_host = {
|
|
||||||
command = "getgithost";
|
|
||||||
when = "git rev-parse --is-inside-work-tree 2> /dev/null";
|
|
||||||
shell = "[\"bash\",\"--norc\",\"--noprofile\"]";
|
|
||||||
style = "bright-yellow bold";
|
|
||||||
format = "at [$output]($style)";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
line_break.disabled = false;
|
line_break.disabled = false;
|
||||||
lua.symbol = "[](blue) ";
|
|
||||||
python.symbol = "[](blue) ";
|
|
||||||
hostname = {
|
|
||||||
ssh_only = true;
|
|
||||||
format = "[$hostname](bold blue) ";
|
|
||||||
disabled = false;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -35,24 +35,17 @@ in {
|
||||||
set-window-option -g pane-base-index 1
|
set-window-option -g pane-base-index 1
|
||||||
set-option -g renumber-windows on
|
set-option -g renumber-windows on
|
||||||
|
|
||||||
set -g @catppuccin_window_left_separator ""
|
set -g @catppuccin_flavor "mocha"
|
||||||
set -g @catppuccin_window_right_separator " "
|
set -g @catppuccin_window_status_style "basic"
|
||||||
set -g @catppuccin_window_middle_separator " █"
|
set -g default-terminal "tmux-256color"
|
||||||
set -g @catppuccin_window_number_position "right"
|
|
||||||
set -g @catppuccin_window_default_fill "number"
|
set -g status-right-length 100
|
||||||
set -g @catppuccin_window_default_text "#W"
|
set -g status-left-length 100
|
||||||
set -g @catppuccin_window_current_fill "number"
|
set -g status-left ""
|
||||||
set -g @catppuccin_window_current_text "#W#{?window_zoomed_flag,(),}"
|
set -g status-right "#{E:@catppuccin_status_application}"
|
||||||
set -g @catppuccin_status_modules_right "directory meetings cpu date_time uptime"
|
set -agF status-right "#{E:@catppuccin_status_cpu}"
|
||||||
set -g @catppuccin_status_modules_left "session"
|
set -ag status-right "#{E:@catppuccin_status_session}"
|
||||||
set -g @catppuccin_status_left_separator " "
|
set -ag status-right "#{E:@catppuccin_status_uptime}"
|
||||||
set -g @catppuccin_status_right_separator " "
|
|
||||||
set -g @catppuccin_status_right_separator_inverse "no"
|
|
||||||
set -g @catppuccin_status_fill "icon"
|
|
||||||
set -g @catppuccin_status_connect_separator "no"
|
|
||||||
set -g @catppuccin_directory_text "#{b:pane_current_path}"
|
|
||||||
set -g @catppuccin_meetings_text "#($HOME/.config/tmux/scripts/cal.sh)"
|
|
||||||
set -g @catppuccin_date_time_text "%H:%M"
|
|
||||||
|
|
||||||
bind-key -T copy-mode-vi v send-keys -X begin-selection
|
bind-key -T copy-mode-vi v send-keys -X begin-selection
|
||||||
bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
|
bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ in {
|
||||||
|
|
||||||
Service = {
|
Service = {
|
||||||
Restart = "always";
|
Restart = "always";
|
||||||
ExecStart = "${pkgs.protonmail-bridge}/bin/protonmail-bridge --no-window --log-level ${cfg.logLevel}" + optionalString (cfg.nonInteractive) " --noninteractive";
|
ExecStart = "${lib.getExe pkgs.hydroxide} serve";
|
||||||
};
|
};
|
||||||
|
|
||||||
Install = {
|
Install = {
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@ with pkgs; {
|
||||||
MANPAGER = "sh -c 'col -bx | bat -l man -p'";
|
MANPAGER = "sh -c 'col -bx | bat -l man -p'";
|
||||||
du = getExe du-dust;
|
du = getExe du-dust;
|
||||||
ps = getExe procs;
|
ps = getExe procs;
|
||||||
|
lb = "pw-loopback -C \"alsa_input.pci-0000_0d_00.4.analog-stereo\" -P \"Scarlett Solo (3rd Gen.) Headphones / Line 1-2\"";
|
||||||
deploy = "nixos-rebuild switch --flake ~/nixos#pluto --target-host zoeys.computer --use-remote-sudo";
|
deploy = "nixos-rebuild switch --flake ~/nixos#pluto --target-host zoeys.computer --use-remote-sudo";
|
||||||
m = "mkdir -p";
|
m = "mkdir -p";
|
||||||
fcd = "cd $(find -type d | fzf)";
|
fcd = "cd $(find -type d | fzf)";
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,7 @@ in {
|
||||||
|
|
||||||
wayland.windowManager.hyprland.settings = with colors; {
|
wayland.windowManager.hyprland.settings = with colors; {
|
||||||
exec-once = [
|
exec-once = [
|
||||||
# "pw-loopback -C \"alsa_input.pci-0000_0d_00.4.analog-stereo\" -P \"Scarlett Solo (3rd Gen.) Headphones / Line 1-2\""
|
"pw-loopback -C \"alsa_input.pci-0000_0d_00.4.analog-stereo\" -P \"Scarlett Solo (3rd Gen.) Headphones / Line 1-2\""
|
||||||
# "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
# "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||||
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||||
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,8 @@ in {
|
||||||
|
|
||||||
extraConfig.pipewire.adjust-sample-rate = {
|
extraConfig.pipewire.adjust-sample-rate = {
|
||||||
"context.properties" = {
|
"context.properties" = {
|
||||||
"default.clock.rate" = 96000;
|
"default.clock.rate" = 48000;
|
||||||
"default.allowed-rates" = [96000];
|
"default.allowed-rates" = [48000];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,7 @@ in {
|
||||||
"git+ssh://github.com/"
|
"git+ssh://github.com/"
|
||||||
"git+https://git.zoeys.computer/"
|
"git+https://git.zoeys.computer/"
|
||||||
"git+ssh://git.zoeys.computer/"
|
"git+ssh://git.zoeys.computer/"
|
||||||
|
"path:"
|
||||||
];
|
];
|
||||||
trustedUsers = ["hydra"]; # Ensure hydra user is trusted for nix
|
trustedUsers = ["hydra"]; # Ensure hydra user is trusted for nix
|
||||||
buildMachines = [
|
buildMachines = [
|
||||||
|
|
|
||||||
1
modules/nixos/sites/pds/atproto/.well-known/atproto-did
Normal file
1
modules/nixos/sites/pds/atproto/.well-known/atproto-did
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
did:plc:xcdmmzavba7hda7cdllvnm3q
|
||||||
11
modules/nixos/sites/pds/cloudflare.age
Normal file
11
modules/nixos/sites/pds/cloudflare.age
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
age-encryption.org/v1
|
||||||
|
-> ssh-ed25519 lGzg3g ubKqOxjQuETum4jFizgaF7Howiz/Q8jyaOHoXgovd18
|
||||||
|
DDVTAdDUGQUmJte2+VdmRfzlMdoT9534SKJDCAo8z1w
|
||||||
|
-> ssh-ed25519 s+NXzQ G46FDbxKPW3tpE46NiUZY6TZcWzgZ4lS4eYmjz4oJhc
|
||||||
|
iv11dp9dWYnWACkWG9xorOzpEl1689qnQImdJby/ip4
|
||||||
|
-> ssh-ed25519 yEtzbQ 9s9q70RO4zrKGf6ih80jyD+roAUJIHjyQQKRqNo0SGg
|
||||||
|
xTE6HvJt2n99B6ltwlmFSdw5nnSIcVb444BTHXOjVUI
|
||||||
|
-> ssh-ed25519 RMNffg Meu8usfE+zFiZnOAEjCvEEQ13VBxCmlo79OLDQ0Ppyo
|
||||||
|
zqh3VzlfeFBNA/SgdD+wFgfKaWYNmN1UcwrRn8JEj70
|
||||||
|
--- 0OGQgnI656lh0EnAxN5Pygo6DbcN/fVETwR055tEP+E
|
||||||
|
Ok8<6B>3?¹ Û™]#¬Ð…z= «Y<C2AB> Û6P
NñšÄDÚ#P:Å•”Å7Á<^8Í<õCªí‰ÅŸ1/ 8f7¶_ùã p5«
.÷L |<7C>g6 y+ ¡ÚúM;P'n%wŒiÎŒ)~år8XÖNaÆÿ¦´PZU£&Qì³,Èe‚
|
||||||
224
modules/nixos/sites/pds/default.nix
Normal file
224
modules/nixos/sites/pds/default.nix
Normal file
|
|
@ -0,0 +1,224 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
with lib; let
|
||||||
|
cfg = config.services.atproto-pds;
|
||||||
|
in {
|
||||||
|
options.services.atproto-pds = {
|
||||||
|
enable = mkEnableOption "Bluesky Personal Data Server container";
|
||||||
|
|
||||||
|
dataDir = mkOption {
|
||||||
|
type = types.path;
|
||||||
|
default = "/pds";
|
||||||
|
description = "Directory to store PDS data, maps to /pds inside container.";
|
||||||
|
};
|
||||||
|
|
||||||
|
blobStorage = {
|
||||||
|
type = mkOption {
|
||||||
|
type = types.enum ["disk" "s3"];
|
||||||
|
default = "disk";
|
||||||
|
description = "Type of blob storage to use (disk or s3).";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Disk-specific options
|
||||||
|
diskPath = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "/pds/blocks";
|
||||||
|
description = "Path for disk-based blob storage.";
|
||||||
|
};
|
||||||
|
|
||||||
|
# S3-specific options
|
||||||
|
s3 = {
|
||||||
|
endpoint = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
default = null;
|
||||||
|
description = "S3 endpoint URL (optional, for non-AWS S3).";
|
||||||
|
};
|
||||||
|
|
||||||
|
bucket = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "";
|
||||||
|
description = "S3 bucket name.";
|
||||||
|
};
|
||||||
|
|
||||||
|
region = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "us-east-1";
|
||||||
|
description = "AWS region for S3.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
environmentFile = mkOption {
|
||||||
|
type = types.path;
|
||||||
|
default = "/pds/pds.env";
|
||||||
|
description = "Environment file for PDS configuration.";
|
||||||
|
};
|
||||||
|
|
||||||
|
image = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "ghcr.io/bluesky-social/pds";
|
||||||
|
description = "PDS container image to use.";
|
||||||
|
};
|
||||||
|
|
||||||
|
imageTag = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "0.4";
|
||||||
|
description = "Tag of the PDS container image.";
|
||||||
|
};
|
||||||
|
|
||||||
|
port = mkOption {
|
||||||
|
type = types.port;
|
||||||
|
default = 3000;
|
||||||
|
description = "Port on which PDS will listen.";
|
||||||
|
};
|
||||||
|
|
||||||
|
useHostNetwork = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Whether to use host networking. Set to false to use port mapping instead.";
|
||||||
|
};
|
||||||
|
|
||||||
|
nginx = {
|
||||||
|
enable = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = true;
|
||||||
|
description = "Whether to enable nginx virtual host.";
|
||||||
|
};
|
||||||
|
|
||||||
|
domain = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "zoeys.computer";
|
||||||
|
description = "Domain name for the PDS server.";
|
||||||
|
};
|
||||||
|
|
||||||
|
subdomainPrefix = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "*";
|
||||||
|
description = "Subdomain prefix for PDS (e.g., pds.zoeys.computer).";
|
||||||
|
};
|
||||||
|
|
||||||
|
useACME = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = true;
|
||||||
|
description = "Whether to enable automatic HTTPS certificates via ACME.";
|
||||||
|
};
|
||||||
|
|
||||||
|
extraConfig = mkOption {
|
||||||
|
type = types.lines;
|
||||||
|
default = "";
|
||||||
|
description = "Additional nginx configuration.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
age.secrets = {
|
||||||
|
pds = {
|
||||||
|
file = ./pds.age;
|
||||||
|
};
|
||||||
|
cloudflare = {
|
||||||
|
file = ./cloudflare.age;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Ensure directories exist
|
||||||
|
systemd.tmpfiles.rules =
|
||||||
|
[
|
||||||
|
"d '${cfg.dataDir}' 0750 root root - -"
|
||||||
|
# Create blocks directory if using disk storage
|
||||||
|
]
|
||||||
|
++ optional (cfg.blobStorage.type == "disk")
|
||||||
|
"d '${cfg.blobStorage.diskPath}' 0750 root root - -";
|
||||||
|
|
||||||
|
# Docker container configuration
|
||||||
|
virtualisation.oci-containers = {
|
||||||
|
backend = "docker";
|
||||||
|
containers.pds = {
|
||||||
|
image = "${cfg.image}:${cfg.imageTag}";
|
||||||
|
autoStart = true;
|
||||||
|
|
||||||
|
extraOptions =
|
||||||
|
[
|
||||||
|
"--name=pds"
|
||||||
|
"--env-file=${config.age.secrets.pds.path}"
|
||||||
|
]
|
||||||
|
++ (optional cfg.useHostNetwork "--network=host");
|
||||||
|
|
||||||
|
# Add port mapping if not using host network
|
||||||
|
ports = mkIf (!cfg.useHostNetwork) [
|
||||||
|
"${toString cfg.port}:3000"
|
||||||
|
];
|
||||||
|
|
||||||
|
# Match docker-compose volumes
|
||||||
|
volumes = [
|
||||||
|
"${cfg.dataDir}:/pds"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Nginx configuration remains the same as before
|
||||||
|
services.nginx = mkIf cfg.nginx.enable {
|
||||||
|
enable = true;
|
||||||
|
recommendedProxySettings = true;
|
||||||
|
recommendedTlsSettings = true;
|
||||||
|
recommendedOptimisation = true;
|
||||||
|
recommendedGzipSettings = true;
|
||||||
|
|
||||||
|
virtualHosts = {
|
||||||
|
"${cfg.nginx.domain}" = {
|
||||||
|
enableACME = cfg.nginx.useACME;
|
||||||
|
forceSSL = cfg.nginx.useACME;
|
||||||
|
|
||||||
|
locations = {
|
||||||
|
"~ ^/xrpc/(.*)$" = {
|
||||||
|
proxyPass = "http://127.0.0.1:${toString cfg.port}";
|
||||||
|
proxyWebsockets = true;
|
||||||
|
extraConfig = ''
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
"~ ^/.well-known/atproto-did$" = {
|
||||||
|
root = ./atproto;
|
||||||
|
extraConfig = ''
|
||||||
|
default_type text/plain;
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
"~^(?<subdomain>.+)\\.${cfg.nginx.domain}" = {
|
||||||
|
useACMEHost = "pds.zoeys.computer";
|
||||||
|
forceSSL = cfg.nginx.useACME;
|
||||||
|
|
||||||
|
locations."/" = {
|
||||||
|
proxyPass = "http://127.0.0.1:${toString cfg.port}";
|
||||||
|
proxyWebsockets = true;
|
||||||
|
extraConfig = ''
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
${cfg.nginx.extraConfig}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
security.acme.certs = mkIf cfg.nginx.useACME {
|
||||||
|
"pds.zoeys.computer" = {
|
||||||
|
domain = "*.zoeys.computer";
|
||||||
|
dnsProvider = "cloudflare";
|
||||||
|
credentialsFile = config.age.secrets.cloudflare.path;
|
||||||
|
group = config.services.nginx.group;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
BIN
modules/nixos/sites/pds/pds.age
Normal file
BIN
modules/nixos/sites/pds/pds.age
Normal file
Binary file not shown.
|
|
@ -29,20 +29,21 @@ in {
|
||||||
lexend
|
lexend
|
||||||
jost
|
jost
|
||||||
dejavu_fonts
|
dejavu_fonts
|
||||||
(pkgs-unstable.iosevka.override {
|
iosevka
|
||||||
set = "Custom";
|
# (pkgs-unstable.iosevka.override {
|
||||||
privateBuildPlan = ''
|
# set = "Custom";
|
||||||
[buildPlans.IosevkaCustom]
|
# privateBuildPlan = ''
|
||||||
family = "Iosevka"
|
# [buildPlans.IosevkaCustom]
|
||||||
spacing = "normal"
|
# family = "Iosevka"
|
||||||
serifs = "sans"
|
# spacing = "normal"
|
||||||
noCvSs = true
|
# serifs = "sans"
|
||||||
exportGlyphNames = true
|
# noCvSs = true
|
||||||
|
# exportGlyphNames = true
|
||||||
[buildPlans.IosevkaCustom.variants]
|
#
|
||||||
inherits = "ss14"
|
# [buildPlans.IosevkaCustom.variants]
|
||||||
'';
|
# inherits = "ss14"
|
||||||
})
|
# '';
|
||||||
|
# })
|
||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-cjk-sans
|
noto-fonts-cjk-sans
|
||||||
noto-fonts-emoji
|
noto-fonts-emoji
|
||||||
|
|
|
||||||
16
packages/atproto-pds/default.nix
Normal file
16
packages/atproto-pds/default.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
{
|
||||||
|
inputs,
|
||||||
|
fetchFromGitHub,
|
||||||
|
pkgs,
|
||||||
|
}: let
|
||||||
|
pds = fetchFromGitHub {
|
||||||
|
owner = "bluesky-social";
|
||||||
|
repo = "pds";
|
||||||
|
rev = "main";
|
||||||
|
hash = "sha256-dEB5u++Zx+F4TH5q44AF/tuwAhLEyYT+U5/18viT4sw=";
|
||||||
|
};
|
||||||
|
in
|
||||||
|
inputs.pnpm2nix.packages.${pkgs.system}.mkPnpmPackage {
|
||||||
|
src = "${pds}/service";
|
||||||
|
extraBuildInputs = [pkgs.sqlite];
|
||||||
|
}
|
||||||
|
|
@ -17,7 +17,7 @@ writeShellScriptBin "enc" ''
|
||||||
|
|
||||||
# Create a temporary file
|
# Create a temporary file
|
||||||
temp_file=$(${coreutils}/bin/mktemp)
|
temp_file=$(${coreutils}/bin/mktemp)
|
||||||
trap "${coreutils}/bin/rm -f $temp_file" EXIT
|
trap "${coreutils}/bin/rm -f $temp_file $temp_file.asc" EXIT
|
||||||
|
|
||||||
# Create recipient arguments for gpg
|
# Create recipient arguments for gpg
|
||||||
recipients=()
|
recipients=()
|
||||||
|
|
|
||||||
|
|
@ -170,13 +170,13 @@
|
||||||
in
|
in
|
||||||
buildStdenv.mkDerivation (finalAttrs: {
|
buildStdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "zen-browser-unwrapped";
|
pname = "zen-browser-unwrapped";
|
||||||
version = "1.0.1-t.17";
|
version = "1.0.1-a.19";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zen-browser";
|
owner = "zen-browser";
|
||||||
repo = "desktop";
|
repo = "desktop";
|
||||||
rev = "715b6df2fb8171336adc8712668a5e8458f7749b";
|
rev = "0e02cb14ecd72f5bc90a0e1093731409ab043578";
|
||||||
hash = "sha256-0+x2XoZyMdzP1beJvUSeM/QnFyQ+FSuGIatHh1mtBaw=";
|
hash = "sha256-+eehLsnQoWapkSKo3zWFxaz6N68BryK1XsmSk48zbbk=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,21 @@
|
||||||
services.gh.enable = true;
|
services.gh.enable = true;
|
||||||
services.fail2ban.enable = true;
|
services.fail2ban.enable = true;
|
||||||
|
|
||||||
|
services.atproto-pds = {
|
||||||
|
enable = true;
|
||||||
|
nginx = {
|
||||||
|
enable = true;
|
||||||
|
domain = "zoeys.computer";
|
||||||
|
subdomainPrefix = "pds";
|
||||||
|
useACME = true;
|
||||||
|
};
|
||||||
|
blobStorage = {
|
||||||
|
type = "disk";
|
||||||
|
diskPath = "/pds/blocks"; # or your preferred path
|
||||||
|
};
|
||||||
|
port = 3525; # or any other port you want to use
|
||||||
|
};
|
||||||
|
|
||||||
ui.fonts.enable = true;
|
ui.fonts.enable = true;
|
||||||
|
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue