update flake
This commit is contained in:
dim
parent
5c4712a5e2
commit
0a52297be4
GPG Key ID:
8D5D880EB08F1544
121
flake.lock
121
flake.lock
@ -20,11 +20,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755946532,
|
"lastModified": 1760101617,
|
||||||
"narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=",
|
"narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "aquamarine",
|
"repo": "aquamarine",
|
||||||
"rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada",
|
"rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -54,16 +54,17 @@
|
|||||||
"base16-fish": {
|
"base16-fish": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1622559957,
|
"lastModified": 1754405784,
|
||||||
"narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
|
"narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
|
||||||
"owner": "tomyun",
|
"owner": "tomyun",
|
||||||
"repo": "base16-fish",
|
"repo": "base16-fish",
|
||||||
"rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
|
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "tomyun",
|
"owner": "tomyun",
|
||||||
"repo": "base16-fish",
|
"repo": "base16-fish",
|
||||||
|
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -108,11 +109,11 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1758879217,
|
"lastModified": 1761478231,
|
||||||
"narHash": "sha256-vWk2iw/i5c0RHc/zLVyB51UYvmbzPq3uB14NN7kaouE=",
|
"narHash": "sha256-a6ROM73M0TSrooI+8/UMj5KWKOdaDFTycVeo8XJ3dk4=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "58402e09ad48f9f509d9249b8704c1a4f390c434",
|
"rev": "ae968708476302f8781fb5e245d53f112ed04111",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -162,11 +163,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756770412,
|
"lastModified": 1760948891,
|
||||||
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
|
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "4524271976b625a4a605beefd893f270620fd751",
|
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -276,11 +277,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759106866,
|
"lastModified": 1761468550,
|
||||||
"narHash": "sha256-GjLvAl7qxGxKtop6ghasxjQ1biTT7pA+WU45byzMl/4=",
|
"narHash": "sha256-nY4vyN1QdHhC5Gj3545fI2Y7FSr/gs8ID4gPmF8HPww=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "619ae569293b6427d23cce4854eb4f3c33af3eec",
|
"rev": "1830716059bfee7cbcfbfcc38d7be98e482a5762",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -334,11 +335,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758192433,
|
"lastModified": 1760445448,
|
||||||
"narHash": "sha256-CR6RnqEJSTiFgA6KQY4TTLUWbZ8RBnb+hxQqesuQNzQ=",
|
"narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprgraphics",
|
"repo": "hyprgraphics",
|
||||||
"rev": "c44e749dd611521dee940d00f7c444ee0ae4cfb7",
|
"rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -363,11 +364,11 @@
|
|||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759094452,
|
"lastModified": 1761486729,
|
||||||
"narHash": "sha256-j7IOTFnQRDjX4PzYb2p6CPviAc8cDrcorzGpM8J89uM=",
|
"narHash": "sha256-vlIMIIiUlwS6zPez57g1Z7THZxC25pyMk3o9Uu9DEyk=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprland",
|
"repo": "hyprland",
|
||||||
"rev": "f854b5bffbdd13cfe7edad0ee157d6947ff99619",
|
"rev": "05aa4e1c54da31d95663f9b4bc757e2a6ca65538",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -388,11 +389,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749046714,
|
"lastModified": 1759610243,
|
||||||
"narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
|
"narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprland-protocols",
|
"repo": "hyprland-protocols",
|
||||||
"rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
|
"rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -482,11 +483,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1757694755,
|
"lastModified": 1759080228,
|
||||||
"narHash": "sha256-j+w5QUUr2QT/jkxgVKecGYV8J7fpzXCMgzEEr6LG9ug=",
|
"narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprland-qtutils",
|
"repo": "hyprland-qtutils",
|
||||||
"rev": "5ffdfc13ed03df1dae5084468d935f0a3f2c9a4c",
|
"rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -511,11 +512,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756810301,
|
"lastModified": 1758927902,
|
||||||
"narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=",
|
"narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprlang",
|
"repo": "hyprlang",
|
||||||
"rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931",
|
"rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -585,11 +586,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756117388,
|
"lastModified": 1759619523,
|
||||||
"narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=",
|
"narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprutils",
|
"repo": "hyprutils",
|
||||||
"rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0",
|
"rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -707,11 +708,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758663926,
|
"lastModified": 1760958188,
|
||||||
"narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=",
|
"narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1",
|
"rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -723,11 +724,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758198701,
|
"lastModified": 1761114652,
|
||||||
"narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=",
|
"narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d",
|
"rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -755,11 +756,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758690382,
|
"lastModified": 1761373498,
|
||||||
"narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
|
"narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e643668fd71b949c53f8626614b21ff71a07379d",
|
"rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -795,11 +796,11 @@
|
|||||||
"systems": "systems_4"
|
"systems": "systems_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759101862,
|
"lastModified": 1761483268,
|
||||||
"narHash": "sha256-Ybe+/vYCPA520Wm9DveaOJa7TQF2M82AtUKUh82vr7U=",
|
"narHash": "sha256-2DipdLyDCgtFI7Jd4LlQn1bqsRQA6T3M3g6PocGZkHc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "1c802b3efe45625737d36b3d4b9710193fa39e2a",
|
"rev": "edfb052c7e52cd08b4c6290fc5fb7a794c64e060",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -843,11 +844,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758662783,
|
"lastModified": 1760652422,
|
||||||
"narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=",
|
"narHash": "sha256-C88Pgz38QIl9JxQceexqL2G7sw9vodHWx1Uaq+NRJrw=",
|
||||||
"owner": "NuschtOS",
|
"owner": "NuschtOS",
|
||||||
"repo": "search",
|
"repo": "search",
|
||||||
"rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4",
|
"rev": "3ebeebe8b6a49dfb11f771f761e0310f7c48d726",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -866,11 +867,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758108966,
|
"lastModified": 1760663237,
|
||||||
"narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
|
"narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
|
"rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -900,11 +901,11 @@
|
|||||||
"systems": "systems_5"
|
"systems": "systems_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759033744,
|
"lastModified": 1761452941,
|
||||||
"narHash": "sha256-fQovpddotIEsvdJzpQhtb3wYZYGIg4I/QUX5rJJQTi4=",
|
"narHash": "sha256-yy+9lSj40cWS4awLqjQ5H5/7/SOf9ZarOgTzH8GHkRk=",
|
||||||
"owner": "Gerg-L",
|
"owner": "Gerg-L",
|
||||||
"repo": "spicetify-nix",
|
"repo": "spicetify-nix",
|
||||||
"rev": "f102312235c3628fc3eddfb8cc6d7d0922427f46",
|
"rev": "20a56cfc4dc794ade2e8d4346cc4a5adcd1bb512",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -932,11 +933,11 @@
|
|||||||
"tinted-zed": "tinted-zed"
|
"tinted-zed": "tinted-zed"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759069666,
|
"lastModified": 1761028816,
|
||||||
"narHash": "sha256-/oVAVpL4xxR4KG4MlFspi8fiP9wEaSs+zqHkD2tw17g=",
|
"narHash": "sha256-s1XiIeJHpODVWfzsPaK9e21iz1dQSCU3H4/1OxOsyps=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "f23b6c30cc002786a22998caf15312ea01c20654",
|
"rev": "b81dc0a385443099e7d231fe6275189e32c3b760",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -1144,11 +1145,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755354946,
|
"lastModified": 1760713634,
|
||||||
"narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=",
|
"narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
"rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0",
|
"rev": "753bbbdf6a052994da94062e5b753288cef28dfb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@ -21,10 +21,6 @@
|
|||||||
};
|
};
|
||||||
hyprland.url = "github:/hyprwm/hyprland";
|
hyprland.url = "github:/hyprwm/hyprland";
|
||||||
hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent";
|
hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent";
|
||||||
# hyprpanel = {
|
|
||||||
# url = "github:Jas-SinghFSU/HyprPanel";
|
|
||||||
# inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
# };
|
|
||||||
stylix.url = "github:danth/stylix";
|
stylix.url = "github:danth/stylix";
|
||||||
firefox-addons = {
|
firefox-addons = {
|
||||||
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
|
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
|
||||||
@ -34,12 +30,12 @@
|
|||||||
|
|
||||||
outputs = inputs @ {nixpkgs, ...}: {
|
outputs = inputs @ {nixpkgs, ...}: {
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
dark = # CHANGEME: This should match the 'hostname' in your variables.nix file
|
dark =
|
||||||
|
# CHANGEME: This should match the 'hostname' in your variables.nix file
|
||||||
nixpkgs.lib.nixosSystem {
|
nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
{
|
{
|
||||||
# nixpkgs.overlays = [ inputs.hyprpanel.overlay ];
|
|
||||||
_module.args = {inherit inputs;};
|
_module.args = {inherit inputs;};
|
||||||
}
|
}
|
||||||
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x270 # CHANGEME: check https://github.com/NixOS/nixos-hardware
|
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x270 # CHANGEME: check https://github.com/NixOS/nixos-hardware
|
||||||
|
|||||||
@ -6,8 +6,6 @@ in {
|
|||||||
home.packages = with pkgs; [ tea ];
|
home.packages = with pkgs; [ tea ];
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
userName = username;
|
|
||||||
userEmail = email;
|
|
||||||
signing.key = "D8EDD65BCB54AC8719BE4EBD8D5D880EB08F1544";
|
signing.key = "D8EDD65BCB54AC8719BE4EBD8D5D880EB08F1544";
|
||||||
ignores = [
|
ignores = [
|
||||||
".cache/"
|
".cache/"
|
||||||
@ -21,11 +19,10 @@ in {
|
|||||||
"result"
|
"result"
|
||||||
"result-*"
|
"result-*"
|
||||||
];
|
];
|
||||||
extraConfig = {
|
settings = {
|
||||||
init.defaultBranch = "main";
|
user = {
|
||||||
push.autoSetupRemote = true;
|
name = username;
|
||||||
color.ui = "1";
|
email = email;
|
||||||
commit.gpgSign = true;
|
|
||||||
};
|
};
|
||||||
aliases = {
|
aliases = {
|
||||||
essa = "push --force";
|
essa = "push --force";
|
||||||
@ -46,7 +43,8 @@ in {
|
|||||||
af = "!git add $(git ls-files -m -o --exclude-standard | sk -m)";
|
af = "!git add $(git ls-files -m -o --exclude-standard | sk -m)";
|
||||||
st = "status";
|
st = "status";
|
||||||
br = "branch";
|
br = "branch";
|
||||||
df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
|
df =
|
||||||
|
"!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
|
||||||
hist = ''
|
hist = ''
|
||||||
log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
|
log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
|
||||||
llog = ''
|
llog = ''
|
||||||
@ -54,5 +52,11 @@ in {
|
|||||||
edit-unmerged =
|
edit-unmerged =
|
||||||
"!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
|
"!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
init.defaultBranch = "main";
|
||||||
|
push.autoSetupRemote = true;
|
||||||
|
color.ui = "1";
|
||||||
|
commit.gpgSign = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,113 +8,115 @@ in {
|
|||||||
|
|
||||||
programs.nixvim = {
|
programs.nixvim = {
|
||||||
plugins.mkdnflow = {
|
plugins.mkdnflow = {
|
||||||
enable = true;
|
enable = false;
|
||||||
|
settings = {
|
||||||
modules = { conceal = false; };
|
modules = { conceal = false; };
|
||||||
toDo.symbols = [ " " "-" "x" "!" "/" ];
|
to_do.symbols = [ " " "-" "x" "!" "/" ];
|
||||||
mappings = {
|
# mappings = {
|
||||||
MkdnCreateLink = false;
|
# MkdnCreateLink = false;
|
||||||
MkdnCreateLinkFromClipboard = {
|
# MkdnCreateLinkFromClipboard = {
|
||||||
key = "<leader>ml";
|
# key = "<leader>ml";
|
||||||
modes = [ "n" "v" ];
|
# modes = [ "n" "v" ];
|
||||||
};
|
# };
|
||||||
MkdnDecreaseHeading = {
|
# MkdnDecreaseHeading = {
|
||||||
key = "<leader>m-";
|
# key = "<leader>m-";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
MkdnDestroyLink = false;
|
# MkdnDestroyLink = false;
|
||||||
MkdnEnter = {
|
# MkdnEnter = {
|
||||||
key = "<CR>";
|
# key = "<CR>";
|
||||||
modes = [ "v" ];
|
# modes = [ "v" ];
|
||||||
};
|
# };
|
||||||
MkdnExtendList = false;
|
# MkdnExtendList = false;
|
||||||
MkdnFoldSection = {
|
# MkdnFoldSection = {
|
||||||
key = "<leader>mf";
|
# key = "<leader>mf";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
MkdnUnfoldSection = {
|
# MkdnUnfoldSection = {
|
||||||
key = "<leader>mF";
|
# key = "<leader>mF";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
MkdnFollowLink = {
|
# MkdnFollowLink = {
|
||||||
key = "gd";
|
# key = "gd";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
MkdnGoBack = false;
|
# MkdnGoBack = false;
|
||||||
MkdnGoForward = false;
|
# MkdnGoForward = false;
|
||||||
MkdnIncreaseHeading = {
|
# MkdnIncreaseHeading = {
|
||||||
key = "<leader>m+";
|
# key = "<leader>m+";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
MkdnMoveSource = false;
|
# MkdnMoveSource = false;
|
||||||
MkdnNewListItem = false;
|
# MkdnNewListItem = false;
|
||||||
MkdnNewListItemAboveInsert = {
|
# MkdnNewListItemAboveInsert = {
|
||||||
key = "O";
|
# key = "O";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
MkdnNewListItemBelowInsert = {
|
# MkdnNewListItemBelowInsert = {
|
||||||
key = "o";
|
# key = "o";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
MkdnNextHeading = {
|
# MkdnNextHeading = {
|
||||||
key = "<leader>m#";
|
# key = "<leader>m#";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
MkdnNextLink = false;
|
# MkdnNextLink = false;
|
||||||
MkdnPrevLink = false;
|
# MkdnPrevLink = false;
|
||||||
MkdnPrevHeading = {
|
# MkdnPrevHeading = {
|
||||||
key = "<leader>m*";
|
# key = "<leader>m*";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
MkdnSTab = false;
|
# MkdnSTab = false;
|
||||||
MkdnTab = false;
|
# MkdnTab = false;
|
||||||
MkdnTableNewColAfter = {
|
# MkdnTableNewColAfter = {
|
||||||
key = "<leader>mc";
|
# key = "<leader>mc";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
MkdnTableNewColBefore = {
|
# MkdnTableNewColBefore = {
|
||||||
key = "<leader>mC";
|
# key = "<leader>mC";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
MkdnTableNewRowAbove = {
|
# MkdnTableNewRowAbove = {
|
||||||
key = "<leader>mR";
|
# key = "<leader>mR";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
MkdnTableNewRowBelow = {
|
# MkdnTableNewRowBelow = {
|
||||||
key = "<leader>mr";
|
# key = "<leader>mr";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
MkdnTableNextCell = {
|
# MkdnTableNextCell = {
|
||||||
key = "<S-Tab>";
|
# key = "<S-Tab>";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
MkdnTableNextRow = false;
|
# MkdnTableNextRow = false;
|
||||||
MkdnTablePrevCell = {
|
# MkdnTablePrevCell = {
|
||||||
key = "<S-Tab>";
|
# key = "<S-Tab>";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
MkdnTablePrevRow = false;
|
# MkdnTablePrevRow = false;
|
||||||
MkdnToggleToDo = {
|
# MkdnToggleToDo = {
|
||||||
key = "<C-Space>";
|
# key = "<C-Space>";
|
||||||
modes = [ "n" "v" ];
|
# modes = [ "n" "v" ];
|
||||||
};
|
# };
|
||||||
MkdnUpdateNumbering = {
|
# MkdnUpdateNumbering = {
|
||||||
key = "<leader>mn";
|
# key = "<leader>mn";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
MkdnYankAnchorLink = {
|
# MkdnYankAnchorLink = {
|
||||||
key = "ya";
|
# key = "ya";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
MkdnYankFileAnchorLink = {
|
# MkdnYankFileAnchorLink = {
|
||||||
key = "yfa";
|
# key = "yfa";
|
||||||
modes = "n";
|
# modes = "n";
|
||||||
};
|
# };
|
||||||
};
|
# };
|
||||||
tables = {
|
tables = {
|
||||||
formatOnMove = true;
|
formatOnMove = true;
|
||||||
trimWhitespace = true;
|
trimWhitespace = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
extraFiles = {
|
extraFiles = {
|
||||||
"after/ftplugin/markdown.lua".text = ''
|
"after/ftplugin/markdown.lua".text = ''
|
||||||
vim.bo.tabstop = 2
|
vim.bo.tabstop = 2
|
||||||
|
|||||||
@ -12,7 +12,7 @@ in {
|
|||||||
extraPackages = with pkgs.bat-extras; [
|
extraPackages = with pkgs.bat-extras; [
|
||||||
batman
|
batman
|
||||||
batdiff
|
batdiff
|
||||||
batgrep
|
# batgrep
|
||||||
batwatch
|
batwatch
|
||||||
# prettybat
|
# prettybat
|
||||||
];
|
];
|
||||||
|
|||||||
@ -35,6 +35,7 @@
|
|||||||
"size 530 300, class:^(.*blueman-manager.*)$"
|
"size 530 300, class:^(.*blueman-manager.*)$"
|
||||||
"move 100%-w-20 40, class:^(.*blueman-manager.*)$"
|
"move 100%-w-20 40, class:^(.*blueman-manager.*)$"
|
||||||
"tag +portal, class:^(.*desktop-portal.*)$"
|
"tag +portal, class:^(.*desktop-portal.*)$"
|
||||||
|
"tag +dialog, initialTitle:^.(Calendar Reminders).*$"
|
||||||
"noborder, tag:portal"
|
"noborder, tag:portal"
|
||||||
"noblur, tag:portal"
|
"noblur, tag:portal"
|
||||||
"noshadow, tag:portal"
|
"noshadow, tag:portal"
|
||||||
|
|||||||
@ -1,6 +1,13 @@
|
|||||||
{ pkgs, config, inputs, ... }: {
|
{
|
||||||
virtualisation.docker.enable = true;
|
pkgs,
|
||||||
virtualisation.libvirtd.enable = true;
|
config,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
virtualisation = {
|
||||||
|
docker.enable = true;
|
||||||
|
docker.extraPackages = [pkgs.docker-buildx];
|
||||||
|
libvirtd.enable = true;
|
||||||
|
};
|
||||||
programs.virt-manager.enable = true;
|
programs.virt-manager.enable = true;
|
||||||
environment.systemPackages = with pkgs; [virtiofsd];
|
environment.systemPackages = with pkgs; [virtiofsd];
|
||||||
users.users."${config.var.username}".extraGroups = ["docker" "libvirtd"];
|
users.users."${config.var.username}".extraGroups = ["docker" "libvirtd"];
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user