small fixes as always
Some checks failed
laptop / tests (push) Has been cancelled
intelnuc / tests (push) Has been cancelled

This commit is contained in:
delta 2024-08-06 20:15:06 +03:00
parent 61f5b3185b
commit 97faafa199
20 changed files with 532 additions and 1412 deletions

View file

@ -2,14 +2,15 @@
"nodes": { "nodes": {
"ags": { "ags": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1718921313, "lastModified": 1721306136,
"narHash": "sha256-TFJah1RW5qnYW7kajjAFPAS5j/0q0R3vz9zPjrRA0Mc=", "narHash": "sha256-VKPsIGf3/a+RONBipx4lEE4LXG2sdMNkWQu22LNQItg=",
"owner": "Aylur", "owner": "Aylur",
"repo": "ags", "repo": "ags",
"rev": "646d5ad073ff7f8b1d50cfbd40f5b8a250fcd59d", "rev": "344ea72cd3b8d4911f362fec34bce7d8fb37028c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -24,14 +25,14 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1717576207, "lastModified": 1721135360,
"narHash": "sha256-LU6d1xX7jN1zt10YU7Oym07MtzVfziSmUEznGFdbuaw=", "narHash": "sha256-ZhSA0e45UxiOAjEVqkym/aULh0Dt+KHJLNda7bjx9UI=",
"owner": "anyrun-org", "owner": "anyrun-org",
"repo": "anyrun", "repo": "anyrun",
"rev": "7aabad8d5bb7d1bffae903ce86427b888ab824b4", "rev": "c6101a31a80b51e32e96f6a77616b609770172e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -40,6 +41,39 @@
"type": "github" "type": "github"
} }
}, },
"aquamarine": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1722347739,
"narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "aquamarine",
"type": "github"
}
},
"cachix": { "cachix": {
"locked": { "locked": {
"lastModified": 1635350005, "lastModified": 1635350005,
@ -63,15 +97,15 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"jovian": "jovian", "jovian": "jovian",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"systems": "systems_2", "systems": "systems_3",
"yafas": "yafas" "yafas": "yafas"
}, },
"locked": { "locked": {
"lastModified": 1720452593, "lastModified": 1722542796,
"narHash": "sha256-lE6r0ty6o3tbwSg8HGSMc4RVhtryRP7OtcmgEAvSwUM=", "narHash": "sha256-l+XBDAxLXPdEqPASKjyDbgBQys9IijCtHjXcEXN6YeU=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "5cd32d60b3f8ce3b0552103bb8de0635c3c0d87d", "rev": "a44b84390425928d2282676e63eed3a1ee528178",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,11 +140,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720614517, "lastModified": 1722601690,
"narHash": "sha256-7S1YZizLtG0ofYnSCc453n7YZlVmoyNlM+UXlucpgnE=", "narHash": "sha256-0T5UIj683XckcgZYAKauDQjDqQvcZf2b+hQrBxtvIKo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "flake-firefox-nightly", "repo": "flake-firefox-nightly",
"rev": "207c323786ca4ab0b7750dfa522699cfd9f09da8", "rev": "5783e7f3c40c73bfa2e2501da8d39670cbbd0f98",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -171,7 +205,7 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -189,7 +223,7 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -207,7 +241,7 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_6" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -231,11 +265,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719677234, "lastModified": 1722462338,
"narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=", "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d", "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -251,11 +285,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720470846, "lastModified": 1722462338,
"narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=", "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192", "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -280,11 +314,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720108799, "lastModified": 1721330371,
"narHash": "sha256-AxRkTJlbB8r7aG6gvc7IaLhc2T9TO4/8uqanKRxukBQ=", "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "a5c0d57325c5f0814c39110a70ca19c070ae9486", "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -295,20 +329,21 @@
}, },
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"aquamarine": "aquamarine",
"hyprcursor": "hyprcursor", "hyprcursor": "hyprcursor",
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprutils": "hyprutils", "hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"systems": "systems_4", "systems": "systems_5",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1720453602, "lastModified": 1722605151,
"narHash": "sha256-7+PjJZn/jpqNkVKJ3AGVT9G601rVj/R8KkT+WWjhwyk=", "narHash": "sha256-C+nivwWd+wjwJ5An1XKqAhvPYT5lx0XvvrbY4GkT8rU=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "b03f41efec14273cf25c42d4cef326acc36cb319", "rev": "592b4a709c8093273c6051fb7e76ce3c3d82cedf",
"revCount": 4913, "revCount": 5042,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -326,11 +361,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718476555, "lastModified": 1720709712,
"narHash": "sha256-fuWpgh8KasByIJWE+xVd37Al0LV5YAn6s871T50qVY0=", "narHash": "sha256-78j/cY+AXoMIqqiNc1vWx237EPfpERAcYsb57ABUbwQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "29a8374f4b9206d5c4af84aceb7fb5dff441ea60", "rev": "65d42dcbfde2229a75ccdb195c318dfe241f9ade",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -353,11 +388,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718746314, "lastModified": 1721326555,
"narHash": "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=", "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "1b61f0093afff20ab44d88ad707aed8bf2215290", "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -382,11 +417,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720381373, "lastModified": 1721324361,
"narHash": "sha256-lyC/EZdHULsaAKVryK11lgHY9u6pXr7qR4irnxNWC7k=", "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "5df0174fd09de4ac5475233d65ffc703e89b82eb", "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -407,11 +442,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720203444, "lastModified": 1722098849,
"narHash": "sha256-lq2dPPPcwMHTLsFrQ2pRp4c2LwDZWoqzSyjuPdeJCP4=", "narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "a8c3a135701a7b64db0a88ec353a392f402d2a87", "rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -432,11 +467,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720215857, "lastModified": 1721324119,
"narHash": "sha256-JPdL+Qul+jEueAn8CARfcWP83eJgwkhMejQYfDvrgvU=", "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "d5fa094ca27e0039be5e94c0a80ae433145af8bb", "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -454,11 +489,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719631702, "lastModified": 1721993749,
"narHash": "sha256-HMWxIehVO8pHp7OlqBYliiLOds34UJHSRn5FPdEb1j8=", "narHash": "sha256-dGqEQ68GNGmA8+HHzHEqAcW2uGu/AX+sRWcMO99UM8s=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "2f9668e19aff06550cd154c87c0af120735a56a4", "rev": "3bd059992912139d6a12e86ba418f933ec368ef2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -473,11 +508,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1720354218, "lastModified": 1722168631,
"narHash": "sha256-cyl6Cxqo4bNmwLXi8/qIc3U1vRJ9VyIBUL/j3is4x58=", "narHash": "sha256-16XBXW86ceQC+jRx7feCREZo696kvIzpKYmN2LnKfaE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "5865544e7c012ecaa952f5c6cf5878c1676b52b4", "rev": "4ce8efe904950cd85bda9624ff1c2ec55fe2ab6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -543,11 +578,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1720313561, "lastModified": 1722128034,
"narHash": "sha256-arht1SYnZ5hJl1COIuqbdRi8ibpnNtc9zUZLmU9xqTs=", "narHash": "sha256-L8rwzYPsLo/TYtydPJoQyYOfetuiyQYnTWYcyB8UE/s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "770d42db0b8203bdd84ddbd707a49fe0a3638863", "rev": "d15f6f6021693898fcd2c6a9bb13707383da9bbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -558,11 +593,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1719957072, "lastModified": 1720535198,
"narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -590,11 +625,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1720418205, "lastModified": 1722421184,
"narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "655a58a72a6601292512670343087c2d75d859c1", "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -638,11 +673,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1720031269, "lastModified": 1722421184,
"narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -654,11 +689,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1720031269, "lastModified": 1722185531,
"narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -734,11 +769,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1720622117, "lastModified": 1722610226,
"narHash": "sha256-nS3nJcwtfI/WxFnmCQ2QnWLOnFNqWBuhNdh+7+fzSYM=", "narHash": "sha256-e9sPV2i4N1J0zAxcsZNpdoTRgpHfYva4azi7ZA6jMcc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "dcb8645b3f41f58b608845104def437b434997c7", "rev": "0e1e13187bbb07c80b61f057843602af1f1ffd99",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -754,11 +789,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719670225, "lastModified": 1721833508,
"narHash": "sha256-nRzUuHyHcsHbiIDIxdATqJiurUIdQWOO4JgTBv4u6BE=", "narHash": "sha256-octs3o8RrgMepxLpwf3hmGMRpVAxaKvbjOiRDlnhrHo=",
"owner": "MOIS3Y", "owner": "MOIS3Y",
"repo": "nvchad4nix", "repo": "nvchad4nix",
"rev": "de71b78b1a5abff213483446f4497c5070b27ce9", "rev": "1cc87a23dfe3debecbe3bbbc32c625e84d15aa56",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -793,11 +828,11 @@
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
}, },
"locked": { "locked": {
"lastModified": 1720624882, "lastModified": 1721836903,
"narHash": "sha256-87C0wa4qdXa+N54dCG3K8I6wpQG//0i0O9vV1b739wk=", "narHash": "sha256-2aBeBE9GibyZKiCSIV1xJPEl8Zfz8fLHYffKjmhVHkY=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "3c53f4f9f6fdea929bb8e6b655d429c6f263197d", "rev": "ed2d1a759962b75ff0fc3dfcb48e519a4ff1bf35",
"revCount": 38, "revCount": 39,
"type": "git", "type": "git",
"url": "ssh://git@github.com/deltathetawastaken/secrets.git" "url": "ssh://git@github.com/deltathetawastaken/secrets.git"
}, },
@ -881,6 +916,21 @@
} }
}, },
"systems_3": { "systems_3": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_4": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -895,7 +945,7 @@
"type": "github" "type": "github"
} }
}, },
"systems_4": { "systems_5": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -910,7 +960,7 @@
"type": "github" "type": "github"
} }
}, },
"systems_5": { "systems_6": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -925,7 +975,7 @@
"type": "github" "type": "github"
} }
}, },
"systems_6": { "systems_7": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -976,11 +1026,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720194466, "lastModified": 1722365976,
"narHash": "sha256-Rizg9efi6ue95zOp0MeIV2ZedNo+5U9G2l6yirgBUnA=", "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "b9b97e5ba23fe7bd5fa4df54696102e8aa863cf6", "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -39,7 +39,7 @@
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
ags.url = "github:Aylur/ags"; # ags.url = "github:Aylur/ags";
nvchad4nix = { nvchad4nix = {
url = "github:MOIS3Y/nvchad4nix"; url = "github:MOIS3Y/nvchad4nix";

File diff suppressed because it is too large Load diff

View file

@ -15,6 +15,7 @@
../pkgs/hyprland/hyprshade ../pkgs/hyprland/hyprshade
../pkgs/nvchad ../pkgs/nvchad
# ../pkgs/ags # ../pkgs/ags
../pkgs/aria2
]; ];
#services.blueman-applet.enable = true; #services.blueman-applet.enable = true;

View file

@ -1,10 +1,15 @@
{ pkgs, lib, stable, unstable, ... }: {
let pkgs,
lib,
stable,
unstable,
...
}: let
gtk-theme = "adw-gtk3-dark"; gtk-theme = "adw-gtk3-dark";
cursor-package = pkgs.bibata-cursors; cursor-package = pkgs.bibata-cursors;
cursor-theme = "Bibata-Modern-Classic"; cursor-theme = "Bibata-Modern-Classic";
nerdfonts = (pkgs.nerdfonts.override { nerdfonts = pkgs.nerdfonts.override {
fonts = [ fonts = [
#"Ubuntu" #"Ubuntu"
#"UbuntuMono" #"UbuntuMono"
@ -16,7 +21,7 @@ let
"IBMPlexMono" "IBMPlexMono"
"NerdFontsSymbolsOnly" "NerdFontsSymbolsOnly"
]; ];
}); };
in { in {
home = { home = {
packages = with pkgs; [ packages = with pkgs; [

View file

@ -1,15 +1,24 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ stable, unstable, config, lib, pkgs, modulesPath, ... }:
{ {
stable,
unstable,
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [(modulesPath + "/installer/scan/not-detected.nix")]; imports = [(modulesPath + "/installer/scan/not-detected.nix")];
boot.initrd.prepend = lib.mkOrder 0 [ "${pkgs.fetchurl { boot.initrd.prepend = lib.mkOrder 0 [
"${pkgs.fetchurl {
url = "https://gitlab.freedesktop.org/drm/amd/uploads/9fe228c7aa403b78c61fb1e29b3b35e3/slim7-ssdt"; url = "https://gitlab.freedesktop.org/drm/amd/uploads/9fe228c7aa403b78c61fb1e29b3b35e3/slim7-ssdt";
sha256 = "sha256-Ef4QTxdjt33OJEPLAPEChvvSIXx3Wd/10RGvLfG5JUs="; sha256 = "sha256-Ef4QTxdjt33OJEPLAPEChvvSIXx3Wd/10RGvLfG5JUs=";
name = "slim7-ssdt"; name = "slim7-ssdt";
}}" ]; }}"
];
hardware.firmware = [ hardware.firmware = [
(pkgs.runCommandNoCC "subwoofer" {} '' (pkgs.runCommandNoCC "subwoofer" {} ''
@ -66,10 +75,10 @@ echo kernel: $(uname -a | tr -s ' ' ' ' | cut -d' ' -f3,8-12)
''; '';
services.zfs.autoScrub.enable = true; services.zfs.autoScrub.enable = true;
services.fstrim = { # services.fstrim = {
enable = true; # enable = true;
interval = "weekly"; # interval = "weekly";
}; # };
programs.nh = { programs.nh = {
enable = true; enable = true;
@ -88,7 +97,6 @@ echo kernel: $(uname -a | tr -s ' ' ' ' | cut -d' ' -f3,8-12)
"amd_pstate.shared_mem=1" "amd_pstate.shared_mem=1"
"zfs_arc_min=8589934592" "zfs_arc_min=8589934592"
"zfs.zfs_arc_max=25769803776" "zfs.zfs_arc_max=25769803776"
"resume=UUID=a2ff20bd-56f3-4c83-b1b4-933ba0c82f36"
# # Disable all mitigations # # Disable all mitigations
# "mitigations=off" # "mitigations=off"
@ -102,7 +110,6 @@ echo kernel: $(uname -a | tr -s ' ' ' ' | cut -d' ' -f3,8-12)
boot.zfs.allowHibernation = true; boot.zfs.allowHibernation = true;
boot.zfs.forceImportRoot = false; boot.zfs.forceImportRoot = false;
boot.resumeDevice = "/dev/mapper/cryptroot0p2";
boot.kernelModules = ["amd-pstate" "acpi_call" "amdgpu" "kvm-amd" "vfat" "nls_cp437" "nls_iso8859-1" "tcp_bbr"]; boot.kernelModules = ["amd-pstate" "acpi_call" "amdgpu" "kvm-amd" "vfat" "nls_cp437" "nls_iso8859-1" "tcp_bbr"];
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_mod" "vfat" "nls_cp437" "nls_iso8859-1"]; boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_mod" "vfat" "nls_cp437" "nls_iso8859-1"];
@ -132,31 +139,30 @@ echo kernel: $(uname -a | tr -s ' ' ' ' | cut -d' ' -f3,8-12)
boot.kernelPackages = lib.mkOverride 99 pkgs.linuxPackages_cachyos; boot.kernelPackages = lib.mkOverride 99 pkgs.linuxPackages_cachyos;
boot.zfs.package = lib.mkOverride 99 pkgs.zfs_cachyos; boot.zfs.package = lib.mkOverride 99 pkgs.zfs_cachyos;
chaotic.scx = { enable = true; scheduler = "scx_rusty"; }; chaotic.scx = {
enable = true;
scheduler = "scx_rusty";
};
environment.systemPackages = [pkgs.scx]; environment.systemPackages = [pkgs.scx];
boot.extraModulePackages = with config.boot.kernelPackages; [usbip acpi_call]; boot.extraModulePackages = with config.boot.kernelPackages; [usbip acpi_call];
boot.plymouth.enable = false; boot.plymouth.enable = false;
boot.supportedFilesystems = ["zfs"]; boot.supportedFilesystems = ["zfs"];
boot.initrd.extraUtilsCommands = '' # boot.initrd.extraUtilsCommands = ''
copy_bin_and_libs ${pkgs.multipath-tools}/bin/kpartx # copy_bin_and_libs ${pkgs.multipath-tools}/bin/kpartx
''; # '';
boot.initrd.luks = { boot.initrd.luks = {
yubikeySupport = true; yubikeySupport = true;
devices."cryptroot0" = { devices."cryptroot0" = {
device = "/dev/nvme0n1p2"; device = "/dev/nvme0n1p2";
postOpenCommands = " # postOpenCommands = "
kpartx -u /dev/mapper/cryptroot0 # kpartx -u /dev/mapper/cryptroot0
kpartx -u /dev/mapper/cryptroot0p1 # kpartx -u /dev/mapper/cryptroot0p1
kpartx -u /dev/mapper/cryptroot0p2 # kpartx -u /dev/mapper/cryptroot0p2
"; # ";
yubikey = { yubikey = {
slot = 2; slot = 2;
gracePeriod = 3; gracePeriod = 3;
@ -179,18 +185,76 @@ echo kernel: $(uname -a | tr -s ' ' ' ' | cut -d' ' -f3,8-12)
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/" = fileSystems."/" = {
{ device = "zroot/root"; device = "zroot/root";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/home" = fileSystems."/home" = {
{ device = "zroot/home"; device = "zroot/home";
fsType = "zfs"; fsType = "zfs";
}; };
swapDevices = fileSystems."/home/delta/games" = {
[ { device = "/dev/disk/by-uuid/a2ff20bd-56f3-4c83-b1b4-933ba0c82f36"; } device = "zroot/home/games";
fsType = "zfs";
};
fileSystems."/games" = {
device = "zroot/games";
fsType = "zfs";
};
fileSystems."/media" = {
device = "zroot/media";
fsType = "zfs";
};
fileSystems."/downloads" = {
device = "zroot/downloads";
fsType = "zfs";
};
fileSystems."/nix" = {
device = "zroot/nix";
fsType = "zfs";
};
fileSystems."/nix/store" = {
device = "zroot/nix/store";
fsType = "zfs";
};
fileSystems."/var" = {
device = "zroot/var";
fsType = "zfs";
};
fileSystems."/var/lib" = {
device = "zroot/var/lib";
fsType = "zfs";
};
fileSystems."/var/lib/docker" = {
device = "zroot/var/lib/docker";
fsType = "zfs";
};
fileSystems."/var/lib/libvirt" = {
device = "zroot/var/lib/libvirt";
fsType = "zfs";
};
fileSystems."/var/log" = {
device = "zroot/var/log";
fsType = "zfs";
};
swapDevices = [
{
device = "/dev/disk/by-partuuid/9eff2a94-f3e7-416f-a533-2e1a3e7f75bc";
randomEncryption.enable = true;
}
]; ];
hardware.opengl = { hardware.opengl = {
@ -209,19 +273,39 @@ echo kernel: $(uname -a | tr -s ' ' ' ' | cut -d' ' -f3,8-12)
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
networking.hostId = "11C0FFEE"; networking.hostId = "11C0FFEE";
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
#hardware.enableAllFirmware = true;
#hardware.enableRedistributableFirmware = true;
#hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware = {
cpu = {
x86.msr.enable = true; #= MSR.
amd.updateMicrocode = true; # Update Microcode
};
enableAllFirmware = true;
enableRedistributableFirmware = lib.mkDefault true; # Lemme update my CPU Microcode, alr?!
# firmware = with pkgs; [
# alsa-firmware
# linux-firmware
# ];
};
# boot.tmp.useTmpfs = true;
services.logind = { services.logind = {
lidSwitch = "suspend-then-hibernate"; lidSwitch = "suspend";
lidSwitchDocked = "ignore"; lidSwitchDocked = "ignore";
lidSwitchExternalPower = "ignore"; lidSwitchExternalPower = "ignore";
powerKey = "ignore"; powerKey = "ignore";
powerKeyLongPress = "hibernate"; powerKeyLongPress = "suspend";
extraConfig = '' extraConfig = ''
IdleAction=suspend-then-hibernate IdleAction=suspend
''; '';
}; };
services.upower.criticalPowerAction = "PowerOff";
systemd.services.disable-usb-wakeup = { systemd.services.disable-usb-wakeup = {
wantedBy = ["multi-user.target"]; wantedBy = ["multi-user.target"];
script = '' script = ''
@ -230,5 +314,4 @@ echo kernel: $(uname -a | tr -s ' ' ' ' | cut -d' ' -f3,8-12)
done done
''; '';
}; };
} }

View file

@ -187,7 +187,6 @@
KernelExperimental = true; KernelExperimental = true;
}; };
}; };
# hardware.enableAllFirmware = true;
sound.enable = true; sound.enable = true;

View file

@ -13,14 +13,14 @@
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
MOZ_ENABLE_WAYLAND = "1"; MOZ_ENABLE_WAYLAND = "1";
XCURSOR_SIZE = ""; XCURSOR_SIZE = "";
EDITOR = "hx"; EDITOR = "nvim";
BROWSER = "firefox"; BROWSER = "firefox";
TERMINAL = "foot"; TERMINAL = "foot";
WLR_DRM_NO_MODIFIERS = 1; # fixes graphical glitches on amd laptop WLR_DRM_NO_MODIFIERS = 1; # fixes graphical glitches on amd laptop
}; };
environment.variables = lib.mkForce { environment.variables = lib.mkForce {
EDITOR = "hx"; EDITOR = "nvim";
BROWSER = "firefox"; BROWSER = "firefox";
TERMINAL = "foot"; TERMINAL = "foot";
}; };

View file

@ -109,8 +109,6 @@ in {
(pkgs.writeScriptBin "reboot" ''read -p "Do you REALLY want to reboot? (y/N) " answer; [[ $answer == [Yy]* ]] && ${pkgs.systemd}/bin/reboot'') (pkgs.writeScriptBin "reboot" ''read -p "Do you REALLY want to reboot? (y/N) " answer; [[ $answer == [Yy]* ]] && ${pkgs.systemd}/bin/reboot'')
]; ];
programs.command-not-found.enable = false; programs.command-not-found.enable = false;
programs.fish = { programs.fish = {
enable = true; enable = true;
@ -127,10 +125,10 @@ in {
where = "which"; where = "which";
c = "cd"; c = "cd";
",s" = ", -s"; ",s" = ", -s";
nvim = "nvchad"; # nvim = "nvchad";
vim = "nvchad"; # vim = "nvim";
vi = "nvchad"; # vi = "nvim";
v = "nvchad"; # v = "nvim";
}; };
promptInit = '' promptInit = ''
set TERM "xterm-256color" set TERM "xterm-256color"

View file

@ -1 +0,0 @@
/home/zeroth/.local/share/com.github.Aylur.ags/types

1
pkgs/ags/config/types Executable file
View file

@ -0,0 +1 @@
/home/zeroth/.local/share/com.github.Aylur.ags/types

View file

@ -129,7 +129,30 @@ in {
go go
youtube-tui youtube-tui
yt-dlp yt-dlp
firefox
# (lutris.override {
# extraPkgs = pkgs: [
# wineWowPackages.waylandFull
# wine64Packages.waylandFull
# wine64Packages.unstableFull
# wine64
# wine
# wine-wayland
# winetricks
# wineWowPackages.staging
# pixman
# libjpeg
# gnome.zenity
# ];
# extraLibraries = pkgs: [ jansson ];
# })
protonup-qt
# bottles
# flatpak
winetricks
ffmpeg_7
]); ]);
# services.flatpak.enable = true;
programs.firefox = { programs.firefox = {
enable = true; enable = true;
@ -343,6 +366,12 @@ in {
enable = true; enable = true;
}; };
programs.fish.shellAliases = {
vim = "nvim";
vi = "nvim";
v = "nvim";
};
# programs.nixvim = { # programs.nixvim = {
# enable = true; # enable = true;
# enableMan = false; # enableMan = false;

131
pkgs/aria2/default.nix Normal file
View file

@ -0,0 +1,131 @@
{
pkgs,
lib,
...
}: {
programs.aria2 = {
enable = true;
# settings = [
# ];
extraConfig = ''
### Basic ###
# The directory to store the downloaded file.
dir=/media/aria2/
# Downloads the URIs listed in FILE.
# input-file=/media/aria2/.tmp/aria2.session
# Save error/unfinished downloads to FILE on exit.
save-session=/media/aria2/.tmp/aria2.session
# Save error/unfinished downloads to a file specified by --save-session option every SEC seconds. If 0 is given, file will be saved only when aria2 exits. Default: 0
save-session-interval=0
# Set the maximum number of parallel downloads for every queue item. See also the --split option. Default: 5
max-concurrent-downloads=64
# Continue downloading a partially downloaded file.
continue=true
# Set max overall download speed in bytes/sec. 0 means unrestricted. Default: 0
max-overall-download-limit=0
# Set max download speed per each download in bytes/sec. 0 means unrestricted. Default: 0
max-download-limit=0
# Make aria2 quiet (no console output). Default: false
quiet=false
### Advanced ###
# Restart download from scratch if the corresponding control file doesn't exist. Default: false
allow-overwrite=true
# If false is given, aria2 aborts download when a piece length is different from one in a control file. If true is given, you can proceed but some download progress will be lost. Default: false
allow-piece-length-change=true
# Always resume download. If true is given, aria2 always tries to resume download and if resume is not possible, aborts download. If false is given, when all given URIs do not support resume or aria2 encounters N URIs which does not support resume, aria2 downloads file from scratch. Default: true
always-resume=true
# Enable asynchronous DNS. Default: true
async-dns=false
# Rename file name if the same file already exists. This option works only in HTTP(S)/FTP download. Default: true
auto-file-renaming=true
# Handle quoted string in Content-Disposition header as UTF-8 instead of ISO-8859-1, for example, the filename parameter, but not the extended version filename. Default: false
content-disposition-default-utf8=true
# Enable disk cache. If SIZE is 0, the disk cache is disabled. This feature caches the downloaded data in memory, which grows to at most SIZE bytes. SIZE can include K or M. Default: 16M
disk-cache=1024M
# Specify file allocation method. none doesn't pre-allocate file space. prealloc pre-allocates file space before download begins. This may take some time depending on the size of the file. If you are using newer file systems such as ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), falloc is your best choice. It allocates large(few GiB) files almost instantly. Don't use falloc with legacy file systems such as ext3 and FAT32 because it takes almost same time as prealloc and it blocks aria2 entirely until allocation finishes. falloc may not be available if your system doesn't have posix_fallocate(3) function. trunc uses ftruncate(2) system call or platform-specific counterpart to truncate a file to a specified length. Possible Values: none, prealloc, trunc, falloc. Default: prealloc
file-allocation=falloc
# No file allocation is made for files whose size is smaller than SIZE. Default: 5M
no-file-allocation-limit=5M
# Set log level to output to console. LEVEL is either debug, info, notice, warn or error. Default: notice
# console-log-level=notice
# Set log level to output. LEVEL is either debug, info, notice, warn or error. Default: debug
# log-level=debug
# The file name of the log file. If - is specified, log is written to stdout. If empty string("") is specified, or this option is omitted, no log is written to disk at all.
# log=
### RPC ###
# Enable JSON-RPC/XML-RPC server. Default: false
#enable-rpc=true
# Pause download after added. This option is effective only when --enable-rpc=true is given. Default: false
# pause=false
# Save the uploaded torrent or metalink meta data in the directory specified by --dir option. If false is given to this option, the downloads added will not be saved by --save-session option. Default: true
# rpc-save-upload-metadata=true
# Add Access-Control-Allow-Origin header field with value * to the RPC response. Default: false
#rpc-allow-origin-all=true
# Listen incoming JSON-RPC/XML-RPC requests on all network interfaces. If false is given, listen only on local loopback interface. Default: false
#rpc-listen-all=false
# Specify a port number for JSON-RPC/XML-RPC server to listen to. Possible Values: 1024 -65535 Default: 6800
# rpc-listen-port=50100
# Set RPC secret authorization token.
# rpc-secret=
# Use the certificate in FILE for RPC server. The certificate must be either in PKCS12 (.p12, .pfx) or in PEM format. When using PEM, you have to specify the private key via --rpc-private-key as well. Use --rpc-secure option to enable encryption.
# rpc-certificate=
# Use the private key in FILE for RPC server. The private key must be decrypted and in PEM format. Use --rpc-secure option to enable encryption.
# rpc-private-key=
# RPC transport will be encrypted by SSL/TLS. The RPC clients must use https scheme to access the server. For WebSocket client, use wss scheme. Use --rpc-certificate and --rpc-private-key options to specify the server certificate and private key.
# rpc-secure=false
### HTTP/FTP/SFTP ###
# The maximum number of connections to one server for each download. Default: 1
max-connection-per-server=16
# aria2 does not split less than 2*SIZE byte range. Possible Values: 1M -1024M. Default: 20M
min-split-size=1M
# Download a file using N connections. The number of connections to the same host is restricted by the --max-connection-per-server option. Default: 5
split=32
# Set user agent for HTTP(S) downloads. Default: aria2/$VERSION, $VERSION is replaced by package version.
user-agent=Transmission/2.77
### BitTorrent ###
# Save meta data as ".torrent" file. Default: false
# bt-save-metadata=false
# Set TCP port number for BitTorrent downloads. Multiple ports can be specified by using ',' and '-'. Default: 6881-6999
listen-port=50101-50109
# Set max overall upload speed in bytes/sec. 0 means unrestricted. Default: 0
# max-overall-upload-limit=256K
# Set max upload speed per each torrent in bytes/sec. 0 means unrestricted. Default: 0
# max-upload-limit=0
# Specify share ratio. Seed completed torrents until share ratio reaches RATIO. Specify 0.0 if you intend to do seeding regardless of share ratio. Default: 1.0
seed-ratio=0.1
# Specify seeding time in (fractional) minutes. Specifying --seed-time=0 disables seeding after download completed.
seed-time=0
# Enable Local Peer Discovery. If a private flag is set in a torrent, aria2 doesn't use this feature for that download even if true is given. Default: false
# bt-enable-lpd=false
# Enable IPv4 DHT functionality. It also enables UDP tracker support. If a private flag is set in a torrent, aria2 doesn't use DHT for that download even if true is given. Default: true
enable-dht=true
# Enable IPv6 DHT functionality. If a private flag is set in a torrent, aria2 doesn't use DHT for that download even if true is given.
enable-dht6=true
# Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Default: 6881-6999
dht-listen-port=50101-50109
# Set host and port as an entry point to IPv4 DHT network.
dht-entry-point=dht.transmissionbt.com:6881
# Set host and port as an entry point to IPv6 DHT network.
dht-entry-point6=dht.transmissionbt.com:6881
# Change the IPv4 DHT routing table file to PATH. Default: $HOME/.aria2/dht.dat if present, otherwise $XDG_CACHE_HOME/aria2/dht.dat.
dht-file-path=''${HOME}/.aria2/dht.dat
# Change the IPv6 DHT routing table file to PATH. Default: $HOME/.aria2/dht6.dat if present, otherwise $XDG_CACHE_HOME/aria2/dht6.dat.
dht-file-path6=''${HOME}/.aria2/dht6.dat
# Enable Peer Exchange extension. If a private flag is set in a torrent, this feature is disabled for that download even if true is given. Default: true
enable-peer-exchange=true
# Specify the prefix of peer ID. Default: A2-$MAJOR-$MINOR-$PATCH-. For instance, aria2 version 1.18.8 has prefix ID A2-1-18-8-.
peer-id-prefix=-TR2770-
# Specify the string used during the bitorrent extended handshake for the peers client version. Default: aria2/$MAJOR.$MINOR.$PATCH, $MAJOR, $MINOR and $PATCH are replaced by major, minor and patch version number respectively. For instance, aria2 version 1.18.8 has peer agent aria2/1.18.8.
peer-agent=Transmission/2.77
'';
};
}

View file

@ -8,7 +8,7 @@ font=FiraCode Nerd Font Mono Light:size=7
#box-drawings-uses-font-glyphs=true #box-drawings-uses-font-glyphs=true
dpi-aware=true dpi-aware=true
resize-delay-ms=10 resize-delay-ms=10
csd.preferred = none # csd.preferred = none
[tweak] [tweak]
max-shm-pool-size-mb=2048 max-shm-pool-size-mb=2048

View file

@ -1,4 +1,4 @@
{ lib, ... }: { lib, inputs, ... }:
{ {
networking.nameservers = lib.mkForce [ "127.0.0.1" ]; networking.nameservers = lib.mkForce [ "127.0.0.1" ];
@ -6,7 +6,7 @@
enable = true; enable = true;
settings = { settings = {
server = { server = {
interface = [ "127.0.0.1" ]; interface = [ "127.0.0.1" "::1" ];
do-ip6 = false; do-ip6 = false;
cache-max-ttl = 86400; cache-max-ttl = 86400;
cache-min-ttl = 1024; cache-min-ttl = 1024;
@ -38,6 +38,18 @@
}; };
forward-zone = [ forward-zone = [
{
name = "local.";
forward-addr = [ "100.92.15.128" ];
}
{
name = "${inputs.secrets.work.bank-domain}.";
forward-addr = [ "100.92.15.128" ];
}
{
name = "${inputs.secrets.work.short-domain}.";
forward-addr = [ "100.92.15.128" ];
}
{ {
name = "."; name = ".";
forward-addr = [ forward-addr = [

View file

@ -83,6 +83,8 @@
}; };
home.file.".config/hypr/env_var.conf".text = builtins.readFile ./env_var.conf; home.file.".config/hypr/env_var.conf".text = builtins.readFile ./env_var.conf;
home.file.".config/hypr/media-binds.conf".text = builtins.readFile ./media-binds.conf; home.file.".config/hypr/media-binds.conf".text = builtins.readFile ./media-binds.conf;
home.file.".config/hypr/hypridle.conf".text = builtins.readFile ./hypridle.conf;
}; };
} }

View file

@ -14,6 +14,7 @@
python-lsp-server python-lsp-server
flake8 flake8
])) ]))
code-minimap
]; ];
extraConfig = ./extraConfig/mycfg; extraConfig = ./extraConfig/mycfg;
hm-activation = true; hm-activation = true;

View file

@ -13,3 +13,10 @@ map("i", "jj", "<ESC>")
local preview = require('preview_line') local preview = require('preview_line')
vim.api.nvim_set_keymap('n', '<Leader>gg', ':lua require("preview_line").preview_line()<CR>', { noremap = true, silent = true }) vim.api.nvim_set_keymap('n', '<Leader>gg', ':lua require("preview_line").preview_line()<CR>', { noremap = true, silent = true })
vim.api.nvim_set_keymap('n', 'T', ':HopLineStartMW<CR>', {noremap = true, silent = true})
-- vim.api.nvim_set_keymap('n', '<Leader>q', ':HopLineStartMW<CR>', { noremap = true, silent = true })
vim.api.nvim_create_user_command('W', 'SudaWrite', {})
vim.api.nvim_create_user_command('R', 'SudaRead', {})
vim.api.nvim_create_user_command('wc', 'WhichKey', {})

View file

@ -94,4 +94,12 @@ return {
vim.cmd ("let g:minimap_auto_start_win_enter = 1") vim.cmd ("let g:minimap_auto_start_win_enter = 1")
end, end,
}, },
{
"lambdalisue/suda.vim",
lazy = false,
},
{
'jghauser/mkdir.nvim',
lazy = false,
},
} }

View file

@ -43,7 +43,9 @@ let
{ name = "socks-warp" ; script = "wireproxy -c /run/secrets/wproxy"; } # port 3333 { name = "socks-warp" ; script = "wireproxy -c /run/secrets/wproxy"; } # port 3333
{ name = "socks-novpn"; script = "gost -L socks5://192.168.150.2:3334"; } # port 3334 { name = "socks-novpn"; script = "gost -L socks5://192.168.150.2:3334"; } # port 3334
{ name = "opera-socks"; { name = "opera-socks";
script = "sing-box run -c ${opera-singboxcfg} & opera-proxy -bootstrap-dns https://1.1.1.1/dns-query -bind-address 192.168.150.2:18088"; # script = "sing-box run -c ${opera-singboxcfg} & opera-proxy -bootstrap-dns https://1.1.1.1/dns-query -bind-address 192.168.150.2:18088";
script = "gost -L=socks5://192.168.150.2:3335 -F=http://192.168.150.2:18088 opera-proxy -bootstrap-dns https://1.1.1.1/dns-query -bind-address 192.168.150.2:18088";
# script = "opera-proxy -bootstrap-dns https://1.1.1.1/dns-query -bind-address 192.168.150.2:18088";
autostart = false; autostart = false;
} # port 3335 } # port 3335
]; ];
@ -77,7 +79,7 @@ let
{ {
"type": "socks", "type": "socks",
"listen": "192.168.150.2", "listen": "192.168.150.2",
"listen_port": 3335, "listen_port": 3335
} }
], ],
"outbounds": [ "outbounds": [

View file

@ -1 +0,0 @@
config-offline.jsonc

1
pkgs/waybar/config.jsonc Executable file
View file

@ -0,0 +1 @@
config-offline.jsonc