Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
c343cc36cd |
332
flake.lock
332
flake.lock
|
|
@ -57,22 +57,6 @@
|
|||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"catboy-spinner": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1728098748,
|
||||
"narHash": "sha256-FHM/a+wqctmg1LXf/XB6TcXowL0Wzbq1kSCGVnxGgL8=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "c6fc11b0900826508f6a766c65cf92e0c7c4eab9",
|
||||
"revCount": 4,
|
||||
"type": "git",
|
||||
"url": "https://git.lelgenio.com/lelgenio/catboy-spinner"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.lelgenio.com/lelgenio/catboy-spinner"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
|
|
@ -98,27 +82,6 @@
|
|||
}
|
||||
},
|
||||
"crane_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"made-you-look",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1718730147,
|
||||
"narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane_3": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"warthunder-leak-counter",
|
||||
|
|
@ -213,11 +176,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730190761,
|
||||
"narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=",
|
||||
"lastModified": 1726325969,
|
||||
"narHash": "sha256-Mlw7009cdFry9OHpS6jy294lXhb+gcRa0iS2hYhkC6s=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "3979285062d6781525cded0f6c4ff92e71376b55",
|
||||
"rev": "3632080c41d7a657995807689a08ef6c4bcb2c72",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -226,22 +189,40 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"dzgui": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1702780245,
|
||||
"narHash": "sha256-cdW5LN2Q7eYW8xIqKPQfeYPd7e6VdJGaoA9NMHesCrE=",
|
||||
"owner": "aclist",
|
||||
"repo": "dztui",
|
||||
"rev": "28323f3edb8fa747dc559d1939ccdd7729e4e3a1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "aclist",
|
||||
"repo": "dztui",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"dzgui-nix": {
|
||||
"inputs": {
|
||||
"dzgui": "dzgui",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727831626,
|
||||
"narHash": "sha256-Gvt5lapgNRRTL95gFH8vm48f8gjsk7GYM4Qo5aUOzzo=",
|
||||
"lastModified": 1702850463,
|
||||
"narHash": "sha256-qR/c/GjsLUzrCyHN/Q9nnClduf6OqTg26S1AFYKPzxA=",
|
||||
"owner": "lelgenio",
|
||||
"repo": "dzgui-nix",
|
||||
"rev": "38cf2b507d75cc36ec127b21fc5a4144fc821525",
|
||||
"rev": "2ed6515b27d8186b9fedfe1dcaf861f07e796a0d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "lelgenio",
|
||||
"ref": "dzgui-4.1.0",
|
||||
"repo": "dzgui-nix",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -300,6 +281,24 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726153070,
|
||||
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
|
|
@ -353,7 +352,7 @@
|
|||
},
|
||||
"flake-utils_4": {
|
||||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
"systems": "systems_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681202837,
|
||||
|
|
@ -391,24 +390,6 @@
|
|||
"inputs": {
|
||||
"systems": "systems_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681202837,
|
||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_7": {
|
||||
"inputs": {
|
||||
"systems": "systems_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
|
|
@ -423,22 +404,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hello-fonts": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1728232065,
|
||||
"narHash": "sha256-1DUW1YqZALPFxBM7HYcNZiCZQvMqUiJ1m04NU4IIe3I=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "10f7485fea930bb45e97fbda0cd68f199a7e8f59",
|
||||
"revCount": 1,
|
||||
"type": "git",
|
||||
"url": "https://git.lelgenio.com/lelgenio/hello-fonts"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.lelgenio.com/lelgenio/hello-fonts"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -446,11 +411,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726989464,
|
||||
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
|
||||
"lastModified": 1725703823,
|
||||
"narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
|
||||
"rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -460,26 +425,63 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"made-you-look": {
|
||||
"niri-flake": {
|
||||
"inputs": {
|
||||
"crane": "crane_2",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"flake-parts": "flake-parts",
|
||||
"niri-stable": "niri-stable",
|
||||
"niri-unstable": "niri-unstable",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"xwayland-satellite-stable": "xwayland-satellite-stable",
|
||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728159958,
|
||||
"narHash": "sha256-r/h/ch70KfOQ8moftDhHagu3WajglaqU+hrEzUtTM1Y=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "96e978aa2f414d4b92b78e7ae975d7ff7db95a91",
|
||||
"revCount": 3,
|
||||
"type": "git",
|
||||
"url": "https://git.lelgenio.com/lelgenio/made-you-look"
|
||||
"lastModified": 1726426731,
|
||||
"narHash": "sha256-h3m3ld3Awh8PzBPWV1i7/DtxGVTIjBMxCjPKQTr5W4Q=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "fd00de202cc0287f7b34c237b8585e67fe7b85f7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.lelgenio.com/lelgenio/made-you-look"
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"niri-stable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1726304152,
|
||||
"narHash": "sha256-4YDrKMwXGVOBkeaISbxqf24rLuHvO98TnqxWYfgiSeg=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "6a48728ffb1e638839b07f9ab2f06b2adb41dc61",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "YaLTeR",
|
||||
"ref": "v0.1.9",
|
||||
"repo": "niri",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1726412705,
|
||||
"narHash": "sha256-qRqGbvTpGRn3QhvjOyX0Sn/qPT1bLQUSSHz1vlW/7HE=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "6ee5b5afa784c76b1c31c371b59177136e558fa6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-index-database": {
|
||||
|
|
@ -489,11 +491,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729999765,
|
||||
"narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=",
|
||||
"lastModified": 1725765290,
|
||||
"narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=",
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f",
|
||||
"rev": "642275444c5a9defce57219c944b3179bf2adaa9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -531,11 +533,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1730137625,
|
||||
"narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
|
||||
"lastModified": 1726062281,
|
||||
"narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
|
||||
"rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -544,19 +546,32 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1729880355,
|
||||
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
|
||||
"lastModified": 1725233747,
|
||||
"narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1726320982,
|
||||
"narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
|
||||
"rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-unstable",
|
||||
"type": "indirect"
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"plymouth-themes": {
|
||||
|
|
@ -594,26 +609,20 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"catboy-spinner": "catboy-spinner",
|
||||
"demoji": "demoji",
|
||||
"dhist": "dhist",
|
||||
"disko": "disko",
|
||||
"dzgui-nix": "dzgui-nix",
|
||||
"hello-fonts": "hello-fonts",
|
||||
"home-manager": "home-manager",
|
||||
"made-you-look": "made-you-look",
|
||||
"niri-flake": "niri-flake",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixos-mailserver": "nixos-mailserver",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"plymouth-themes": "plymouth-themes",
|
||||
"ranger-icons": "ranger-icons",
|
||||
"tlauncher": "tlauncher",
|
||||
"tomater": "tomater",
|
||||
"vpsadminos": "vpsadminos",
|
||||
"warthunder-leak-counter": "warthunder-leak-counter",
|
||||
"wl-crosshair": "wl-crosshair",
|
||||
"youre-wrong": "youre-wrong"
|
||||
"wl-crosshair": "wl-crosshair"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src": {
|
||||
|
|
@ -765,24 +774,9 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_8": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tlauncher": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_5",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
|
|
@ -801,25 +795,9 @@
|
|||
"url": "https://git.lelgenio.xyz/lelgenio/tlauncher-nix"
|
||||
}
|
||||
},
|
||||
"tomater": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1728089744,
|
||||
"narHash": "sha256-WOz/qUKyao7lM2qcwqqcJDw4jI8mUJL6kNUNm0sxPKk=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "efff561c745514a7874e3f5de95307a74efc7df9",
|
||||
"revCount": 1,
|
||||
"type": "git",
|
||||
"url": "https://git.lelgenio.com/lelgenio/tomater"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.lelgenio.com/lelgenio/tomater"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_5"
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709126324,
|
||||
|
|
@ -835,25 +813,10 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"vpsadminos": {
|
||||
"locked": {
|
||||
"lastModified": 1730290190,
|
||||
"narHash": "sha256-a+op2lnWrCytuEhLOE24SKR/irRfjwDEHkpLyAL5P90=",
|
||||
"owner": "vpsfreecz",
|
||||
"repo": "vpsadminos",
|
||||
"rev": "63ac771b9667b45ab2ea87363f69ca7f85668e9b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "vpsfreecz",
|
||||
"repo": "vpsadminos",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"warthunder-leak-counter": {
|
||||
"inputs": {
|
||||
"crane": "crane_3",
|
||||
"flake-utils": "flake-utils_6",
|
||||
"crane": "crane_2",
|
||||
"flake-utils": "flake-utils_5",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
|
|
@ -874,7 +837,7 @@
|
|||
},
|
||||
"wl-crosshair": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_7",
|
||||
"flake-utils": "flake-utils_6",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
|
|
@ -893,20 +856,37 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"youre-wrong": {
|
||||
"xwayland-satellite-stable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1728228087,
|
||||
"narHash": "sha256-W40rQbQAo3lGrKlfenSA8JaGwZMSx/X4lP71enQtK7Y=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "64e7876233e99ad7223cae29688374a1c1ff569a",
|
||||
"revCount": 2,
|
||||
"type": "git",
|
||||
"url": "https://git.lelgenio.com/lelgenio/youre-wrong"
|
||||
"lastModified": 1718165778,
|
||||
"narHash": "sha256-dwF9nI54a6Fo9XU5s4qmvMXSgCid3YQVGxch00qEMvI=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "b6d281967cb0b7bf1dfdb8d0f597b517dc4aa5c5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.lelgenio.com/lelgenio/youre-wrong"
|
||||
"owner": "Supreeeme",
|
||||
"ref": "v0.4",
|
||||
"repo": "xwayland-satellite",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"xwayland-satellite-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1726378112,
|
||||
"narHash": "sha256-OANPb73V/RQDqtpIcbzeJ93KuOHKFQv+1xXC44Ut7tY=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "b962a0f33b503aa39c9cf6919f488b664e5b79b4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
46
flake.nix
46
flake.nix
|
|
@ -2,13 +2,9 @@
|
|||
description = "My system config";
|
||||
inputs = {
|
||||
nixpkgs.url = "nixpkgs/nixos-24.05";
|
||||
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
||||
|
||||
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
vpsadminos.url = "github:vpsfreecz/vpsadminos";
|
||||
|
||||
nix-index-database = {
|
||||
url = "github:Mic92/nix-index-database";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -33,7 +29,7 @@
|
|||
};
|
||||
|
||||
dzgui-nix = {
|
||||
url = "github:lelgenio/dzgui-nix";
|
||||
url = "github:lelgenio/dzgui-nix/dzgui-4.1.0";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
|
|
@ -62,26 +58,11 @@
|
|||
url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
made-you-look = {
|
||||
url = "git+https://git.lelgenio.com/lelgenio/made-you-look";
|
||||
|
||||
niri-flake = {
|
||||
url = "github:sodiboo/niri-flake";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
catboy-spinner = {
|
||||
url = "git+https://git.lelgenio.com/lelgenio/catboy-spinner";
|
||||
flake = false;
|
||||
};
|
||||
tomater = {
|
||||
url = "git+https://git.lelgenio.com/lelgenio/tomater";
|
||||
flake = false;
|
||||
};
|
||||
youre-wrong = {
|
||||
url = "git+https://git.lelgenio.com/lelgenio/youre-wrong";
|
||||
flake = false;
|
||||
};
|
||||
hello-fonts = {
|
||||
url = "git+https://git.lelgenio.com/lelgenio/hello-fonts";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
outputs =
|
||||
inputs:
|
||||
|
|
@ -109,6 +90,13 @@
|
|||
common_modules =
|
||||
[
|
||||
{ nixpkgs.pkgs = pkgs; }
|
||||
|
||||
inputs.niri-flake.nixosModules.niri
|
||||
{
|
||||
programs.niri.enable = true;
|
||||
niri-flake.cache.enable = true;
|
||||
environment.systemPackages = with pkgs; [ fuzzel ];
|
||||
}
|
||||
./system/configuration.nix
|
||||
./system/secrets.nix
|
||||
./system/greetd.nix
|
||||
|
|
@ -152,6 +140,13 @@
|
|||
./system/steam.nix
|
||||
] ++ common_modules;
|
||||
};
|
||||
rainbow = lib.nixosSystem {
|
||||
inherit system specialArgs;
|
||||
modules = [
|
||||
./hosts/rainbow
|
||||
./system/rainbow-gitlab-runner.nix
|
||||
] ++ common_modules;
|
||||
};
|
||||
double-rainbow = lib.nixosSystem {
|
||||
inherit system specialArgs;
|
||||
modules = [
|
||||
|
|
@ -174,10 +169,7 @@
|
|||
};
|
||||
phantom = lib.nixosSystem {
|
||||
inherit system specialArgs;
|
||||
modules = [
|
||||
{ nixpkgs.pkgs = pkgs; }
|
||||
./hosts/phantom
|
||||
];
|
||||
modules = [ ./hosts/phantom ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ in
|
|||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [ { device = "/swapfile"; } ];
|
||||
swapDevices = [ ];
|
||||
|
||||
services.udev.extraRules = ''
|
||||
# Force all disks to use mq-deadline scheduler
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
{ pkgs, lib, ... }:
|
||||
let
|
||||
undervoltGpu = pkgs.writeShellScript "undervolt-gpu" ''
|
||||
set -xe
|
||||
cd $1
|
||||
echo "manual" > power_dpm_force_performance_level
|
||||
echo "1" > pp_power_profile_mode
|
||||
test -e pp_od_clk_voltage
|
||||
echo "vo -120" > pp_od_clk_voltage
|
||||
echo "c" > pp_od_clk_voltage
|
||||
'';
|
||||
in
|
||||
{
|
||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
boot.kernelParams = [
|
||||
"amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug
|
||||
"video=DP-1:1920x1080@144"
|
||||
"amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting
|
||||
];
|
||||
|
||||
systemd.services.amd-fan-control = {
|
||||
script = ''
|
||||
${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85
|
||||
'';
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
|
||||
hardware.opengl.driSupport = true;
|
||||
# # For 32 bit applications
|
||||
hardware.opengl.driSupport32Bit = true;
|
||||
|
||||
hardware.opengl.extraPackages = with pkgs; [
|
||||
libva
|
||||
libvdpau
|
||||
vaapiVdpau
|
||||
rocm-opencl-icd
|
||||
rocm-opencl-runtime
|
||||
rocmPackages.rocm-smi
|
||||
];
|
||||
|
||||
services.udev.extraRules = ''
|
||||
ACTION=="add", SUBSYSTEM=="hwmon", ATTR{name}=="amdgpu", ATTR{power1_cap}="186000000", RUN+="${undervoltGpu} %S%p/device"
|
||||
'';
|
||||
}
|
||||
|
|
@ -23,8 +23,7 @@ in
|
|||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
./partition.nix
|
||||
./amdgpu.nix
|
||||
./factorio-server.nix
|
||||
./undervolt.nix
|
||||
];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
|
|
@ -37,22 +36,35 @@ in
|
|||
|
||||
hardware.opentabletdriver.enable = true;
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
|
||||
|
||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
boot.kernelModules = [
|
||||
"kvm-amd"
|
||||
"amdgpu"
|
||||
"zenpower"
|
||||
];
|
||||
|
||||
boot.kernelParams = [
|
||||
"amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug
|
||||
"video=DP-1:1920x1080@144"
|
||||
];
|
||||
systemd.sleep.extraConfig = ''
|
||||
HibernateDelaySec=30s
|
||||
SuspendState=mem
|
||||
'';
|
||||
|
||||
hardware.opengl.driSupport = true;
|
||||
# # For 32 bit applications
|
||||
hardware.opengl.driSupport32Bit = true;
|
||||
|
||||
hardware.opengl.extraPackages = with pkgs; [
|
||||
libva
|
||||
libvdpau
|
||||
vaapiVdpau
|
||||
rocm-opencl-icd
|
||||
rocm-opencl-runtime
|
||||
rocmPackages.rocm-smi
|
||||
];
|
||||
|
||||
fileSystems."/mnt/old" = {
|
||||
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||
fsType = "btrfs";
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
{ config, pkgs, ... }:
|
||||
{
|
||||
services.factorio = {
|
||||
enable = true;
|
||||
package = pkgs.factorio-headless; # I override this in ./pkgs
|
||||
public = true;
|
||||
lan = true;
|
||||
openFirewall = true;
|
||||
admins = [ "lelgenio" ];
|
||||
extraSettingsFile = config.age.secrets.factorio-settings.path;
|
||||
};
|
||||
|
||||
age.secrets.factorio-settings = {
|
||||
file = ../../secrets/factorio-settings.age;
|
||||
mode = "777";
|
||||
};
|
||||
}
|
||||
18
hosts/monolith/undervolt.nix
Normal file
18
hosts/monolith/undervolt.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
undervoltGpu = pkgs.writeShellScript "undervolt-gpu" ''
|
||||
set -xe
|
||||
cd $1
|
||||
echo "manual" > power_dpm_force_performance_level
|
||||
echo "1" > pp_power_profile_mode
|
||||
test -e pp_od_clk_voltage
|
||||
echo "vo -100" > pp_od_clk_voltage
|
||||
echo "c" > pp_od_clk_voltage
|
||||
'';
|
||||
in
|
||||
{
|
||||
boot.kernelParams = [ "amdgpu.ppfeaturemask=0xfffd7fff" ];
|
||||
services.udev.extraRules = ''
|
||||
ACTION=="add", SUBSYSTEM=="hwmon", ATTR{name}=="amdgpu", ATTR{power1_cap}="186000000", RUN+="${undervoltGpu} %S%p/device"
|
||||
'';
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
{
|
||||
imports = [
|
||||
inputs.vpsadminos.nixosConfigurations.container
|
||||
./vpsadminos.nix
|
||||
inputs.agenix.nixosModules.default
|
||||
../../system/nix.nix
|
||||
./hardware-config.nix
|
||||
|
|
@ -18,9 +18,9 @@
|
|||
./writefreely.nix
|
||||
./email.nix
|
||||
./forgejo.nix
|
||||
./warthunder-leak-counter.nix
|
||||
./invidious.nix
|
||||
./davi.nix
|
||||
./goofs.nix
|
||||
];
|
||||
|
||||
networking.hostName = "phantom";
|
||||
|
|
@ -56,18 +56,6 @@
|
|||
identityPaths = [ "/root/.ssh/id_rsa" ];
|
||||
};
|
||||
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
daemon.settings = {
|
||||
# needed by bitbucket runner ???
|
||||
log-driver = "json-file";
|
||||
log-opts = {
|
||||
max-size = "10m";
|
||||
max-file = "3";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
nix.settings = {
|
||||
cores = 1;
|
||||
max-jobs = 1;
|
||||
|
|
|
|||
|
|
@ -27,9 +27,6 @@ in
|
|||
ENABLED = true;
|
||||
DEFAULT_ACTIONS_URL = "github";
|
||||
};
|
||||
repository = {
|
||||
ENABLE_PUSH_CREATE_USER = true;
|
||||
};
|
||||
server = {
|
||||
DOMAIN = "git.lelgenio.com";
|
||||
HTTP_PORT = 3000;
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
{ inputs, config, ... }:
|
||||
{
|
||||
imports = [
|
||||
inputs.warthunder-leak-counter.nixosModules.default
|
||||
inputs.made-you-look.nixosModules.default
|
||||
];
|
||||
|
||||
services.warthunder-leak-counter.enable = true;
|
||||
services.nginx.virtualHosts."warthunder-leak-counter.lelgenio.com" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:${toString config.services.warthunder-leak-counter.port}";
|
||||
};
|
||||
};
|
||||
|
||||
services.made-you-look.enable = true;
|
||||
services.nginx.virtualHosts."coolest-thing-ever.lelgenio.com" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:${toString config.services.made-you-look.port}";
|
||||
};
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts."catboy-spinner.lelgenio.com" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
root = inputs.catboy-spinner;
|
||||
};
|
||||
services.nginx.virtualHosts."tomater.lelgenio.com" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
root = inputs.tomater;
|
||||
};
|
||||
services.nginx.virtualHosts."youre-wrong.lelgenio.com" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
root = inputs.youre-wrong;
|
||||
};
|
||||
services.nginx.virtualHosts."hello-fonts.lelgenio.com" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
root = inputs.hello-fonts;
|
||||
};
|
||||
}
|
||||
|
|
@ -5,12 +5,6 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
fileSystems."/var/lib/syncthing-data" = {
|
||||
device = "172.16.130.7:/nas/5749/syncthinng_data";
|
||||
fsType = "nfs";
|
||||
options = [ "nofail" ];
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{
|
||||
device = "/swap/swapfile";
|
||||
|
|
|
|||
|
|
@ -1,40 +1,12 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
# Replace with unstable, since 24.05 does not have sig-helper
|
||||
disabledModules = [ "services/web-apps/invidious.nix" ];
|
||||
imports = [ (inputs.nixpkgs-unstable + "/nixos/modules/services/web-apps/invidious.nix") ];
|
||||
|
||||
services.invidious = {
|
||||
enable = true;
|
||||
domain = "invidious.lelgenio.com";
|
||||
nginx.enable = true;
|
||||
port = 10601;
|
||||
http3-ytproxy.enable = true;
|
||||
sig-helper = {
|
||||
enable = true;
|
||||
package = pkgs.unstable.inv-sig-helper;
|
||||
settings.db = {
|
||||
user = "invidious";
|
||||
dbname = "invidious";
|
||||
};
|
||||
# {
|
||||
# "visitor_data": "...",
|
||||
# "po_token": "..."
|
||||
# }
|
||||
extraSettingsFile = config.age.secrets.phantom-invidious-settings.path;
|
||||
settings = {
|
||||
force_resolve = "ipv6";
|
||||
db = {
|
||||
user = "invidious";
|
||||
dbname = "invidious";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
age.secrets.phantom-invidious-settings = {
|
||||
file = ../../secrets/phantom-invidious-settings.age;
|
||||
mode = "666";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
76
hosts/phantom/vpsadminos.nix
Normal file
76
hosts/phantom/vpsadminos.nix
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
# This file provides compatibility for NixOS to run in a container on vpsAdminOS
|
||||
# hosts.
|
||||
#
|
||||
# If you're experiencing issues, try updating this file to the latest version
|
||||
# from vpsAdminOS repository:
|
||||
#
|
||||
# https://github.com/vpsfreecz/vpsadminos/blob/staging/os/lib/nixos-container/vpsadminos.nix
|
||||
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
nameservers = [
|
||||
"1.1.1.1"
|
||||
"2606:4700:4700::1111"
|
||||
];
|
||||
in
|
||||
{
|
||||
networking.nameservers = mkDefault nameservers;
|
||||
services.resolved = mkDefault { fallbackDns = nameservers; };
|
||||
networking.dhcpcd.extraConfig = "noipv4ll";
|
||||
|
||||
systemd.services.systemd-sysctl.enable = false;
|
||||
systemd.services.systemd-oomd.enable = false;
|
||||
systemd.sockets."systemd-journald-audit".enable = false;
|
||||
systemd.mounts = [
|
||||
{
|
||||
where = "/sys/kernel/debug";
|
||||
enable = false;
|
||||
}
|
||||
];
|
||||
systemd.services.rpc-gssd.enable = false;
|
||||
|
||||
# Due to our restrictions in /sys, the default systemd-udev-trigger fails
|
||||
# on accessing PCI devices, etc. Override it to match only network devices.
|
||||
# In addition, boot.isContainer prevents systemd-udev-trigger.service from
|
||||
# being enabled at all, so add it explicitly.
|
||||
systemd.additionalUpstreamSystemUnits = [ "systemd-udev-trigger.service" ];
|
||||
systemd.services.systemd-udev-trigger.serviceConfig.ExecStart = [
|
||||
""
|
||||
"-udevadm trigger --subsystem-match=net --action=add"
|
||||
];
|
||||
|
||||
boot.isContainer = true;
|
||||
boot.enableContainers = mkDefault true;
|
||||
boot.loader.initScript.enable = true;
|
||||
boot.specialFileSystems."/run/keys".fsType = mkForce "tmpfs";
|
||||
boot.systemdExecutable = mkDefault "/run/current-system/systemd/lib/systemd/systemd systemd.unified_cgroup_hierarchy=0";
|
||||
|
||||
# Overrides for <nixpkgs/nixos/modules/virtualisation/container-config.nix>
|
||||
documentation.enable = mkOverride 500 true;
|
||||
documentation.nixos.enable = mkOverride 500 true;
|
||||
networking.useHostResolvConf = mkOverride 500 false;
|
||||
services.openssh.startWhenNeeded = mkOverride 500 false;
|
||||
|
||||
# Bring up the network, /ifcfg.{add,del} are supplied by the vpsAdminOS host
|
||||
systemd.services.networking-setup = {
|
||||
description = "Load network configuration provided by the vpsAdminOS host";
|
||||
before = [ "network.target" ];
|
||||
wantedBy = [ "network.target" ];
|
||||
after = [ "network-pre.target" ];
|
||||
path = [ pkgs.iproute2 ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = "${pkgs.bash}/bin/bash /ifcfg.add";
|
||||
ExecStop = "${pkgs.bash}/bin/bash /ifcfg.del";
|
||||
};
|
||||
unitConfig.ConditionPathExists = "/ifcfg.add";
|
||||
restartIfChanged = false;
|
||||
};
|
||||
}
|
||||
19
hosts/phantom/warthunder-leak-counter.nix
Normal file
19
hosts/phantom/warthunder-leak-counter.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [ inputs.warthunder-leak-counter.nixosModules.default ];
|
||||
|
||||
services.warthunder-leak-counter.enable = true;
|
||||
|
||||
services.nginx.virtualHosts."warthunder-leak-counter.lelgenio.com" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:${toString config.services.warthunder-leak-counter.port}";
|
||||
};
|
||||
};
|
||||
}
|
||||
85
hosts/rainbow/default.nix
Normal file
85
hosts/rainbow/default.nix
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
let
|
||||
btrfs_options = [
|
||||
"compress=zstd:3"
|
||||
"noatime"
|
||||
"x-systemd.device-timeout=0"
|
||||
];
|
||||
btrfs_ssd = [
|
||||
"ssd"
|
||||
"discard=async"
|
||||
];
|
||||
in
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"usb_storage"
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ "i915" ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@nixos" ] ++ btrfs_options ++ btrfs_ssd;
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices = {
|
||||
"main" = {
|
||||
bypassWorkqueues = true;
|
||||
device = "/dev/disk/by-label/CRYPT_ROOT";
|
||||
};
|
||||
};
|
||||
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@home" ] ++ btrfs_options ++ btrfs_ssd;
|
||||
};
|
||||
|
||||
boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||
fileSystems."/boot/efi" = {
|
||||
device = "/dev/disk/by-uuid/DC3B-5753";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
fileSystems."/swap" = {
|
||||
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@swap" ] ++ btrfs_ssd;
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{
|
||||
device = "/swap/swapfile";
|
||||
size = (1024 * 8);
|
||||
}
|
||||
];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
networking.hostName = "rainbow"; # Define your hostname.
|
||||
}
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
rec {
|
||||
all = [
|
||||
scripts
|
||||
unstable
|
||||
themes
|
||||
new-packages
|
||||
patches
|
||||
|
|
@ -12,10 +11,6 @@ rec {
|
|||
|
||||
scripts = (import ../scripts);
|
||||
|
||||
unstable = final: prev: {
|
||||
unstable = import inputs.nixpkgs-unstable { inherit (final) system config; };
|
||||
};
|
||||
|
||||
themes = (
|
||||
final: prev: {
|
||||
papirus_red = (final.papirus-icon-theme.override { color = "red"; });
|
||||
|
|
|
|||
64
pkgs/blade-formatter/default.nix
Normal file
64
pkgs/blade-formatter/default.nix
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
{
|
||||
lib,
|
||||
mkYarnPackage,
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
testers,
|
||||
writeText,
|
||||
runCommand,
|
||||
blade-formatter,
|
||||
}:
|
||||
|
||||
mkYarnPackage rec {
|
||||
pname = "blade-formatter";
|
||||
version = "1.38.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shufo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JvILLw7Yp4g/dSsYtZ2ylmlXfS9t+2KADlBrYOJWTpg=";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-UFDxw3fYMzSUhZw+TCEh/dN7OioKI75LzKSnEwGPKDA=";
|
||||
};
|
||||
|
||||
postBuild = "yarn build";
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = blade-formatter;
|
||||
command = "blade-formatter --version";
|
||||
};
|
||||
|
||||
simple = testers.testEqualContents {
|
||||
assertion = "blade-formatter formats a basic blade file";
|
||||
expected = writeText "expected" ''
|
||||
@if (true)
|
||||
Hello world!
|
||||
@endif
|
||||
'';
|
||||
actual =
|
||||
runCommand "actual"
|
||||
{
|
||||
nativeBuildInputs = [ blade-formatter ];
|
||||
base = writeText "base" ''
|
||||
@if( true ) Hello world! @endif
|
||||
'';
|
||||
}
|
||||
''
|
||||
blade-formatter $base > $out
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Laravel Blade template formatter";
|
||||
homepage = "https://github.com/shufo/blade-formatter";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lelgenio ];
|
||||
};
|
||||
}
|
||||
120
pkgs/blade-formatter/package.json
Executable file
120
pkgs/blade-formatter/package.json
Executable file
|
|
@ -0,0 +1,120 @@
|
|||
{
|
||||
"name": "blade-formatter",
|
||||
"engines": {
|
||||
"node": ">= 14.0.0"
|
||||
},
|
||||
"keywords": [
|
||||
"php",
|
||||
"formatter",
|
||||
"laravel"
|
||||
],
|
||||
"version": "1.38.2",
|
||||
"description": "An opinionated blade template formatter for Laravel",
|
||||
"main": "./dist/bundle.cjs",
|
||||
"types": "./dist/types/main.d.ts",
|
||||
"type": "module",
|
||||
"exports": {
|
||||
".": {
|
||||
"import": "./dist/bundle.js",
|
||||
"require": "./dist/bundle.cjs",
|
||||
"default": "./dist/bundle.js"
|
||||
},
|
||||
"./*": "./*"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "cross-env NODE_ENV=production node esbuild.js && cross-env NODE_ENV=production ESM_BUILD=true node esbuild.js",
|
||||
"prepublish": "tsc src/main.ts --declaration --emitDeclarationOnly --outDir ./dist/types || true",
|
||||
"watch": "node esbuild.js",
|
||||
"test": "yarn run build && node --experimental-vm-modules node_modules/.bin/jest",
|
||||
"lint": "eslint src -c .eslintrc.json --ext ts",
|
||||
"fix": "prettier {src,__tests__}/**/*.ts --write",
|
||||
"check_formatted": "prettier **/*.ts -c",
|
||||
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
|
||||
"prepare": "husky install",
|
||||
"bin": "cross-env ./bin/blade-formatter.cjs"
|
||||
},
|
||||
"bin": {
|
||||
"blade-formatter": "bin/blade-formatter.cjs"
|
||||
},
|
||||
"author": "Shuhei Hayashibara",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@prettier/plugin-php": "^0.19.7",
|
||||
"@shufo/tailwindcss-class-sorter": "3.0.1",
|
||||
"aigle": "^1.14.1",
|
||||
"ajv": "^8.9.0",
|
||||
"chalk": "^4.1.0",
|
||||
"concat-stream": "^2.0.0",
|
||||
"detect-indent": "^6.0.0",
|
||||
"find-config": "^1.0.0",
|
||||
"glob": "^8.0.1",
|
||||
"html-attribute-sorter": "^0.4.3",
|
||||
"ignore": "^5.1.8",
|
||||
"js-beautify": "^1.14.8",
|
||||
"lodash": "^4.17.19",
|
||||
"php-parser": "3.1.5",
|
||||
"prettier": "^2.2.0",
|
||||
"tailwindcss": "^3.1.8",
|
||||
"vscode-oniguruma": "1.7.0",
|
||||
"vscode-textmate": "^7.0.1",
|
||||
"xregexp": "^5.0.1",
|
||||
"yargs": "^17.3.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.6.4",
|
||||
"@babel/plugin-transform-modules-commonjs": "^7.16.5",
|
||||
"@babel/preset-env": "^7.13.12",
|
||||
"@babel/preset-typescript": "^7.16.5",
|
||||
"@types/concat-stream": "^2.0.0",
|
||||
"@types/find-config": "^1.0.1",
|
||||
"@types/fs-extra": "^11.0.0",
|
||||
"@types/glob": "^8.0.0",
|
||||
"@types/jest": "^29.0.0",
|
||||
"@types/js-beautify": "^1.13.3",
|
||||
"@types/lodash": "^4.14.178",
|
||||
"@types/mocha": "^10.0.0",
|
||||
"@types/node": "^18.0.0",
|
||||
"@types/xregexp": "^4.4.0",
|
||||
"@typescript-eslint/eslint-plugin": "^5.8.1",
|
||||
"@typescript-eslint/parser": "^5.8.1",
|
||||
"app-root-path": "^3.0.0",
|
||||
"babel-jest": "^29.0.0",
|
||||
"codecov": "^3.8.3",
|
||||
"cross-env": "^7.0.3",
|
||||
"esbuild": "^0.19.0",
|
||||
"esbuild-node-externals": "^1.4.1",
|
||||
"eslint": "^8.5.0",
|
||||
"eslint-config-airbnb-base": "^15.0.0",
|
||||
"eslint-config-airbnb-typescript": "^17.0.0",
|
||||
"eslint-config-prettier": "^9.0.0",
|
||||
"eslint-import-resolver-typescript": "^3.0.0",
|
||||
"eslint-plugin-import": "^2.25.3",
|
||||
"eslint-plugin-jest": "^26.0.0",
|
||||
"eslint-plugin-prettier": "^5.0.0",
|
||||
"fs-extra": "^11.0.0",
|
||||
"husky": "^8.0.0",
|
||||
"jest": "^29.0.0",
|
||||
"lint-staged": ">=10",
|
||||
"source-map-loader": "^4.0.0",
|
||||
"ts-jest": "^29.0.0",
|
||||
"ts-loader": "^9.2.6",
|
||||
"ts-migrate": "^0.1.27",
|
||||
"ts-node": "^10.4.0",
|
||||
"typescript": "^5.0.0"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/shufo/blade-formatter.git"
|
||||
},
|
||||
"files": [
|
||||
"dist",
|
||||
"src",
|
||||
"bin",
|
||||
"wasm",
|
||||
"syntaxes",
|
||||
"CHANGELOG.md"
|
||||
],
|
||||
"lint-staged": {
|
||||
"*.ts": "yarn run fix"
|
||||
}
|
||||
}
|
||||
|
|
@ -3,12 +3,11 @@
|
|||
|
||||
{ pkgs, inputs }:
|
||||
rec {
|
||||
blade-formatter = pkgs.callPackage ./blade-formatter { };
|
||||
cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { };
|
||||
lipsum = pkgs.callPackage ./lipsum.nix { };
|
||||
emmet-cli = pkgs.callPackage ./emmet-cli.nix { };
|
||||
material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { };
|
||||
gnome-pass-search-provider = pkgs.callPackage ./gnome-pass-search-provider.nix { };
|
||||
factorio-headless = pkgs.callPackage ./factorio-headless {
|
||||
inherit (pkgs.unstable) factorio-headless;
|
||||
};
|
||||
kak-tree-sitter = pkgs.callPackage ./kak-tree-sitter.nix { };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
{ factorio-headless, pkgs }:
|
||||
|
||||
factorio-headless.overrideAttrs (_: rec {
|
||||
version = "2.0.13";
|
||||
src = pkgs.fetchurl {
|
||||
name = "factorio_headless_x64-${version}.tar.xz";
|
||||
url = "https://www.factorio.com/get-download/${version}/headless/linux64";
|
||||
hash = "sha256-J7NpAaOeWTrfKEGMAoYULGx6n4PRVpY8c2m9QFolx9E=";
|
||||
};
|
||||
})
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -xe
|
||||
|
||||
cd "$(dirname $0)"
|
||||
|
||||
current_version="$(rg '^.*?version\s*=\s*"(.+)".*?$' --replace '$1' ./default.nix)"
|
||||
current_hash="$(rg '^.*?hash\s*=\s*"(.+)".*?$' --replace '$1' ./default.nix)"
|
||||
|
||||
new_version="$(curl https://factorio.com/api/latest-releases | jq -r .stable.headless)"
|
||||
new_hash="$(nix-hash --to-sri --type sha256 $(nix-prefetch-url --type sha256 https://www.factorio.com/get-download/${new_version}/headless/linux64))"
|
||||
|
||||
sd "$current_version" "$new_version" ./default.nix
|
||||
sd "$current_hash" "$new_hash" ./default.nix
|
||||
34
pkgs/kak-tree-sitter.nix
Normal file
34
pkgs/kak-tree-sitter.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromSourcehut,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kak-tree-sitter";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~hadronized";
|
||||
repo = "kak-tree-sitter";
|
||||
rev = "kak-tree-sitter-v${version}";
|
||||
hash = "sha256-wBWfSyR8LGtug/mCD0bJ4lbdN3trIA/03AnCxZoEOSA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-OQPUWqJAts8DbFNSsC/CmMCbuZ9TVxRTR05O7oiodKI=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/ktsctl" \
|
||||
--suffix PATH : ${stdenv.cc}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Server that interfaces tree-sitter with kakoune";
|
||||
homepage = "https://git.sr.ht/~hadronized/kak-tree-sitter";
|
||||
license = with licenses; [ mit ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
|
||||
DEVICE="$1" # eg: /sys/class/drm/card1/device
|
||||
HWMON=$(echo "$DEVICE"/hwmon/hwmon*)
|
||||
|
||||
exit() {
|
||||
echo "Setting controll to auto" >&2
|
||||
echo 2 > "$HWMON/pwm1_enable"
|
||||
}
|
||||
|
||||
trap exit EXIT INT
|
||||
|
||||
bail() {
|
||||
echo "Error: $@" >&2
|
||||
echo "Exiting..." >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
if ! [ -d $HWMON ]; then
|
||||
bail "Invalid HWMON"
|
||||
fi
|
||||
|
||||
TEMP_INPUT="$HWMON/temp2_input"
|
||||
|
||||
if ! [ -f $TEMP_INPUT ]; then
|
||||
bail "Invalid TEMP_INPUT"
|
||||
fi
|
||||
|
||||
MIN="$2"
|
||||
MAX="$3"
|
||||
|
||||
echo "Running..." >&2
|
||||
while true; do
|
||||
TEMPERATURE_RAW=$(cat "$TEMP_INPUT")
|
||||
TEMPERATURE="$(( $TEMPERATURE_RAW / 1000 ))"
|
||||
# Remap from a number between 60_000..90_000 to 0..255
|
||||
PWM=$(( ($TEMPERATURE - $MIN) * 255 / ($MAX - $MIN) ))
|
||||
|
||||
if [ "$PWM" -gt 255 ]; then
|
||||
PWM=255
|
||||
elif [ "$PWM" -lt 0 ]; then
|
||||
PWM=0
|
||||
fi
|
||||
|
||||
echo 1 > "$HWMON/pwm1_enable"
|
||||
echo "$PWM" > "$HWMON/pwm1"
|
||||
sleep .1s
|
||||
done
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
CONTROLLER=$(find /sys/class/power_supply -maxdepth 1 -name '*controller*' || true)
|
||||
|
||||
if test -z "$CONTROLLER"; then
|
||||
echo
|
||||
exit 0
|
||||
fi
|
||||
|
||||
CAPACITY=$(cat "$CONTROLLER/capacity")
|
||||
|
||||
echo -n ''
|
||||
|
||||
if test "$CAPACITY" -ge 90; then
|
||||
echo ''
|
||||
elif test "$CAPACITY" -ge 90; then
|
||||
echo ''
|
||||
elif test "$CAPACITY" -ge 80; then
|
||||
echo ''
|
||||
elif test "$CAPACITY" -ge 70; then
|
||||
echo ''
|
||||
elif test "$CAPACITY" -ge 60; then
|
||||
echo ''
|
||||
elif test "$CAPACITY" -ge 50; then
|
||||
echo ''
|
||||
elif test "$CAPACITY" -ge 40; then
|
||||
echo ''
|
||||
elif test "$CAPACITY" -ge 30; then
|
||||
echo ''
|
||||
elif test "$CAPACITY" -ge 20; then
|
||||
echo ''
|
||||
elif test "$CAPACITY" -ge 10; then
|
||||
echo ''
|
||||
else
|
||||
echo ''
|
||||
fi
|
||||
|
|
@ -23,7 +23,6 @@
|
|||
in
|
||||
with final;
|
||||
createScripts {
|
||||
amd-fan-control = [ bash ];
|
||||
br = [ ];
|
||||
bmenu = [
|
||||
bemenu
|
||||
|
|
@ -125,14 +124,11 @@
|
|||
zbar
|
||||
wl-clipboard
|
||||
];
|
||||
pint-fmt = [ ];
|
||||
powerplay-led-idle = [
|
||||
bash
|
||||
libinput
|
||||
libratbag
|
||||
];
|
||||
vrr-fullscreen = [ ];
|
||||
controller-battery = [ ];
|
||||
}
|
||||
// lib.mapAttrs importScript {
|
||||
wdmenu = ./wdmenu.nix;
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
file="$(mktemp)"
|
||||
cat - >"$file"
|
||||
./vendor/bin/pint --quiet "$file"
|
||||
cat "$file"
|
||||
rm "$file"
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# List of supported outputs for VRR
|
||||
output_vrr_whitelist=(
|
||||
"DP-1"
|
||||
"DP-2"
|
||||
)
|
||||
|
||||
# Toggle VRR for fullscreened apps in prespecified displays to avoid stutters while in desktop
|
||||
swaymsg -t subscribe -m '[ "window" ]' | while read window_json; do
|
||||
window_event=$(echo ${window_json} | jq -r '.change')
|
||||
|
||||
# Process only focus change and fullscreen toggle
|
||||
if [[ $window_event = "focus" || $window_event = "fullscreen_mode" ]]; then
|
||||
output_json=$(swaymsg -t get_outputs | jq -r '.[] | select(.focused == true)')
|
||||
output_name=$(echo ${output_json} | jq -r '.name')
|
||||
|
||||
# Use only VRR in whitelisted outputs
|
||||
if [[ ${output_vrr_whitelist[*]} =~ ${output_name} ]]; then
|
||||
output_vrr_status=$(echo ${output_json} | jq -r '.adaptive_sync_status')
|
||||
window_fullscreen_status=$(echo ${window_json} | jq -r '.container.fullscreen_mode')
|
||||
|
||||
# Only update output if nesseccary to avoid flickering
|
||||
[[ $output_vrr_status = "disabled" && $window_fullscreen_status = "1" ]] && swaymsg output "${output_name}" adaptive_sync 1
|
||||
[[ $output_vrr_status = "enabled" && $window_fullscreen_status = "0" ]] && swaymsg output "${output_name}" adaptive_sync 0
|
||||
fi
|
||||
fi
|
||||
done
|
||||
Binary file not shown.
|
|
@ -1,16 +0,0 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-rsa BwwxHg
|
||||
iTcgtxF1IxopbtF+aw7V8IQfH7tWiMk9lE/eWlVHVjeaRvER5W6Y3xZNOFCjtbqY
|
||||
VwEyV6ibfZ4GJt1jRu2icEH/AnLUJFFGQnxu/K/rtoZ3tqSIk9WCBv3aPo4oZRiU
|
||||
uaaxi2gD8qo1RLyl/Ij7Djw4i/isUOO1EON5sgx1d39k6qUD4Mak0DSU4EtGdTsr
|
||||
OaxDAc0kAxhxZQOUH/QlKa0HLonaFcy1LHqvttOcw3UZuZnaYfZiPlcqe3USS9cm
|
||||
96aIC5cS9pHr4JFrqRYvfpla2TY5jlCB/xBGw3KjGEIQoBPXSsJZA6BCMZyp00++
|
||||
tdfS2aomt9HFmb1wZDS0jWAxkVF6nXXBbolFVih+58h0nYLljtHIQ3SizRoXY459
|
||||
x3JE9NReHp2OO3SlIeO03Kv8YMBvj7nSSd1C1PMpu+hJ/eCXi1WQxD6QY+40muk6
|
||||
KhqE3PZ8BCY2b+VpywUF5gVH28mo3jscqAzhf2dZ3SQlzldI+hFyKPxTdAqkfUOH
|
||||
|
||||
--- cinb+wzjVfTkpfm1CtFIFaepwoQVCj1MquB5rAC45Ew
|
||||
¾
|
||||
6
|
||||
ZCþHS 0 7ïº ÖóýE¼X* Àq b=üOßí ÛÉwu¥¤³Pºþ¹ Ùçǖѳ/£ómv òÞ×Ë2VœÄ«
|
||||
ÁŠxvç[“£‚µ£±”Ì‚A~ evdÓåÙ0¢ Œni³1Ò›¹Qý„"í@Ù¹§ÞÔ{KpÐ:åϵuµsÊÎBñò(X…r[ ÂQVg¢Tš¤°ðœîËï@Ä*ÇõÿíB «<>.§¯žhE鲟èÐë’÷½¥Žûzlz|kã`l8‘´8¼M›cch<63>îáZ`ƒ ?yeoƒ+ÈM-:/–À**ìè¦Ê cŸÎZD¡2Ñá¼é&·÷¾Ç¢ ¹£e¤ï*Hnç"Þ~+|ua(û6óËJ
|
||||
|
|
@ -12,11 +12,9 @@ in
|
|||
"monolith-forgejo-runner-token.age".publicKeys = [ main_ssh_public_key ];
|
||||
"lelgenio-cachix.age".publicKeys = [ main_ssh_public_key ];
|
||||
"monolith-nix-serve-privkey.age".publicKeys = [ main_ssh_public_key ];
|
||||
"factorio-settings.age".publicKeys = [ main_ssh_public_key ];
|
||||
"phantom-nextcloud.age".publicKeys = [ main_ssh_public_key ];
|
||||
"phantom-writefreely.age".publicKeys = [ main_ssh_public_key ];
|
||||
"phantom-renawiki.age".publicKeys = [ main_ssh_public_key ];
|
||||
"phantom-forgejo-mailer-password.age".publicKeys = [ main_ssh_public_key ];
|
||||
"phantom-mastodon-mailer-password.age".publicKeys = [ main_ssh_public_key ];
|
||||
"phantom-invidious-settings.age".publicKeys = [ main_ssh_public_key ];
|
||||
}
|
||||
|
|
|
|||
7
switch
7
switch
|
|
@ -4,9 +4,10 @@ nix fmt
|
|||
|
||||
git --no-pager diff
|
||||
|
||||
nixos-rebuild \
|
||||
sudo nice ionice \
|
||||
nixos-rebuild \
|
||||
switch \
|
||||
--use-remote-sudo \
|
||||
--verbose \
|
||||
--print-build-logs \
|
||||
--flake .# \
|
||||
"$@"
|
||||
$@
|
||||
|
|
|
|||
|
|
@ -48,15 +48,6 @@
|
|||
|
||||
services.geoclue2.enable = true;
|
||||
|
||||
# Workaround for nm-wait-online hanging??
|
||||
# Ref: https://github.com/NixOS/nixpkgs/issues/180175
|
||||
systemd.services.NetworkManager-wait-online = {
|
||||
serviceConfig.ExecStart = [
|
||||
""
|
||||
"${pkgs.networkmanager}/bin/nm-online -q"
|
||||
];
|
||||
};
|
||||
|
||||
systemd.extraConfig = ''
|
||||
DefaultTimeoutStopSec=10s
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -12,14 +12,6 @@
|
|||
"--volumes"
|
||||
];
|
||||
};
|
||||
daemon.settings = {
|
||||
# needed by bitbucket runner ???
|
||||
log-driver = "json-file";
|
||||
log-opts = {
|
||||
max-size = "10m";
|
||||
max-file = "3";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.extra-container.enable = true;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ in
|
|||
virtualisation.docker.enable = true;
|
||||
services.gitlab-runner = {
|
||||
enable = true;
|
||||
settings.concurrent = 12;
|
||||
settings.concurrent = 4;
|
||||
services = {
|
||||
# runner for building in docker via host's nix-daemon
|
||||
# nix store will be readable in runner, might be insecure
|
||||
|
|
|
|||
|
|
@ -14,6 +14,18 @@ in
|
|||
enable = true;
|
||||
settings.concurrent = 1;
|
||||
services = {
|
||||
# ci_test = {
|
||||
# registrationConfigFile = "/srv/gitlab-runner/env/ci_test";
|
||||
# dockerImage = "debian";
|
||||
# dockerPrivileged = true;
|
||||
# };
|
||||
thoreb_builder = {
|
||||
registrationConfigFile =
|
||||
config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
||||
dockerImage = "debian";
|
||||
dockerPrivileged = true;
|
||||
};
|
||||
|
||||
thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path;
|
||||
thoreb-itinerario-nix = mkNixRunner config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -34,4 +34,5 @@
|
|||
];
|
||||
|
||||
programs.dzgui.enable = true;
|
||||
programs.dzgui.package = inputs.dzgui-nix.packages.${pkgs.system}.default;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ in
|
|||
shellAliases = {
|
||||
rm = "trash";
|
||||
tree = "eza -T";
|
||||
kill_yourself = "shutdown now";
|
||||
};
|
||||
shellAbbrs = {
|
||||
off = "shutdown now";
|
||||
|
|
@ -50,7 +51,7 @@ in
|
|||
c = "cargo";
|
||||
# system
|
||||
sv = "sudo systemct";
|
||||
suv = "systemct --user";
|
||||
suv = "sudo systemct --user";
|
||||
# docker abbrs
|
||||
d = "docker";
|
||||
dc = "docker-compose";
|
||||
|
|
|
|||
|
|
@ -103,29 +103,29 @@ function fish_git_prompt
|
|||
_fish_prompt_warn "init"
|
||||
end
|
||||
|
||||
# if we have at least one commit
|
||||
if git rev-parse HEAD -- &>/dev/null
|
||||
# print a "↑" if ahead of origin
|
||||
test 0 -ne (git log --oneline "$git_remote_branch"..HEAD -- | wc -l)
|
||||
and set -f _git_sync_ahead '↑'
|
||||
git rev-parse HEAD -- &>/dev/null
|
||||
or return
|
||||
|
||||
# print a "↓" if behind of origin
|
||||
test 0 -lt (git log --oneline HEAD.."$git_remote_branch" -- | wc -l)
|
||||
and set -l _git_sync_behind '↓'
|
||||
# print a "↑" if ahead of origin
|
||||
test 0 -ne (git log --oneline "$git_remote_branch"..HEAD -- | wc -l)
|
||||
and set -f _git_sync_ahead '↑'
|
||||
|
||||
if set -q _git_sync_ahead _git_sync_behind
|
||||
_fish_prompt_normal '⇅'
|
||||
else if set -q _git_sync_ahead
|
||||
_fish_prompt_normal '↑'
|
||||
else if set -q _git_sync_behind
|
||||
_fish_prompt_normal '↓'
|
||||
end
|
||||
# print a "↓" if behind of origin
|
||||
test 0 -lt (git log --oneline HEAD.."$git_remote_branch" -- | wc -l)
|
||||
and set -l _git_sync_behind '↓'
|
||||
|
||||
if test -n "$git_log_unpushed"
|
||||
and not string match -qr "$git_branch" "$git_log_unpushed"
|
||||
_fish_prompt_normal '↻'
|
||||
_fish_prompt_warn $git_log_unpushed[1]
|
||||
end
|
||||
if set -q _git_sync_ahead _git_sync_behind
|
||||
_fish_prompt_normal '⇅'
|
||||
else if set -q _git_sync_ahead
|
||||
_fish_prompt_normal '↑'
|
||||
else if set -q _git_sync_behind
|
||||
_fish_prompt_normal '↓'
|
||||
end
|
||||
|
||||
if test -n "$git_log_unpushed"
|
||||
and not string match -qr "$git_branch" "$git_log_unpushed"
|
||||
_fish_prompt_normal '↻'
|
||||
_fish_prompt_warn $git_log_unpushed[1]
|
||||
end
|
||||
|
||||
############################################################
|
||||
|
|
|
|||
|
|
@ -54,7 +54,9 @@
|
|||
# Let Home Manager install and manage itself.
|
||||
programs.home-manager.enable = true;
|
||||
home.packages = with pkgs; [
|
||||
terminal
|
||||
# home-manager
|
||||
|
||||
terminal # see flake.nix
|
||||
|
||||
pulse_sink
|
||||
pulseaudio
|
||||
|
|
@ -79,6 +81,7 @@
|
|||
amdgpu_top
|
||||
inxi
|
||||
dmidecode
|
||||
ncdu
|
||||
|
||||
## text manipulation
|
||||
sd
|
||||
|
|
@ -107,6 +110,7 @@
|
|||
## Network
|
||||
speedtest-cli
|
||||
nmap
|
||||
httpie
|
||||
miniupnpc
|
||||
deluge
|
||||
nicotine-plus
|
||||
|
|
@ -118,6 +122,7 @@
|
|||
# rustup
|
||||
|
||||
docker-compose
|
||||
gnumake
|
||||
mariadb
|
||||
|
||||
nodePackages.intelephense
|
||||
|
|
@ -127,7 +132,7 @@
|
|||
clang-tools # c/c++ lsp server
|
||||
rust-analyzer # rust analyzer
|
||||
|
||||
unstable.blade-formatter
|
||||
blade-formatter
|
||||
nixfmt-rfc-style
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -127,13 +127,12 @@ in
|
|||
ranger
|
||||
bmenu
|
||||
kak-lsp
|
||||
unstable.kak-tree-sitter
|
||||
kak-tree-sitter
|
||||
kak-pager
|
||||
kak-man-pager
|
||||
|
||||
emmet-cli
|
||||
nodePackages.prettier
|
||||
pint-fmt
|
||||
|
||||
aspell
|
||||
aspellDicts.en
|
||||
|
|
|
|||
|
|
@ -30,18 +30,10 @@ hook global WinSetOption filetype=angular %[
|
|||
add-highlighter buffer/angular ref html
|
||||
]
|
||||
|
||||
hook global BufCreate .*\.php %{
|
||||
set buffer formatcmd 'pint-fmt'
|
||||
}
|
||||
|
||||
hook global BufCreate .*\.js %{
|
||||
set buffer formatcmd 'prettier --parser babel'
|
||||
}
|
||||
|
||||
hook global BufCreate .*\.scss %{
|
||||
set buffer formatcmd 'prettier --parser scss'
|
||||
}
|
||||
|
||||
hook global BufCreate .*\.vue %{
|
||||
set buffer formatcmd 'prettier --parser vue'
|
||||
hook buffer InsertCompletionHide {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ pkgs, lib, ... }:
|
||||
let
|
||||
hx-src = pkgs.helix.src;
|
||||
kts-src = pkgs.unstable.kak-tree-sitter-unwrapped.src;
|
||||
kts-src = pkgs.kak-tree-sitter.src;
|
||||
inherit (pkgs) fetchFromGitHub;
|
||||
in
|
||||
with pkgs.tree-sitter-grammars;
|
||||
|
|
|
|||
34
user/ssh.nix
34
user/ssh.nix
|
|
@ -1,20 +1,26 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (config.my) username mail;
|
||||
in
|
||||
{
|
||||
config = {
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
matchBlocks = {
|
||||
monolith = {
|
||||
user = "lelgenio";
|
||||
hostname = "monolith.lelgenio.com";
|
||||
port = 9022;
|
||||
};
|
||||
phantom = {
|
||||
user = "root";
|
||||
hostname = "phantom.lelgenio.com";
|
||||
port = 9022;
|
||||
};
|
||||
programs.ssh.enable = true;
|
||||
programs.ssh.matchBlocks = {
|
||||
monolith = {
|
||||
user = "lelgenio";
|
||||
hostname = "monolith.lelgenio.com";
|
||||
port = 9022;
|
||||
};
|
||||
phantom = {
|
||||
user = "root";
|
||||
hostname = "phantom.lelgenio.com";
|
||||
port = 9022;
|
||||
};
|
||||
includes = [ "~/Wopus/.ssh.config" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,7 +69,6 @@ in
|
|||
};
|
||||
output = {
|
||||
"*" = {
|
||||
adaptive_sync = "off";
|
||||
bg = "${theme.background} fill";
|
||||
mode = "1920x1080@144.000Hz";
|
||||
};
|
||||
|
|
@ -81,7 +80,7 @@ in
|
|||
# Ignore PS4 controller touchpad events
|
||||
input."1356:2508:Wireless_Controller_Touchpad".events = "disabled";
|
||||
|
||||
input."type:pointer" = {
|
||||
input."1133:16537:Logitech_G502_X_PLUS" = {
|
||||
accel_profile = "flat";
|
||||
pointer_accel = "0";
|
||||
};
|
||||
|
|
@ -122,21 +121,6 @@ in
|
|||
indicator = true;
|
||||
};
|
||||
|
||||
systemd.user.services.vrr-fullscreen = {
|
||||
Unit = {
|
||||
Description = "Enable VRR for fullscreen windows";
|
||||
PartOf = [ "graphical-session.target" ];
|
||||
After = [ "graphical-session.target" ];
|
||||
};
|
||||
Service = {
|
||||
ExecStart = "${lib.getExe pkgs.vrr-fullscreen}";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "sway-session.target" ];
|
||||
};
|
||||
};
|
||||
|
||||
services.gpg-agent.pinentryPackage = pkgs.pinentry-all;
|
||||
|
||||
xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ in
|
|||
"mpd"
|
||||
"custom/playerctl"
|
||||
"tray"
|
||||
"custom/controller-battery"
|
||||
"custom/caffeine"
|
||||
"pulseaudio"
|
||||
(lib.optional (osConfig.services.vpn.enable or false) "custom/vpn")
|
||||
|
|
@ -158,12 +157,6 @@ in
|
|||
"sway/language" = {
|
||||
format = "{short} {variant}";
|
||||
};
|
||||
"custom/controller-battery" = {
|
||||
format = "{}";
|
||||
exec = lib.getExe pkgs.controller-battery;
|
||||
interval = 1;
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/caffeine" = {
|
||||
format = "{}";
|
||||
exec = "systemctl --user status swayidle > /dev/null && echo || echo ";
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ window#waybar.solo {
|
|||
#mpd,
|
||||
#custom-mpd,
|
||||
#custom-playerctl,
|
||||
#custom-controller-battery,
|
||||
#tray,
|
||||
#clock,
|
||||
#network,
|
||||
|
|
|
|||
Loading…
Reference in a new issue