mirror of
https://github.com/anotherhadi/nixy.git
synced 2026-05-20 21:32:33 +02:00
Compare commits
35 Commits
v5.0.0
..
5e9b5ad633
| Author | SHA1 | Date | |
|---|---|---|---|
| 5e9b5ad633 | |||
| 0452f40b25 | |||
| d71c9d8169 | |||
| e805c868a7 | |||
| 0fd0a73e92 | |||
| cd2896eb5d | |||
| 35b79af191 | |||
| 325cacc86f | |||
| 7862c970fd | |||
| 498ed902a2 | |||
| 3478a9a0a5 | |||
| f6d056deb3 | |||
| 795621ada6 | |||
| 31964cca35 | |||
| abcadd4eaf | |||
| 5945a72b01 | |||
| df6381db85 | |||
| 6ed60d7a13 | |||
| bcd4fa9839 | |||
| 143c5d2a34 | |||
| 4ed04ebf55 | |||
| 1a57874e68 | |||
| 2127ffbe31 | |||
| a76f81fa13 | |||
| f9d5c6ab00 | |||
| b51a78ac1c | |||
| 96b5d5e671 | |||
| a222958eea | |||
| c3f86c9831 | |||
| dc5c7dc915 | |||
| 3cbe2a1ab2 | |||
| a1ed4ebc4c | |||
| 80aa828ee5 | |||
| 28cdcb6dad | |||
| e620c5296f |
@@ -119,6 +119,8 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
|
|||||||
- [THEMES](docs/THEMES.md): How themes work and how to create your own
|
- [THEMES](docs/THEMES.md): How themes work and how to create your own
|
||||||
- [WALLPAPERS](https://github.com/anotherhadi/awesome-wallpapers): An awesome
|
- [WALLPAPERS](https://github.com/anotherhadi/awesome-wallpapers): An awesome
|
||||||
collection of wallpapers
|
collection of wallpapers
|
||||||
|
- [NEOVIM](docs/NEOVIM.md): How to use the Neovim config in your own flake
|
||||||
|
- [GROUPS](docs/GROUPS.md): Reusable package groups (dev, cybersecurity)
|
||||||
|
|
||||||
- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
|
- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
|
||||||
- [LICENSE](LICENSE): MIT License
|
- [LICENSE](LICENSE): MIT License
|
||||||
|
|||||||
@@ -129,6 +129,8 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
|
|||||||
- [THEMES](docs/THEMES.md): How themes work and how to create your own
|
- [THEMES](docs/THEMES.md): How themes work and how to create your own
|
||||||
- [WALLPAPERS](https://github.com/anotherhadi/awesome-wallpapers): An awesome
|
- [WALLPAPERS](https://github.com/anotherhadi/awesome-wallpapers): An awesome
|
||||||
collection of wallpapers
|
collection of wallpapers
|
||||||
|
- [NEOVIM](docs/NEOVIM.md): How to use the Neovim config in your own flake
|
||||||
|
- [GROUPS](docs/GROUPS.md): Reusable package groups (dev, cybersecurity)
|
||||||
|
|
||||||
- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
|
- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
|
||||||
- [LICENSE](LICENSE): MIT License
|
- [LICENSE](LICENSE): MIT License
|
||||||
|
|||||||
@@ -0,0 +1,44 @@
|
|||||||
|
# Groups
|
||||||
|
|
||||||
|
Groups are curated sets of packages exposed as flake outputs. Each group has two forms:
|
||||||
|
|
||||||
|
- **`homeManagerModules.<group>`** — full home-manager module (packages + files + systemd units)
|
||||||
|
- **`packages.<group>`** — standalone environment for `nix shell` (packages only)
|
||||||
|
|
||||||
|
## Available groups
|
||||||
|
|
||||||
|
- dev (go, bun, air, ...)
|
||||||
|
- cybersecurity (nmap, john, dirb, ffuf, ...)
|
||||||
|
|
||||||
|
For the Cybersecurity group, the home-manager module also sets up:
|
||||||
|
|
||||||
|
- `~/Cyber/wordlists/` with SecLists, fuzz4bounty, and hashcat rules
|
||||||
|
- `~/Cyber/tmp/` as a temporary workspace
|
||||||
|
|
||||||
|
## Use in another flake
|
||||||
|
|
||||||
|
Add this repo as an input:
|
||||||
|
|
||||||
|
```nix
|
||||||
|
inputs.nixy.url = "github:anotherhadi/nixy";
|
||||||
|
```
|
||||||
|
|
||||||
|
Import the home-manager module in your home configuration:
|
||||||
|
|
||||||
|
```nix
|
||||||
|
{ inputs, ... }: {
|
||||||
|
imports = [
|
||||||
|
inputs.nixy.homeManagerModules.cybersecurity
|
||||||
|
# inputs.nixy.homeManagerModules.dev
|
||||||
|
];
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Quick shell without installing
|
||||||
|
|
||||||
|
```sh
|
||||||
|
nix shell github:anotherhadi/nixy#cybersecurity
|
||||||
|
nix shell github:anotherhadi/nixy#dev
|
||||||
|
```
|
||||||
|
|
||||||
|
This drops you into a shell with all tools in `PATH`. No home-manager required, no wordlists or systemd units.
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
# Neovim
|
||||||
|
|
||||||
|
The Neovim configuration is built with [nvf](https://github.com/notashelf/nvf) and exposed as a standalone flake output.
|
||||||
|
It can be used in three ways: run it directly, import it into another flake's home-manager setup, or use it as part of this config.
|
||||||
|
|
||||||
|
## Run directly
|
||||||
|
|
||||||
|
No installation needed:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
nix run github:anotherhadi/nixy#nvim
|
||||||
|
```
|
||||||
|
|
||||||
|
## Use in another flake
|
||||||
|
|
||||||
|
Add this repo as an input:
|
||||||
|
|
||||||
|
```nix
|
||||||
|
inputs.nixy.url = "github:anotherhadi/nixy";
|
||||||
|
```
|
||||||
|
|
||||||
|
Then import the home-manager module in your home configuration:
|
||||||
|
|
||||||
|
```nix
|
||||||
|
{ inputs, ... }: {
|
||||||
|
imports = [ inputs.nixy.homeManagerModules.nvim ];
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## What's included
|
||||||
|
|
||||||
|
| File | Description |
|
||||||
|
| --------------- | ---------------------------------------------------------------------- |
|
||||||
|
| `options.nix` | Core settings: theme (catppuccin mocha), clipboard, indentation, folds |
|
||||||
|
| `languages.nix` | LSP, treesitter, formatters, diagnostics, and per-language config |
|
||||||
|
| `keymaps.nix` | All key mappings (leader: `space`) |
|
||||||
|
| `picker.nix` | Snacks picker + oil.nvim |
|
||||||
|
| `snacks.nix` | Snacks extras: image preview, zen mode, git signs, statuscolumn |
|
||||||
|
| `utils.nix` | Bufferline, lualine, copilot, lazygit, toggleterm, autocomplete |
|
||||||
|
| `mini.nix` | Mini.nvim suite: pairs, comment, icons, indentscope, diff, git |
|
||||||
Generated
+122
-87
@@ -20,11 +20,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775558810,
|
"lastModified": 1776702787,
|
||||||
"narHash": "sha256-fy95EdPnqQlpbP8+rk0yWKclWShCUS5VKs6P7/1MF2c=",
|
"narHash": "sha256-qc5uwEWbuubzYthmZcfCapooZGXhoYZWfTQ24TozbCQ=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "aquamarine",
|
"repo": "aquamarine",
|
||||||
"rev": "7371b669b22aa2af980f913fc312a786d2f1abb2",
|
"rev": "9a1ca6b8cb4d86a599787a55b78f2ddf809bf945",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -38,11 +38,11 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776107237,
|
"lastModified": 1777068949,
|
||||||
"narHash": "sha256-IKX4tDRbj0yzmuGukXeh4FDcESxQ/GHwtDkz9tuktEo=",
|
"narHash": "sha256-HwE/JZbPEka5y5dVlvpdrbOZB28tlWDbZhuA21GfyGc=",
|
||||||
"owner": "anotherhadi",
|
"owner": "anotherhadi",
|
||||||
"repo": "awesome-wallpapers",
|
"repo": "awesome-wallpapers",
|
||||||
"rev": "9cdea94e611b0a255d507dfd9781a24a3da27845",
|
"rev": "43c242ecb296e5b840c0ea70a695bf8c04835803",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -125,11 +125,11 @@
|
|||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775921702,
|
"lastModified": 1777484430,
|
||||||
"narHash": "sha256-H/r9IydVUA+89ZIqvNxmTB1z7DMNYrNcxuG+7s0oVQ8=",
|
"narHash": "sha256-dnUDj6zLNhFeXkUzzKdecF7jqHhayZ4Q9+WbXJW+dnY=",
|
||||||
"owner": "anotherhadi",
|
"owner": "anotherhadi",
|
||||||
"repo": "blog",
|
"repo": "blog",
|
||||||
"rev": "163471bc2f0f18e001bcef9db18900d70b4ef637",
|
"rev": "35ac328d5ed6f701c102ab6729aa842705208e6c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -243,11 +243,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776578469,
|
"lastModified": 1777086360,
|
||||||
"narHash": "sha256-e1OBCHKW7xubcV1fwkTPe4p1rsLM+QnuhwgPf4LmGVA=",
|
"narHash": "sha256-p9MtXOdKHXMZ3CCmvqMF6RcJ+0Uj05YsokylBVaucsI=",
|
||||||
"owner": "caelestia-dots",
|
"owner": "caelestia-dots",
|
||||||
"repo": "cli",
|
"repo": "cli",
|
||||||
"rev": "463f36544a25bc5b0a99317a32e8d3814eb2f66b",
|
"rev": "eddee4deca7cab1a72e07e02d7d2eb84feaaa94d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -292,11 +292,11 @@
|
|||||||
"quickshell": "quickshell"
|
"quickshell": "quickshell"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775801889,
|
"lastModified": 1776670101,
|
||||||
"narHash": "sha256-q1LGwhQbNOurIAClh5YwKVU2kJ5lTCxRYZf48bAb9IM=",
|
"narHash": "sha256-VmPWtG6H+k2tgGnpYwNO5YueHOBdOXXTiBTrjXqcHag=",
|
||||||
"owner": "caelestia-dots",
|
"owner": "caelestia-dots",
|
||||||
"repo": "shell",
|
"repo": "shell",
|
||||||
"rev": "0e07176ff149d02391531c802b51c28e73185f30",
|
"rev": "b94ee8d41bad1ea59395d6184425036fa7121bc5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -314,11 +314,11 @@
|
|||||||
"quickshell": "quickshell_2"
|
"quickshell": "quickshell_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776610813,
|
"lastModified": 1776670101,
|
||||||
"narHash": "sha256-izquCGM5xB4rxvvtRQsgvX483TuWrd5RwkXPcVwUTl0=",
|
"narHash": "sha256-VmPWtG6H+k2tgGnpYwNO5YueHOBdOXXTiBTrjXqcHag=",
|
||||||
"owner": "caelestia-dots",
|
"owner": "caelestia-dots",
|
||||||
"repo": "shell",
|
"repo": "shell",
|
||||||
"rev": "f77ba920ead8b8e82753c1f66ad417cc734631a3",
|
"rev": "b94ee8d41bad1ea59395d6184425036fa7121bc5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -570,11 +570,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776562531,
|
"lastModified": 1777086106,
|
||||||
"narHash": "sha256-Lh5Ns9DI67E+lSMOCGK0S+mFPy0mz0yOGiJTUXiR9JI=",
|
"narHash": "sha256-hlNpIN18pw3xo34Lsrp6vAMUPn0aB/zFBqL0QXI1Pmk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "5b56ad02dc643808b8af6d5f3ff179e2ce9593f4",
|
"rev": "5826802354a74af18540aef0b01bc1320f82cc17",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -599,11 +599,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772461003,
|
"lastModified": 1776511930,
|
||||||
"narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=",
|
"narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprcursor",
|
"repo": "hyprcursor",
|
||||||
"rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7",
|
"rev": "39435900785d0c560c6ae8777d29f28617d031ef",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -628,11 +628,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775496928,
|
"lastModified": 1776426399,
|
||||||
"narHash": "sha256-Ds759WU03mGWtu3I43J+5GF5Ni8TvF+GYQUFD+fVeMo=",
|
"narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprgraphics",
|
"repo": "hyprgraphics",
|
||||||
"rev": "cf95d93d17baa18f1d9b016b3afe27f820521a6e",
|
"rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -658,11 +658,11 @@
|
|||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776514109,
|
"lastModified": 1777040476,
|
||||||
"narHash": "sha256-WkUvIWPUrZxR4oSCiExhuMFCjFMQ0cRnZk9e0+ZqhC0=",
|
"narHash": "sha256-bdlbn9MZcfKcK9qTyQzismEwaZHqLlG/6JLYOGdVBh4=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "889ee4f26d77ff0c36f5c4767ef0629371fd2c18",
|
"rev": "e3c9b64812042ade8bec47499f461f2c7d36c184",
|
||||||
"revCount": 7163,
|
"revCount": 7172,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland"
|
"url": "https://github.com/hyprwm/Hyprland"
|
||||||
@@ -706,11 +706,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774710575,
|
"lastModified": 1776426575,
|
||||||
"narHash": "sha256-p7Rcw13+gA4Z9EI3oGYe3neQ3FqyOOfZCleBTfhJ95Q=",
|
"narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprland-guiutils",
|
"repo": "hyprland-guiutils",
|
||||||
"rev": "0703df899520001209646246bef63358c9881e36",
|
"rev": "a968d211048e3ed538e47b84cb3649299578f19d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -760,11 +760,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772459629,
|
"lastModified": 1776426736,
|
||||||
"narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=",
|
"narHash": "sha256-rl7i4aY+9p8LysJp7o8uRWahCkpFznCgGHXszlTw7b0=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprlang",
|
"repo": "hyprlang",
|
||||||
"rev": "7615ee388de18239a4ab1400946f3d0e498a8186",
|
"rev": "7833ff33b2e82d3406337b5dcf0d1cec595d83e9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -837,11 +837,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774911391,
|
"lastModified": 1776428866,
|
||||||
"narHash": "sha256-c4YVwO33Mmw+FIV8E0u3atJZagHvGTJ9Jai6RtiB8rE=",
|
"narHash": "sha256-XfRlBolGtjvalTHJp3XvvpYLBjkMhaZLLU0WqZ91Fcg=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprutils",
|
"repo": "hyprutils",
|
||||||
"rev": "e6caa3d4d1427eedbdf556cf4ceb70f2d9c0b56d",
|
"rev": "eedd60805cd96d4442586f2ba5fe51d549b12674",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -862,11 +862,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772459835,
|
"lastModified": 1776430932,
|
||||||
"narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=",
|
"narHash": "sha256-Yv3RPiUvl7CAsJgwIVsqcj7akn1gLyJP1F/mocof5hA=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprwayland-scanner",
|
"repo": "hyprwayland-scanner",
|
||||||
"rev": "0a692d4a645165eebd65f109146b8861e3a925e7",
|
"rev": "4c2fcc06dc9722c97dbb54ba649c69b18ce83d2e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -891,11 +891,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775414057,
|
"lastModified": 1776728575,
|
||||||
"narHash": "sha256-mDpHnf+MkdOxEqIM1TnckYYh9p1SXR8B3KQfNZ12M8s=",
|
"narHash": "sha256-z9eGphrArEBpl1O/GCH0wlY6z4K9vA6yWh2gAS6qytU=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprwire",
|
"repo": "hyprwire",
|
||||||
"rev": "86012ee01b0fdd8bf3101ef38816f2efbee42490",
|
"rev": "f3a80888783702a39691b684d099e16b83ed4702",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1007,11 +1007,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768214250,
|
"lastModified": 1776882296,
|
||||||
"narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=",
|
"narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=",
|
||||||
"owner": "feel-co",
|
"owner": "feel-co",
|
||||||
"repo": "ndg",
|
"repo": "ndg",
|
||||||
"rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8",
|
"rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1028,11 +1028,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776575850,
|
"lastModified": 1776829403,
|
||||||
"narHash": "sha256-28Gqz0GDpGsBv8GtAn2dywEQRr+CtTDsD5J7VD6icBE=",
|
"narHash": "sha256-oHVcvP2Ahhj1KUsEzp+2BQF55/r5VSa3QxdPdwE1p00=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "3b9653a107c736222b5ae0d4036dd3b885219065",
|
"rev": "c43246d4e9e506178b69baed075d797ec2d873e2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1063,11 +1063,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775490113,
|
"lastModified": 1776983936,
|
||||||
"narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
|
"narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
|
"rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1155,11 +1155,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776434932,
|
"lastModified": 1776734388,
|
||||||
"narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=",
|
"narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c7f47036d3df2add644c46d712d14262b7d86c0c",
|
"rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1201,13 +1201,29 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_12": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774106199,
|
"lastModified": 1777268161,
|
||||||
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
|
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
|
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1776548001,
|
||||||
|
"narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1251,11 +1267,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775423009,
|
"lastModified": 1776548001,
|
||||||
"narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
|
"narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
|
"rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1299,11 +1315,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_8": {
|
"nixpkgs_8": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776169885,
|
"lastModified": 1776877367,
|
||||||
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
|
"narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
|
"rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1385,11 +1401,11 @@
|
|||||||
"systems": "systems_6"
|
"systems": "systems_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776614090,
|
"lastModified": 1777062815,
|
||||||
"narHash": "sha256-zLlv5QgRgsfxoETBNIb9BhUFMtsYkLDZAIdmchG77Xo=",
|
"narHash": "sha256-RWwgP/R2nIcyOTPYJdApqvj/dVc4+n/4kOCNlRnfb7U=",
|
||||||
"owner": "notashelf",
|
"owner": "notashelf",
|
||||||
"repo": "nvf",
|
"repo": "nvf",
|
||||||
"rev": "c7c90abadb6f714df24b16120e9c57817b62a0cb",
|
"rev": "41394699260ffc533a688d0ca5b8888bd5e64233",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1408,11 +1424,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775036584,
|
"lastModified": 1776796298,
|
||||||
"narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=",
|
"narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735",
|
"rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1483,7 +1499,8 @@
|
|||||||
"nvf": "nvf",
|
"nvf": "nvf",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"spicetify-nix": "spicetify-nix",
|
"spicetify-nix": "spicetify-nix",
|
||||||
"stylix": "stylix"
|
"stylix": "stylix",
|
||||||
|
"usbguard-tui": "usbguard-tui"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sops-nix": {
|
"sops-nix": {
|
||||||
@@ -1491,11 +1508,11 @@
|
|||||||
"nixpkgs": "nixpkgs_10"
|
"nixpkgs": "nixpkgs_10"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776119890,
|
"lastModified": 1776771786,
|
||||||
"narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=",
|
"narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd",
|
"rev": "bef289e2248991f7afeb95965c82fbcd8ff72598",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1512,11 +1529,11 @@
|
|||||||
"systems": "systems_7"
|
"systems": "systems_7"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776578704,
|
"lastModified": 1777043003,
|
||||||
"narHash": "sha256-4+JHYCweZ/SSrMcu2nJ5gc7gop2scBk0JIIfaUKuTaQ=",
|
"narHash": "sha256-lEKiNXDssCjM5bM6v1rltaYRsBRrXrozD4ryctlnZo0=",
|
||||||
"owner": "Gerg-L",
|
"owner": "Gerg-L",
|
||||||
"repo": "spicetify-nix",
|
"repo": "spicetify-nix",
|
||||||
"rev": "73f6d24b4f5bdacc3b41ddcf9965bef2781f97dd",
|
"rev": "8486e82fd1b2bab54868139ac2263de54c9c85c7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1543,11 +1560,11 @@
|
|||||||
"tinted-zed": "tinted-zed"
|
"tinted-zed": "tinted-zed"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776170745,
|
"lastModified": 1776893932,
|
||||||
"narHash": "sha256-Tl1aZVP5EIlT+k0+iAKH018GLHJpLz3hhJ0LNQOWxCc=",
|
"narHash": "sha256-AFD5cf9eNqXq1brHS63xeZy2xKZMgG9J86XJ9I2eLn8=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "e3861617645a43c9bbefde1aa6ac54dd0a44bfa9",
|
"rev": "84971726c7ef0bb3669a5443e151cc226e65c518",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1827,6 +1844,24 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"usbguard-tui": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs_12"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1777931773,
|
||||||
|
"narHash": "sha256-Vvv2c/f9eTrk1XKJQpygwznw1jjazDxyKu5xzRSJK2U=",
|
||||||
|
"owner": "anotherhadi",
|
||||||
|
"repo": "usbguard-tui",
|
||||||
|
"rev": "8c250389b33f1f6676a1ae657b052e1885f856b2",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "anotherhadi",
|
||||||
|
"repo": "usbguard-tui",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"vpnconfinement": {
|
"vpnconfinement": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765634578,
|
"lastModified": 1765634578,
|
||||||
@@ -1891,11 +1926,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773601989,
|
"lastModified": 1776608502,
|
||||||
"narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=",
|
"narHash": "sha256-UH8YoQxx4hFOm6qjMdjRQNRvSejFIR/wBZ8fW1p9sME=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
"rev": "a9b862d1aa000a676d310cc62d249f7ad726233d",
|
"rev": "4a293523d36dfa367e67ec304cc718ea66a8fec2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
sops-nix.url = "github:Mic92/sops-nix";
|
sops-nix.url = "github:Mic92/sops-nix";
|
||||||
nvf.url = "github:notashelf/nvf";
|
nvf.url = "github:notashelf/nvf";
|
||||||
bun2nix.url = "github:nix-community/bun2nix";
|
bun2nix.url = "github:nix-community/bun2nix";
|
||||||
|
usbguard-tui.url = "github:anotherhadi/usbguard-tui";
|
||||||
|
|
||||||
nix-index-database = {
|
nix-index-database = {
|
||||||
url = "github:nix-community/nix-index-database";
|
url = "github:nix-community/nix-index-database";
|
||||||
@@ -43,42 +44,38 @@
|
|||||||
blog.url = "github:anotherhadi/blog";
|
blog.url = "github:anotherhadi/blog";
|
||||||
awesome-wallpapers.url = "github:anotherhadi/awesome-wallpapers";
|
awesome-wallpapers.url = "github:anotherhadi/awesome-wallpapers";
|
||||||
iknowyou.url = "github:anotherhadi/iknowyou";
|
iknowyou.url = "github:anotherhadi/iknowyou";
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs @ {nixpkgs, ...}: {
|
outputs = inputs @ {
|
||||||
nixosConfigurations = {
|
nixpkgs,
|
||||||
h-laptop =
|
nixpkgs-stable,
|
||||||
# CHANGEME: This should match the 'hostname' in your variables.nix file
|
...
|
||||||
nixpkgs.lib.nixosSystem {
|
}: let
|
||||||
modules = [
|
system = "x86_64-linux";
|
||||||
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
|
args = {
|
||||||
|
inherit
|
||||||
|
inputs
|
||||||
|
nixpkgs
|
||||||
|
system
|
||||||
|
pkgs
|
||||||
|
;
|
||||||
|
pkgs-stable = nixpkgs-stable.legacyPackages.${system};
|
||||||
|
};
|
||||||
|
merge = nixpkgs.lib.foldl nixpkgs.lib.recursiveUpdate {};
|
||||||
|
in
|
||||||
|
merge [
|
||||||
|
(import ./home/programs/nvf/flake.nix args)
|
||||||
|
(import ./home/programs/group/flake.nix args)
|
||||||
|
(import ./home/programs/nixy/flake.nix args)
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [];
|
formatter.${system} = pkgs.alejandra;
|
||||||
_module.args = {
|
nixosConfigurations = {
|
||||||
inherit inputs;
|
h-laptop = import ./hosts/laptop/flake.nix args;
|
||||||
|
h-work = import ./hosts/work/flake.nix args;
|
||||||
|
jack = import ./hosts/server/flake.nix args;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME: check https://github.com/NixOS/nixos-hardware
|
|
||||||
inputs.home-manager.nixosModules.home-manager
|
|
||||||
inputs.stylix.nixosModules.stylix
|
|
||||||
inputs.nix-index-database.nixosModules.default
|
|
||||||
./hosts/laptop/configuration.nix # CHANGEME: change the path to match your host folder
|
|
||||||
];
|
];
|
||||||
};
|
|
||||||
|
|
||||||
# Jack is my server
|
|
||||||
jack = nixpkgs.lib.nixosSystem {
|
|
||||||
modules = [
|
|
||||||
{_module.args = {inherit inputs;};}
|
|
||||||
inputs.home-manager.nixosModules.home-manager
|
|
||||||
inputs.stylix.nixosModules.stylix
|
|
||||||
inputs.sops-nix.nixosModules.sops
|
|
||||||
inputs.nixarr.nixosModules.default
|
|
||||||
# inputs.eleakxir.nixosModules.eleakxir
|
|
||||||
inputs.nix-index-database.nixosModules.default
|
|
||||||
inputs.default-creds.nixosModules.default
|
|
||||||
./hosts/server/configuration.nix
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,8 +63,14 @@
|
|||||||
exec = "brave --incognito";
|
exec = "brave --incognito";
|
||||||
icon = "brave-browser";
|
icon = "brave-browser";
|
||||||
terminal = false;
|
terminal = false;
|
||||||
categories = ["Network" "WebBrowser"];
|
categories = [
|
||||||
mimeType = ["text/html" "text/xml"];
|
"Network"
|
||||||
|
"WebBrowser"
|
||||||
|
];
|
||||||
|
mimeType = [
|
||||||
|
"text/html"
|
||||||
|
"text/xml"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
brave-tor = {
|
brave-tor = {
|
||||||
name = "Brave (Private window w/Tor)";
|
name = "Brave (Private window w/Tor)";
|
||||||
@@ -72,7 +78,10 @@
|
|||||||
exec = "brave --tor";
|
exec = "brave --tor";
|
||||||
icon = "brave-browser";
|
icon = "brave-browser";
|
||||||
terminal = false;
|
terminal = false;
|
||||||
categories = ["Network" "WebBrowser"];
|
categories = [
|
||||||
|
"Network"
|
||||||
|
"WebBrowser"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,10 +44,8 @@ in {
|
|||||||
st = "status";
|
st = "status";
|
||||||
br = "branch";
|
br = "branch";
|
||||||
df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
|
df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
|
||||||
hist = ''
|
hist = ''log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
|
||||||
log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
|
llog = ''log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
|
||||||
llog = ''
|
|
||||||
log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
|
|
||||||
edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
|
edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -21,7 +21,10 @@ in {
|
|||||||
};
|
};
|
||||||
gui = {
|
gui = {
|
||||||
theme = {
|
theme = {
|
||||||
activeBorderColor = [accent "bold"];
|
activeBorderColor = [
|
||||||
|
accent
|
||||||
|
"bold"
|
||||||
|
];
|
||||||
inactiveBorderColor = [muted];
|
inactiveBorderColor = [muted];
|
||||||
};
|
};
|
||||||
showListFooter = false;
|
showListFooter = false;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
pkgs-stable,
|
pkgs-stable,
|
||||||
inputs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
home.packages = with pkgs-stable; [
|
home.packages = with pkgs-stable; [
|
||||||
@@ -8,12 +8,23 @@
|
|||||||
nmap
|
nmap
|
||||||
john
|
john
|
||||||
hashcat
|
hashcat
|
||||||
|
metasploit
|
||||||
|
haiti
|
||||||
|
hydra
|
||||||
|
dnsrecon
|
||||||
|
whois
|
||||||
|
dig
|
||||||
|
nosqli
|
||||||
|
jwt-cli
|
||||||
|
nuclei
|
||||||
|
|
||||||
# Web
|
# Web
|
||||||
caido
|
caido
|
||||||
nuclei
|
nuclei
|
||||||
gobuster
|
gobuster
|
||||||
dirb
|
dirb
|
||||||
|
ffuf
|
||||||
|
sqlmap
|
||||||
|
|
||||||
# Utils
|
# Utils
|
||||||
inetutils
|
inetutils
|
||||||
@@ -22,4 +33,45 @@
|
|||||||
mariadb
|
mariadb
|
||||||
redis
|
redis
|
||||||
];
|
];
|
||||||
|
|
||||||
|
systemd.user.tmpfiles.rules = [
|
||||||
|
"d %h/Cyber/tmp 0755 - - -"
|
||||||
|
"d %h/Cyber/wordlists 0755 - - -"
|
||||||
|
"d %h/Cyber/wordlists/rules 0755 - - -"
|
||||||
|
];
|
||||||
|
|
||||||
|
home.file = {
|
||||||
|
"Cyber/wordlists/seclists" = {
|
||||||
|
source = pkgs.fetchFromGitHub {
|
||||||
|
owner = "danielmiessler";
|
||||||
|
repo = "SecLists";
|
||||||
|
rev = "47aa98053fce8670c6489e4f6fb57dc34881d8bd";
|
||||||
|
hash = "sha256-ojXLB/TXap1Qi0MtV5/WJlJpjNIDYx/sLY2KHm0uFKI=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
"Cyber/wordlists/fuzz4bounty" = {
|
||||||
|
source = pkgs.fetchFromGitHub {
|
||||||
|
owner = "0xPugal";
|
||||||
|
repo = "fuzz4bounty";
|
||||||
|
rev = "a805f6b434033f054312da0ddc2bc3021cc9a3b0";
|
||||||
|
hash = "sha256-wMhx1CcxIyw2E7gJXQxXAFc7m5nYt0FXNkoTZqFMQh4=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# RULES
|
||||||
|
"Cyber/wordlists/rules/oneruletorulethemstill".source = pkgs.fetchFromGitHub {
|
||||||
|
owner = "stealthsploit";
|
||||||
|
repo = "oneruletorulethemstill";
|
||||||
|
rev = "4bfb7322e189305b5f35bb7fcd4e9cc233c3d3c6";
|
||||||
|
hash = "sha256-h7MeymIXS/6wlPRt4lzsIEqOOssP0lDx9nQip65cwZw=";
|
||||||
|
};
|
||||||
|
|
||||||
|
"Cyber/wordlists/rules/best64.rule" = {
|
||||||
|
source = pkgs.fetchurl {
|
||||||
|
url = "https://raw.githubusercontent.com/CarlosLannister/OwadeReborn/refs/heads/master/owade/fileAnalyze/hashcatLib/best64.rule%7E";
|
||||||
|
hash = "sha256-T0XkMHJZQiy63/j25nGTkaiDFjc+blmgEVGTAFgVylU=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,12 +10,12 @@
|
|||||||
go
|
go
|
||||||
bun
|
bun
|
||||||
nodejs
|
nodejs
|
||||||
air
|
|
||||||
duckdb
|
|
||||||
claude-code
|
claude-code
|
||||||
inputs.bun2nix.packages.${stdenv.hostPlatform.system}.default
|
inputs.bun2nix.packages.${stdenv.hostPlatform.system}.default
|
||||||
])
|
])
|
||||||
++ (with pkgs-stable; [
|
++ (with pkgs-stable; [
|
||||||
|
air
|
||||||
|
duckdb
|
||||||
docker
|
docker
|
||||||
python3
|
python3
|
||||||
jq
|
jq
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
{
|
||||||
|
inputs,
|
||||||
|
pkgs,
|
||||||
|
pkgs-stable,
|
||||||
|
system,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
packages.${system} = {
|
||||||
|
dev = pkgs.buildEnv {
|
||||||
|
name = "dev-tools";
|
||||||
|
paths =
|
||||||
|
(with pkgs; [
|
||||||
|
go
|
||||||
|
bun
|
||||||
|
nodejs
|
||||||
|
air
|
||||||
|
duckdb
|
||||||
|
claude-code
|
||||||
|
inputs.bun2nix.packages.${system}.default
|
||||||
|
])
|
||||||
|
++ (with pkgs-stable; [
|
||||||
|
docker
|
||||||
|
python3
|
||||||
|
jq
|
||||||
|
just
|
||||||
|
]);
|
||||||
|
};
|
||||||
|
|
||||||
|
cybersecurity = pkgs.buildEnv {
|
||||||
|
name = "cybersecurity-tools";
|
||||||
|
paths = with pkgs-stable; [
|
||||||
|
wireshark
|
||||||
|
nmap
|
||||||
|
john
|
||||||
|
hashcat
|
||||||
|
metasploit
|
||||||
|
haiti
|
||||||
|
hydra
|
||||||
|
dnsrecon
|
||||||
|
whois
|
||||||
|
dig
|
||||||
|
nosqli
|
||||||
|
jwt-cli
|
||||||
|
nuclei
|
||||||
|
caido
|
||||||
|
gobuster
|
||||||
|
dirb
|
||||||
|
ffuf
|
||||||
|
sqlmap
|
||||||
|
inetutils
|
||||||
|
samba
|
||||||
|
openvpn
|
||||||
|
mariadb
|
||||||
|
redis
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
homeManagerModules = {
|
||||||
|
dev = {
|
||||||
|
_module.args.pkgs-stable = pkgs-stable;
|
||||||
|
imports = [./dev.nix];
|
||||||
|
};
|
||||||
|
cybersecurity = {
|
||||||
|
_module.args.pkgs-stable = pkgs-stable;
|
||||||
|
imports = [./cybersecurity.nix];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,9 +1,14 @@
|
|||||||
{pkgs-stable, ...}: {
|
{
|
||||||
|
pkgs-stable,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
home.packages = with pkgs-stable; [
|
home.packages = with pkgs-stable; [
|
||||||
peaclock
|
peaclock
|
||||||
cbonsai
|
cbonsai
|
||||||
pipes
|
pipes
|
||||||
cmatrix
|
cmatrix
|
||||||
fastfetch
|
fastfetch
|
||||||
|
inputs.usbguard-tui.packages.${system}.default
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,76 +6,26 @@
|
|||||||
#- - `nixy rebuild` - Rebuild the system.
|
#- - `nixy rebuild` - Rebuild the system.
|
||||||
#- - `nixy ...` - ... see the script for more commands.
|
#- - `nixy ...` - ... see the script for more commands.
|
||||||
{
|
{
|
||||||
pkgs,
|
|
||||||
config,
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: {
|
||||||
inherit (config.var) configDirectory;
|
options.programs.nixy = {
|
||||||
|
enable = lib.mkEnableOption "nixy";
|
||||||
|
configDirectory = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "$HOME/.config/nixos";
|
||||||
|
description = "Path to the NixOS configuration directory";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
nixy =
|
config = lib.mkIf config.programs.nixy.enable {
|
||||||
pkgs.writeShellScriptBin "nixy"
|
home.packages = [
|
||||||
# bash
|
(import ./package.nix {
|
||||||
''
|
inherit pkgs;
|
||||||
EXTRA_ARGS="''${@:2}"
|
inherit (config.programs.nixy) configDirectory;
|
||||||
|
})
|
||||||
function exec() {
|
];
|
||||||
$@
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function ui(){
|
|
||||||
DEFAULT_ICON=""
|
|
||||||
|
|
||||||
# "icon;name;command"[]
|
|
||||||
apps=(
|
|
||||||
";Rebuild;nixy rebuild"
|
|
||||||
";Test;nixy test"
|
|
||||||
";Update;nixy update"
|
|
||||||
";Collect Garbage;nixy gc"
|
|
||||||
";Clean Boot Menu;nixy cb"
|
|
||||||
";List generation;nixy listgen"
|
|
||||||
)
|
|
||||||
|
|
||||||
# Apply default icons if empty:
|
|
||||||
for i in "''${!apps[@]}"; do
|
|
||||||
apps[i]=$(echo "''${apps[i]}" | sed 's/^;/'$DEFAULT_ICON';/')
|
|
||||||
done
|
|
||||||
|
|
||||||
fzf_result=$(printf "%s\n" "''${apps[@]}" | awk -F ';' '{print $1" "$2}' | fzf)
|
|
||||||
[[ -z $fzf_result ]] && exit 0
|
|
||||||
fzf_result=''${fzf_result/ /;}
|
|
||||||
line=$(printf "%s\n" "''${apps[@]}" | grep "$fzf_result")
|
|
||||||
command=$(echo "$line" | sed 's/^[^;]*;//;s/^[^;]*;//')
|
|
||||||
|
|
||||||
exec "$command"
|
|
||||||
exit $?
|
|
||||||
}
|
|
||||||
|
|
||||||
[[ $1 == "" ]] && ui
|
|
||||||
|
|
||||||
if [[ $1 == "rebuild" ]];then
|
|
||||||
cd ${configDirectory} && git add . && sudo nixos-rebuild switch --flake . $EXTRA_ARGS
|
|
||||||
elif [[ $1 == "test" ]];then
|
|
||||||
cd ${configDirectory} && git add . && sudo nixos-rebuild test --flake . $EXTRA_ARGS
|
|
||||||
elif [[ $1 == "update" ]];then
|
|
||||||
cd ${configDirectory} && nix flake update $EXTRA_ARGS
|
|
||||||
elif [[ $1 == "gc" ]];then
|
|
||||||
echo "Starting Nix garbage collection..."
|
|
||||||
cd ${configDirectory} && \
|
|
||||||
echo "Cleaning up system garbage..." && \
|
|
||||||
sudo nix-collect-garbage -d && \
|
|
||||||
echo "Cleaning up user garbage..." && \
|
|
||||||
nix-collect-garbage -d && \
|
|
||||||
echo "Collecting garbage from Nix store..." && \
|
|
||||||
nix-store --gc && \
|
|
||||||
echo "Optimizing Nix store..." && \
|
|
||||||
nix-store --optimise
|
|
||||||
echo "Nix garbage collection complete."
|
|
||||||
elif [[ $1 == "cb" ]];then
|
|
||||||
sudo /run/current-system/bin/switch-to-configuration boot
|
|
||||||
elif [[ $1 == "listgen" ]];then
|
|
||||||
sudo nix-env -p /nix/var/nix/profiles/system --list-generations
|
|
||||||
else
|
|
||||||
echo "Unknown argument"
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
in {home.packages = [nixy];}
|
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
system,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
packages.${system}.nixy = import ./package.nix {
|
||||||
|
inherit pkgs;
|
||||||
|
configDirectory = "$HOME/.config/nixos";
|
||||||
|
};
|
||||||
|
|
||||||
|
homeManagerModules.nixy = {
|
||||||
|
imports = [./default.nix];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
configDirectory,
|
||||||
|
}:
|
||||||
|
pkgs.writeShellScriptBin "nixy"
|
||||||
|
# bash
|
||||||
|
''
|
||||||
|
EXTRA_ARGS="''${@:2}"
|
||||||
|
|
||||||
|
function exec() {
|
||||||
|
$@
|
||||||
|
}
|
||||||
|
|
||||||
|
function ui(){
|
||||||
|
DEFAULT_ICON=""
|
||||||
|
|
||||||
|
# "icon;name;command"[]
|
||||||
|
apps=(
|
||||||
|
";Rebuild;nixy rebuild"
|
||||||
|
";Test;nixy test"
|
||||||
|
";Update;nixy update"
|
||||||
|
";Collect Garbage;nixy gc"
|
||||||
|
";Clean Boot Menu;nixy cb"
|
||||||
|
";List generation;nixy listgen"
|
||||||
|
)
|
||||||
|
|
||||||
|
# Apply default icons if empty:
|
||||||
|
for i in "''${!apps[@]}"; do
|
||||||
|
apps[i]=$(echo "''${apps[i]}" | sed 's/^;/'$DEFAULT_ICON';/')
|
||||||
|
done
|
||||||
|
|
||||||
|
fzf_result=$(printf "%s\n" "''${apps[@]}" | awk -F ';' '{print $1" "$2}' | fzf)
|
||||||
|
[[ -z $fzf_result ]] && exit 0
|
||||||
|
fzf_result=''${fzf_result/ /;}
|
||||||
|
line=$(printf "%s\n" "''${apps[@]}" | grep "$fzf_result")
|
||||||
|
command=$(echo "$line" | sed 's/^[^;]*;//;s/^[^;]*;//')
|
||||||
|
|
||||||
|
exec "$command"
|
||||||
|
exit $?
|
||||||
|
}
|
||||||
|
|
||||||
|
[[ $1 == "" ]] && ui
|
||||||
|
|
||||||
|
if [[ $1 == "rebuild" ]];then
|
||||||
|
cd ${configDirectory} && git add . && sudo nixos-rebuild switch --flake . $EXTRA_ARGS
|
||||||
|
elif [[ $1 == "test" ]];then
|
||||||
|
cd ${configDirectory} && git add . && sudo nixos-rebuild test --flake . $EXTRA_ARGS
|
||||||
|
elif [[ $1 == "update" ]];then
|
||||||
|
cd ${configDirectory} && nix flake update $EXTRA_ARGS
|
||||||
|
elif [[ $1 == "gc" ]];then
|
||||||
|
echo "Starting Nix garbage collection..."
|
||||||
|
cd ${configDirectory} && \
|
||||||
|
echo "Cleaning up system garbage..." && \
|
||||||
|
sudo nix-collect-garbage -d && \
|
||||||
|
echo "Cleaning up user garbage..." && \
|
||||||
|
nix-collect-garbage -d && \
|
||||||
|
echo "Collecting garbage from Nix store..." && \
|
||||||
|
nix-store --gc && \
|
||||||
|
echo "Optimizing Nix store..." && \
|
||||||
|
nix-store --optimise
|
||||||
|
echo "Nix garbage collection complete."
|
||||||
|
elif [[ $1 == "cb" ]];then
|
||||||
|
sudo /run/current-system/bin/switch-to-configuration boot
|
||||||
|
elif [[ $1 == "listgen" ]];then
|
||||||
|
sudo nix-env -p /nix/var/nix/profiles/system --list-generations
|
||||||
|
else
|
||||||
|
echo "Unknown argument"
|
||||||
|
fi
|
||||||
|
''
|
||||||
@@ -1,11 +1,22 @@
|
|||||||
# NVF is a Neovim configuration that provides a minimal setup with essential plugins and configurations.
|
|
||||||
{
|
{
|
||||||
inputs,
|
inputs,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
|
imports = [inputs.nvf.homeManagerModules.default];
|
||||||
|
# Packages needed by snacks image preview
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
imagemagick
|
||||||
|
tree-sitter
|
||||||
|
ghostscript
|
||||||
|
tectonic
|
||||||
|
mermaid-cli
|
||||||
|
];
|
||||||
|
|
||||||
|
programs.nvf = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
imports = [
|
imports = [
|
||||||
inputs.nvf.homeManagerModules.default
|
|
||||||
./options.nix
|
./options.nix
|
||||||
./languages.nix
|
./languages.nix
|
||||||
./picker.nix
|
./picker.nix
|
||||||
@@ -14,8 +25,6 @@
|
|||||||
./utils.nix
|
./utils.nix
|
||||||
./mini.nix
|
./mini.nix
|
||||||
];
|
];
|
||||||
|
};
|
||||||
programs.nvf = {
|
|
||||||
enable = true;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
{
|
||||||
|
inputs,
|
||||||
|
pkgs,
|
||||||
|
system,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
nvimConfig = inputs.nvf.lib.neovimConfiguration {
|
||||||
|
inherit pkgs;
|
||||||
|
modules = [
|
||||||
|
./options.nix
|
||||||
|
./languages.nix
|
||||||
|
./picker.nix
|
||||||
|
./snacks.nix
|
||||||
|
./keymaps.nix
|
||||||
|
./utils.nix
|
||||||
|
./mini.nix
|
||||||
|
];
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
packages.${system}.nvim = nvimConfig.neovim;
|
||||||
|
|
||||||
|
apps.${system}.nvim = {
|
||||||
|
type = "app";
|
||||||
|
program = "${nvimConfig.neovim}/bin/nvim";
|
||||||
|
};
|
||||||
|
defaultApp.${system} = {
|
||||||
|
type = "app";
|
||||||
|
program = "${nvimConfig.neovim}/bin/nvim";
|
||||||
|
};
|
||||||
|
|
||||||
|
homeManagerModules.nvim = {
|
||||||
|
imports = [
|
||||||
|
inputs.nvf.homeManagerModules.default
|
||||||
|
./default.nix
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,10 +1,9 @@
|
|||||||
{
|
{
|
||||||
programs.nvf.settings.vim = {
|
vim = {
|
||||||
globals.mapleader = " ";
|
globals.mapleader = " ";
|
||||||
binds = {
|
binds = {
|
||||||
whichKey = {
|
whichKey = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# TODO: registers
|
|
||||||
register = {};
|
register = {};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -63,19 +62,31 @@
|
|||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<MiddleMouse>";
|
key = "<MiddleMouse>";
|
||||||
mode = ["n" "i" "v"]; # Normal, Insert, Visual
|
mode = [
|
||||||
action = "<nop>"; # No Operation
|
"n"
|
||||||
silent = true;
|
"i"
|
||||||
}
|
"v"
|
||||||
{
|
];
|
||||||
key = "<2-MiddleMouse>"; # Désactive aussi le double clic molette
|
|
||||||
mode = ["n" "i" "v"];
|
|
||||||
action = "<nop>";
|
action = "<nop>";
|
||||||
silent = true;
|
silent = true;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<3-MiddleMouse>"; # Désactive aussi le double clic molette
|
key = "<2-MiddleMouse>";
|
||||||
mode = ["n" "i" "v"];
|
mode = [
|
||||||
|
"n"
|
||||||
|
"i"
|
||||||
|
"v"
|
||||||
|
];
|
||||||
|
action = "<nop>";
|
||||||
|
silent = true;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
key = "<3-MiddleMouse>";
|
||||||
|
mode = [
|
||||||
|
"n"
|
||||||
|
"i"
|
||||||
|
"v"
|
||||||
|
];
|
||||||
action = "<nop>";
|
action = "<nop>";
|
||||||
silent = true;
|
silent = true;
|
||||||
}
|
}
|
||||||
@@ -207,10 +218,23 @@
|
|||||||
desc = "Move to right window";
|
desc = "Move to right window";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Format
|
||||||
|
{
|
||||||
|
key = "<leader>lf";
|
||||||
|
mode = "n";
|
||||||
|
silent = true;
|
||||||
|
action = "<cmd>lua require('conform').format({ async = true, lsp_format = 'fallback' })<cr>";
|
||||||
|
desc = "Format file";
|
||||||
|
}
|
||||||
|
|
||||||
# Save
|
# Save
|
||||||
{
|
{
|
||||||
key = "<C-s>";
|
key = "<C-s>";
|
||||||
mode = ["n" "i" "v"];
|
mode = [
|
||||||
|
"n"
|
||||||
|
"i"
|
||||||
|
"v"
|
||||||
|
];
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<cmd>w<cr>";
|
action = "<cmd>w<cr>";
|
||||||
desc = "Save file";
|
desc = "Save file";
|
||||||
@@ -219,7 +243,11 @@
|
|||||||
# Deactivate "esc"
|
# Deactivate "esc"
|
||||||
{
|
{
|
||||||
key = "<Esc>";
|
key = "<Esc>";
|
||||||
mode = ["n" "i" "v"];
|
mode = [
|
||||||
|
"n"
|
||||||
|
"i"
|
||||||
|
"v"
|
||||||
|
];
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<Nop>";
|
action = "<Nop>";
|
||||||
desc = "Disable Escape";
|
desc = "Disable Escape";
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
programs.nvf.settings.vim = {
|
vim = {
|
||||||
diagnostics = {
|
diagnostics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
config = {
|
config = {
|
||||||
@@ -26,7 +26,6 @@
|
|||||||
''
|
''
|
||||||
function(diagnostic)
|
function(diagnostic)
|
||||||
return string.format("%s", diagnostic.message)
|
return string.format("%s", diagnostic.message)
|
||||||
--return string.format("%s (%s)", diagnostic.message, diagnostic.source)
|
|
||||||
end
|
end
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
@@ -35,14 +34,13 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
syntaxHighlighting = true;
|
|
||||||
treesitter = {
|
treesitter = {
|
||||||
enable = true;
|
enable = true;
|
||||||
autotagHtml = true;
|
autotagHtml = true;
|
||||||
context.enable = true;
|
context.enable = true;
|
||||||
highlight.enable = true;
|
highlight.enable = true;
|
||||||
grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
|
grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
|
||||||
typescript # in language settings only tsx gets enabled, not typescript
|
typescript
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
lsp = {
|
lsp = {
|
||||||
@@ -56,6 +54,7 @@
|
|||||||
lspSignature.enable = true;
|
lspSignature.enable = true;
|
||||||
lspconfig.enable = true;
|
lspconfig.enable = true;
|
||||||
formatOnSave = true;
|
formatOnSave = true;
|
||||||
|
mappings.format = null;
|
||||||
inlayHints.enable = true;
|
inlayHints.enable = true;
|
||||||
null-ls.enable = true;
|
null-ls.enable = true;
|
||||||
servers.nixd.settings.nil.nix.autoArchive = true;
|
servers.nixd.settings.nil.nix.autoArchive = true;
|
||||||
@@ -116,7 +115,10 @@
|
|||||||
extensions.ts-error-translator.enable = true;
|
extensions.ts-error-translator.enable = true;
|
||||||
};
|
};
|
||||||
css.enable = true;
|
css.enable = true;
|
||||||
svelte.enable = true;
|
svelte = {
|
||||||
|
enable = true;
|
||||||
|
format.enable = false;
|
||||||
|
};
|
||||||
html.enable = true;
|
html.enable = true;
|
||||||
bash.enable = true;
|
bash.enable = true;
|
||||||
nix.enable = true;
|
nix.enable = true;
|
||||||
@@ -124,6 +126,7 @@
|
|||||||
formatter = {
|
formatter = {
|
||||||
conform-nvim = {
|
conform-nvim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
setupOpts.format_after_save = null;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
{
|
{
|
||||||
programs.nvf.settings.vim.mini = {
|
vim.mini = {
|
||||||
starter.enable = true;
|
starter.enable = true;
|
||||||
comment.enable = true;
|
comment.enable = true;
|
||||||
# cursorword.enable = true;
|
|
||||||
icons.enable = true;
|
icons.enable = true;
|
||||||
indentscope.enable = true;
|
indentscope.enable = true;
|
||||||
notify.enable = true;
|
notify.enable = true;
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
{lib, ...}: {
|
{lib, ...}: {
|
||||||
programs.nvf.settings.vim = {
|
vim = {
|
||||||
viAlias = false;
|
viAlias = false;
|
||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
withNodeJs = true;
|
withNodeJs = true;
|
||||||
# syntaxHighlighting = true;
|
|
||||||
options = {
|
options = {
|
||||||
autoindent = true;
|
autoindent = true;
|
||||||
smartindent = true;
|
smartindent = true;
|
||||||
@@ -19,8 +18,8 @@
|
|||||||
wrap = false;
|
wrap = false;
|
||||||
};
|
};
|
||||||
globals = {
|
globals = {
|
||||||
navic_silence = true; # navic tries to attach multiple LSPs and fails
|
navic_silence = true;
|
||||||
suda_smart_edit = 1; # use super user write automatically
|
suda_smart_edit = 1;
|
||||||
neovide_scale_factor = 0.7;
|
neovide_scale_factor = 0.7;
|
||||||
neovide_cursor_animation_length = 0.1;
|
neovide_cursor_animation_length = 0.1;
|
||||||
neovide_cursor_short_animation_length = 0;
|
neovide_cursor_short_animation_length = 0;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
programs.nvf.settings.vim = {
|
vim = {
|
||||||
utility = {
|
utility = {
|
||||||
oil-nvim.enable = true;
|
oil-nvim.enable = true;
|
||||||
snacks-nvim = {
|
snacks-nvim = {
|
||||||
@@ -66,8 +66,7 @@
|
|||||||
key = "<leader>fc";
|
key = "<leader>fc";
|
||||||
mode = "n";
|
mode = "n";
|
||||||
silent = true;
|
silent = true;
|
||||||
action = ''
|
action = ''<cmd>lua Snacks.picker.files({ cwd = vim.fn.stdpath("config") })<cr>'';
|
||||||
<cmd>lua Snacks.picker.files({ cwd = vim.fn.stdpath("config") })<cr>'';
|
|
||||||
desc = "Find Config File";
|
desc = "Find Config File";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,12 +1,5 @@
|
|||||||
{pkgs, ...}: {
|
{
|
||||||
home.packages = with pkgs; [
|
vim.utility.snacks-nvim = {
|
||||||
imagemagick
|
|
||||||
tree-sitter
|
|
||||||
ghostscript
|
|
||||||
tectonic
|
|
||||||
mermaid-cli
|
|
||||||
];
|
|
||||||
programs.nvf.settings.vim.utility.snacks-nvim = {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
setupOpts = {
|
setupOpts = {
|
||||||
image = {
|
image = {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
programs.nvf.settings.vim = {
|
vim = {
|
||||||
undoFile.enable = true;
|
undoFile.enable = true;
|
||||||
utility = {
|
utility = {
|
||||||
motion.flash-nvim.enable = true;
|
motion.flash-nvim.enable = true;
|
||||||
|
|||||||
@@ -1,466 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
bookmarkList = [
|
|
||||||
{
|
|
||||||
name = "Proton Mail";
|
|
||||||
url = "https://mail.proton.me";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Proton Drive";
|
|
||||||
url = "https://drive.proton.me";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Proton Lumo";
|
|
||||||
url = "https://lumo.proton.me";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Proton Calendar";
|
|
||||||
url = "https://calendar.proton.me";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Tools";
|
|
||||||
bookmarks = [
|
|
||||||
{
|
|
||||||
name = "tldr";
|
|
||||||
url = "https://tldr.inbrowser.app/";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Excalidraw";
|
|
||||||
url = "https://excalidraw.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Cobalt (downloader)";
|
|
||||||
url = "https://cobalt.meowing.de";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Mazanoke (image)";
|
|
||||||
url = "https://mazanoke.hadi.icu";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Stirling PDF";
|
|
||||||
url = "https://pdf.hadi.icu";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Vert";
|
|
||||||
url = "https://vert.sh";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Markdown to PDF";
|
|
||||||
url = "https://md2file.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Image to Vector";
|
|
||||||
url = "https://www.vectorcascade.com/";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "PrivateBin";
|
|
||||||
url = "https://privatebin.net";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Social";
|
|
||||||
bookmarks = [
|
|
||||||
{
|
|
||||||
name = "Bluesky";
|
|
||||||
url = "https://bsky.app";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Reddit";
|
|
||||||
url = "https://reddit.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Youtube";
|
|
||||||
url = "https://youtube.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Instagram";
|
|
||||||
url = "https://instagram.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Github";
|
|
||||||
url = "https://github.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Discord";
|
|
||||||
url = "https://discord.com/channels/@me/";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Other";
|
|
||||||
bookmarks = [
|
|
||||||
{
|
|
||||||
name = "Startpage Config";
|
|
||||||
url = "https://www.startpage.com/do/mypage.pl?prfe=45d331deb05471d659dba933e7400df51d952bb103da6f6125c0e769a6be1d65610456a479f495ceeee7e97311cf227d7c1bb198de0ceeb193d8cddf9c455c19a409cc35c3e3f542ee27bd7cecd3";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Hyprland Wiki";
|
|
||||||
url = "https://wiki.hypr.land";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "MyNixOS";
|
|
||||||
url = "https://mynixos.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Nixpkgs";
|
|
||||||
url = "https://github.com/NixOS/nixpkgs";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Claude";
|
|
||||||
url = "https://claude.ai";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Gemini";
|
|
||||||
url = "https://gemini.google.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Medium";
|
|
||||||
url = "https://medium.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Maps";
|
|
||||||
url = "https://maps.apple.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Amazon";
|
|
||||||
url = "https://amazon.fr";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Infosec";
|
|
||||||
bookmarks = [
|
|
||||||
{
|
|
||||||
name = "Nix 4 Cyber";
|
|
||||||
url = "https://n4c.hadi.icu";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Cyberchef";
|
|
||||||
url = "https://cyberchef.hadi.icu";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "TryHackMe";
|
|
||||||
url = "https://tryhackme.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Root-Me";
|
|
||||||
url = "https://root-me.org";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Exploit-DB";
|
|
||||||
url = "https://exploit-db.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Crack Station";
|
|
||||||
url = "https://crackstation.net";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Osint Tracker";
|
|
||||||
url = "https://app.osintracker.com";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
c = config.lib.stylix.colors;
|
|
||||||
|
|
||||||
stripProtocol = url:
|
|
||||||
lib.removePrefix "https://" (lib.removePrefix "http://" url);
|
|
||||||
|
|
||||||
mkCard = item: ''
|
|
||||||
<a href="${item.url}" class="card">
|
|
||||||
<div class="favicon-wrapper">
|
|
||||||
<span class="favicon-fallback">${builtins.substring 0 1 item.name}</span>
|
|
||||||
</div>
|
|
||||||
<div class="card-info">
|
|
||||||
<span class="card-name">${item.name}</span>
|
|
||||||
<span class="card-url">${stripProtocol item.url}</span>
|
|
||||||
</div>
|
|
||||||
</a>'';
|
|
||||||
|
|
||||||
# Group consecutive root items so they share the same .cards grid
|
|
||||||
grouped = let
|
|
||||||
step = acc: item:
|
|
||||||
if item ? url
|
|
||||||
then acc // {pending = acc.pending ++ [item];}
|
|
||||||
else {
|
|
||||||
groups =
|
|
||||||
acc.groups
|
|
||||||
++ lib.optional (acc.pending != []) {
|
|
||||||
isRoot = true;
|
|
||||||
items = acc.pending;
|
|
||||||
}
|
|
||||||
++ [
|
|
||||||
{
|
|
||||||
isRoot = false;
|
|
||||||
inherit item;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
pending = [];
|
|
||||||
};
|
|
||||||
result =
|
|
||||||
lib.foldl' step {
|
|
||||||
groups = [];
|
|
||||||
pending = [];
|
|
||||||
}
|
|
||||||
bookmarkList;
|
|
||||||
in
|
|
||||||
result.groups
|
|
||||||
++ lib.optional (result.pending != []) {
|
|
||||||
isRoot = true;
|
|
||||||
items = result.pending;
|
|
||||||
};
|
|
||||||
|
|
||||||
mkSection = group:
|
|
||||||
if group.isRoot
|
|
||||||
then ''
|
|
||||||
<div class="folder-section">
|
|
||||||
<div class="cards">
|
|
||||||
${lib.concatMapStrings mkCard group.items}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
''
|
|
||||||
else ''
|
|
||||||
<div class="folder-section">
|
|
||||||
<h2 class="folder-title">${group.item.name}</h2>
|
|
||||||
<div class="cards">
|
|
||||||
${lib.concatMapStrings mkCard group.item.bookmarks}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
'';
|
|
||||||
|
|
||||||
publicBookmarks =
|
|
||||||
pkgs.writeText "qutebrowser-public-bookmarks"
|
|
||||||
(lib.concatMapStrings (
|
|
||||||
item:
|
|
||||||
if item ? url
|
|
||||||
then "${item.url} ${item.name}\n"
|
|
||||||
else lib.concatMapStrings (b: "${b.url} ${item.name}/${b.name}\n") item.bookmarks
|
|
||||||
)
|
|
||||||
bookmarkList);
|
|
||||||
|
|
||||||
inherit (config.qutebrowser) privateBookmarksPath;
|
|
||||||
in {
|
|
||||||
options.qutebrowser.privateBookmarksPath = lib.mkOption {
|
|
||||||
type = lib.types.nullOr lib.types.str;
|
|
||||||
default = null;
|
|
||||||
description = "Path to a file containing extra (private) bookmarks to append.";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = {
|
|
||||||
# Fully static HTML — order is preserved, no dependency on qutebrowser's Jinja rendering
|
|
||||||
xdg.dataFile."qutebrowser/bookmarks.html".text = ''
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>Bookmarks</title>
|
|
||||||
<style>
|
|
||||||
*, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
|
|
||||||
|
|
||||||
body {
|
|
||||||
background-color: #${c.base00};
|
|
||||||
color: #${c.base05};
|
|
||||||
font-family: 'Source Sans Pro', sans-serif;
|
|
||||||
font-size: 14px;
|
|
||||||
min-height: 100vh;
|
|
||||||
padding: 2.5rem 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.header {
|
|
||||||
max-width: 1100px;
|
|
||||||
margin: 0 auto 2rem;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.page-title {
|
|
||||||
font-size: 1.3rem;
|
|
||||||
font-weight: 700;
|
|
||||||
color: #${c.base0D};
|
|
||||||
letter-spacing: -0.01em;
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.search-bar {
|
|
||||||
flex: 1;
|
|
||||||
background-color: #${c.base01};
|
|
||||||
border: 1px solid #${c.base02};
|
|
||||||
border-radius: 8px;
|
|
||||||
color: #${c.base05};
|
|
||||||
font-family: 'Source Sans Pro', sans-serif;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
padding: 0.5rem 0.9rem;
|
|
||||||
outline: none;
|
|
||||||
transition: border-color 0.15s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.search-bar::placeholder { color: #${c.base03}; }
|
|
||||||
.search-bar:focus { border-color: #${c.base0D}; }
|
|
||||||
|
|
||||||
.bookmarks-container {
|
|
||||||
max-width: 1100px;
|
|
||||||
margin: 0 auto;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 1.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.folder-title {
|
|
||||||
font-size: 0.72rem;
|
|
||||||
font-weight: 700;
|
|
||||||
letter-spacing: 0.12em;
|
|
||||||
text-transform: uppercase;
|
|
||||||
color: #${c.base03};
|
|
||||||
margin-bottom: 0.6rem;
|
|
||||||
padding-left: 0.2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cards {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(auto-fill, minmax(220px, 1fr));
|
|
||||||
gap: 0.4rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.card {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.7rem;
|
|
||||||
padding: 0.6rem 0.8rem;
|
|
||||||
background-color: #${c.base01};
|
|
||||||
border: 1px solid #${c.base02};
|
|
||||||
border-radius: 10px;
|
|
||||||
text-decoration: none;
|
|
||||||
transition: background-color 0.12s ease, border-color 0.12s ease;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.card:hover {
|
|
||||||
background-color: #${c.base02};
|
|
||||||
border-color: #${c.base03};
|
|
||||||
}
|
|
||||||
|
|
||||||
.favicon-wrapper { position: relative; width: 18px; height: 18px; flex-shrink: 0; }
|
|
||||||
|
|
||||||
.favicon-fallback {
|
|
||||||
position: absolute;
|
|
||||||
inset: 0;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
background-color: #${c.base02};
|
|
||||||
border-radius: 4px;
|
|
||||||
color: #${c.base04};
|
|
||||||
font-size: 10px;
|
|
||||||
font-weight: 700;
|
|
||||||
text-transform: uppercase;
|
|
||||||
user-select: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.card-info {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 0.05rem;
|
|
||||||
overflow: hidden;
|
|
||||||
flex: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.card-name {
|
|
||||||
color: #${c.base05};
|
|
||||||
font-size: 0.86rem;
|
|
||||||
font-weight: 500;
|
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
transition: color 0.12s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.card:hover .card-name { color: #${c.base0A}; }
|
|
||||||
|
|
||||||
.card-url {
|
|
||||||
color: #${c.base03};
|
|
||||||
font-family: 'Maple Mono NF', monospace;
|
|
||||||
font-size: 0.7rem;
|
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
}
|
|
||||||
|
|
||||||
.no-results {
|
|
||||||
color: #${c.base03};
|
|
||||||
font-size: 0.9rem;
|
|
||||||
padding: 0.5rem 0.2rem;
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div class="header">
|
|
||||||
<h1 class="page-title">Bookmarks</h1>
|
|
||||||
<input id="search" class="search-bar" type="text" placeholder="Search…" autocomplete="off" spellcheck="false">
|
|
||||||
</div>
|
|
||||||
<div class="bookmarks-container">
|
|
||||||
<p id="no-results" class="no-results">No results</p>
|
|
||||||
${lib.concatMapStrings mkSection grouped}
|
|
||||||
</div>
|
|
||||||
<script>
|
|
||||||
window.addEventListener('DOMContentLoaded', function () {
|
|
||||||
const input = document.getElementById('search');
|
|
||||||
const noResults = document.getElementById('no-results');
|
|
||||||
|
|
||||||
input.focus();
|
|
||||||
|
|
||||||
input.addEventListener('input', function () {
|
|
||||||
const query = this.value.toLowerCase().trim();
|
|
||||||
let anyVisible = false;
|
|
||||||
|
|
||||||
document.querySelectorAll('.folder-section').forEach(function (section) {
|
|
||||||
let sectionVisible = false;
|
|
||||||
section.querySelectorAll('.card').forEach(function (card) {
|
|
||||||
const name = card.querySelector('.card-name').textContent.toLowerCase();
|
|
||||||
const url = card.querySelector('.card-url').textContent.toLowerCase();
|
|
||||||
const match = !query || name.includes(query) || url.includes(query);
|
|
||||||
card.style.display = match ? ''' : 'none';
|
|
||||||
if (match) { sectionVisible = true; anyVisible = true; }
|
|
||||||
});
|
|
||||||
section.style.display = sectionVisible ? ''' : 'none';
|
|
||||||
});
|
|
||||||
|
|
||||||
noResults.style.display = anyVisible || !query ? 'none' : 'block';
|
|
||||||
});
|
|
||||||
|
|
||||||
input.addEventListener('keydown', function (e) {
|
|
||||||
if (e.key === 'Enter') {
|
|
||||||
const first = document.querySelector('.card:not([style*="none"])');
|
|
||||||
if (first) {
|
|
||||||
location.href = first.href;
|
|
||||||
} else {
|
|
||||||
const q = encodeURIComponent(this.value.trim());
|
|
||||||
if (q) location.href = 'https://www.startpage.com/sp/search?q=' + q;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (e.key === 'Escape') {
|
|
||||||
this.value = ''';
|
|
||||||
this.dispatchEvent(new Event('input'));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
'';
|
|
||||||
|
|
||||||
home.activation.qutebrowserBookmarks = lib.hm.dag.entryAfter ["setupSecrets" "writeBoundary"] ''
|
|
||||||
mkdir -p ${config.home.homeDirectory}/.config/qutebrowser/bookmarks
|
|
||||||
cat ${publicBookmarks} ${lib.optionalString (privateBookmarksPath != null) ''"${privateBookmarksPath}"''} \
|
|
||||||
> ${config.home.homeDirectory}/.config/qutebrowser/bookmarks/urls
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,484 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
bookmarkList =
|
||||||
|
(import ./general.nix)
|
||||||
|
++ (import ./tools.nix)
|
||||||
|
++ (import ./social.nix)
|
||||||
|
++ (import ./infosec.nix)
|
||||||
|
++ (import ./other.nix)
|
||||||
|
++ (import ./jack.nix);
|
||||||
|
|
||||||
|
c = config.lib.stylix.colors;
|
||||||
|
|
||||||
|
stripProtocol = url: lib.removePrefix "https://" (lib.removePrefix "http://" url);
|
||||||
|
|
||||||
|
stripDomain = url: builtins.head (lib.splitString "/" (stripProtocol url));
|
||||||
|
|
||||||
|
mkCard = item: let
|
||||||
|
domain = stripDomain item.url;
|
||||||
|
initial = builtins.substring 0 1 item.name;
|
||||||
|
in ''
|
||||||
|
<a href="${item.url}" class="card">
|
||||||
|
<div class="favicon-wrapper">
|
||||||
|
<img class="favicon" src="https://icons.duckduckgo.com/ip3/${domain}.ico" alt="" aria-hidden="true" loading="lazy" onerror="this.style.display='none';this.nextElementSibling.style.display='flex'">
|
||||||
|
<span class="favicon-fallback" style="display:none">${initial}</span>
|
||||||
|
</div>
|
||||||
|
<div class="card-info">
|
||||||
|
<span class="card-name">${item.name}</span>
|
||||||
|
<span class="card-url">${stripProtocol item.url}</span>
|
||||||
|
</div>
|
||||||
|
</a>'';
|
||||||
|
|
||||||
|
mkFolderContent = items: let
|
||||||
|
step = acc: item:
|
||||||
|
if item ? url
|
||||||
|
then acc // {pending = acc.pending ++ [item];}
|
||||||
|
else {
|
||||||
|
chunks =
|
||||||
|
acc.chunks
|
||||||
|
++ lib.optional (acc.pending != []) {
|
||||||
|
isCards = true;
|
||||||
|
items = acc.pending;
|
||||||
|
}
|
||||||
|
++ [
|
||||||
|
{
|
||||||
|
isCards = false;
|
||||||
|
folder = item;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
pending = [];
|
||||||
|
};
|
||||||
|
result =
|
||||||
|
lib.foldl' step {
|
||||||
|
chunks = [];
|
||||||
|
pending = [];
|
||||||
|
}
|
||||||
|
items;
|
||||||
|
chunks =
|
||||||
|
result.chunks
|
||||||
|
++ lib.optional (result.pending != []) {
|
||||||
|
isCards = true;
|
||||||
|
items = result.pending;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
lib.concatMapStrings (
|
||||||
|
chunk:
|
||||||
|
if chunk.isCards
|
||||||
|
then ''
|
||||||
|
<div class="cards">
|
||||||
|
${lib.concatMapStrings mkCard chunk.items}
|
||||||
|
</div>''
|
||||||
|
else mkFolder chunk.folder
|
||||||
|
)
|
||||||
|
chunks;
|
||||||
|
|
||||||
|
mkFolder = folder: let
|
||||||
|
iconHtml =
|
||||||
|
if folder ? icon
|
||||||
|
then ''<span class="material-symbols-outlined folder-icon" aria-hidden="true">${folder.icon}</span>''
|
||||||
|
else "";
|
||||||
|
in ''
|
||||||
|
<details class="folder-section" open>
|
||||||
|
<summary class="folder-title">
|
||||||
|
${iconHtml}<span class="folder-name">${folder.name}</span>
|
||||||
|
<svg class="chevron" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="6 9 12 15 18 9"/></svg>
|
||||||
|
</summary>
|
||||||
|
<div class="folder-content">
|
||||||
|
${mkFolderContent folder.bookmarks}
|
||||||
|
</div>
|
||||||
|
</details>'';
|
||||||
|
|
||||||
|
grouped = let
|
||||||
|
step = acc: item:
|
||||||
|
if item ? url
|
||||||
|
then acc // {pending = acc.pending ++ [item];}
|
||||||
|
else {
|
||||||
|
groups =
|
||||||
|
acc.groups
|
||||||
|
++ lib.optional (acc.pending != []) {
|
||||||
|
isRoot = true;
|
||||||
|
items = acc.pending;
|
||||||
|
}
|
||||||
|
++ [
|
||||||
|
{
|
||||||
|
isRoot = false;
|
||||||
|
inherit item;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
pending = [];
|
||||||
|
};
|
||||||
|
result =
|
||||||
|
lib.foldl' step {
|
||||||
|
groups = [];
|
||||||
|
pending = [];
|
||||||
|
}
|
||||||
|
bookmarkList;
|
||||||
|
in
|
||||||
|
result.groups
|
||||||
|
++ lib.optional (result.pending != []) {
|
||||||
|
isRoot = true;
|
||||||
|
items = result.pending;
|
||||||
|
};
|
||||||
|
|
||||||
|
mkSection = group:
|
||||||
|
if group.isRoot
|
||||||
|
then ''
|
||||||
|
<div class="root-section">
|
||||||
|
<div class="cards">
|
||||||
|
${lib.concatMapStrings mkCard group.items}
|
||||||
|
</div>
|
||||||
|
</div>''
|
||||||
|
else mkFolder group.item;
|
||||||
|
|
||||||
|
collectBookmarks = prefix: items:
|
||||||
|
lib.concatMapStrings (
|
||||||
|
item:
|
||||||
|
if item ? url
|
||||||
|
then "${item.url} ${prefix}${item.name}\n"
|
||||||
|
else collectBookmarks "${prefix}${item.name}/" item.bookmarks
|
||||||
|
)
|
||||||
|
items;
|
||||||
|
|
||||||
|
publicBookmarks = pkgs.writeText "qutebrowser-public-bookmarks" (collectBookmarks "" bookmarkList);
|
||||||
|
in {
|
||||||
|
config = {
|
||||||
|
xdg.dataFile."qutebrowser/bookmarks.html".text = ''
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>Bookmarks</title>
|
||||||
|
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20,300,0,0">
|
||||||
|
<style>
|
||||||
|
*, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
|
||||||
|
|
||||||
|
body {
|
||||||
|
background-color: #${c.base00};
|
||||||
|
color: #${c.base05};
|
||||||
|
font-family: 'Source Sans Pro', sans-serif;
|
||||||
|
font-size: 14px;
|
||||||
|
min-height: 100vh;
|
||||||
|
padding: 2.5rem 2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header {
|
||||||
|
max-width: 1100px;
|
||||||
|
margin: 0 auto 2rem;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.page-title {
|
||||||
|
font-size: 1.3rem;
|
||||||
|
font-weight: 700;
|
||||||
|
color: #${c.base0D};
|
||||||
|
letter-spacing: -0.01em;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.search-bar {
|
||||||
|
flex: 1;
|
||||||
|
background-color: #${c.base01};
|
||||||
|
border: 1px solid #${c.base02};
|
||||||
|
border-radius: 8px;
|
||||||
|
color: #${c.base05};
|
||||||
|
font-family: 'Source Sans Pro', sans-serif;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
padding: 0.5rem 0.9rem;
|
||||||
|
outline: none;
|
||||||
|
transition: border-color 0.15s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.search-bar::placeholder { color: #${c.base03}; }
|
||||||
|
.search-bar:focus { border-color: #${c.base0D}; }
|
||||||
|
|
||||||
|
.collapse-btn {
|
||||||
|
flex-shrink: 0;
|
||||||
|
background: none;
|
||||||
|
border: 1px solid #${c.base02};
|
||||||
|
border-radius: 8px;
|
||||||
|
color: #${c.base03};
|
||||||
|
cursor: pointer;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 0.47rem;
|
||||||
|
transition: color 0.15s ease, border-color 0.15s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.collapse-btn:hover {
|
||||||
|
color: #${c.base0D};
|
||||||
|
border-color: #${c.base0D};
|
||||||
|
}
|
||||||
|
|
||||||
|
.collapse-btn svg {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bookmarks-container {
|
||||||
|
max-width: 1100px;
|
||||||
|
margin: 0 auto;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.root-section {
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
details.folder-section {
|
||||||
|
border-radius: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
details.folder-section > summary {
|
||||||
|
list-style: none;
|
||||||
|
cursor: pointer;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.5rem;
|
||||||
|
padding: 0.45rem 0.5rem;
|
||||||
|
border-radius: 8px;
|
||||||
|
user-select: none;
|
||||||
|
transition: background-color 0.12s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
details.folder-section > summary::-webkit-details-marker { display: none; }
|
||||||
|
|
||||||
|
details.folder-section > summary:hover {
|
||||||
|
background-color: #${c.base01};
|
||||||
|
color: #${c.base0D};
|
||||||
|
}
|
||||||
|
|
||||||
|
details.folder-section > summary:hover .folder-name {
|
||||||
|
color: #${c.base0D};
|
||||||
|
}
|
||||||
|
|
||||||
|
details.folder-section > summary:hover .folder-icon {
|
||||||
|
color: #${c.base0D};
|
||||||
|
}
|
||||||
|
|
||||||
|
.folder-icon {
|
||||||
|
font-size: 14px;
|
||||||
|
line-height: 1;
|
||||||
|
flex-shrink: 0;
|
||||||
|
color: #${c.base04};
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.folder-name {
|
||||||
|
font-size: 0.72rem;
|
||||||
|
font-weight: 700;
|
||||||
|
letter-spacing: 0.12em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
color: #${c.base03};
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chevron {
|
||||||
|
width: 13px;
|
||||||
|
height: 13px;
|
||||||
|
color: #${c.base03};
|
||||||
|
transition: transform 0.2s ease;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
details[open] > summary > .chevron {
|
||||||
|
transform: rotate(180deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.folder-content {
|
||||||
|
padding: 0.4rem 0 0.5rem 0;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.folder-content > details.folder-section > summary {
|
||||||
|
padding-left: 1.2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.folder-content > details.folder-section > .folder-content {
|
||||||
|
padding-left: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cards {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fill, minmax(220px, 1fr));
|
||||||
|
gap: 0.4rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.7rem;
|
||||||
|
padding: 0.6rem 0.8rem;
|
||||||
|
background-color: #${c.base01};
|
||||||
|
border: 1px solid #${c.base02};
|
||||||
|
border-radius: 10px;
|
||||||
|
text-decoration: none;
|
||||||
|
transition: background-color 0.12s ease, border-color 0.12s ease;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card:hover {
|
||||||
|
background-color: #${c.base02};
|
||||||
|
border-color: #${c.base0D};
|
||||||
|
}
|
||||||
|
|
||||||
|
.favicon-wrapper { position: relative; width: 18px; height: 18px; flex-shrink: 0; }
|
||||||
|
|
||||||
|
.favicon {
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
object-fit: contain;
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.favicon-fallback {
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
background-color: #${c.base02};
|
||||||
|
border-radius: 4px;
|
||||||
|
color: #${c.base04};
|
||||||
|
font-size: 10px;
|
||||||
|
font-weight: 700;
|
||||||
|
text-transform: uppercase;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-info {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.05rem;
|
||||||
|
overflow: hidden;
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-name {
|
||||||
|
color: #${c.base05};
|
||||||
|
font-size: 0.86rem;
|
||||||
|
font-weight: 500;
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
transition: color 0.12s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card:hover .card-name { color: #${c.base0D}; }
|
||||||
|
|
||||||
|
.card-url {
|
||||||
|
color: #${c.base03};
|
||||||
|
font-family: 'Maple Mono NF', monospace;
|
||||||
|
font-size: 0.7rem;
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
|
.no-results {
|
||||||
|
color: #${c.base03};
|
||||||
|
font-size: 0.9rem;
|
||||||
|
padding: 0.5rem 0.2rem;
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div class="header">
|
||||||
|
<h1 class="page-title">Bookmarks</h1>
|
||||||
|
<input id="search" class="search-bar" type="text" placeholder="Search…" autocomplete="off" spellcheck="false">
|
||||||
|
<button id="collapse-btn" class="collapse-btn" title="Collapse all folders" aria-label="Collapse all folders">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
|
<polyline points="4 14 10 14 10 20"/><polyline points="20 10 14 10 14 4"/><line x1="10" y1="14" x2="3" y2="21"/><line x1="21" y1="3" x2="14" y2="10"/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div class="bookmarks-container">
|
||||||
|
<p id="no-results" class="no-results">No results</p>
|
||||||
|
${lib.concatMapStrings mkSection grouped}
|
||||||
|
</div>
|
||||||
|
<script>
|
||||||
|
window.addEventListener('DOMContentLoaded', function () {
|
||||||
|
const input = document.getElementById('search');
|
||||||
|
const noResults = document.getElementById('no-results');
|
||||||
|
const collapseBtn = document.getElementById('collapse-btn');
|
||||||
|
|
||||||
|
input.focus();
|
||||||
|
|
||||||
|
collapseBtn.addEventListener('click', function () {
|
||||||
|
document.querySelectorAll('details.folder-section').forEach(function (d) {
|
||||||
|
d.open = false;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
input.addEventListener('input', function () {
|
||||||
|
const query = this.value.toLowerCase().trim();
|
||||||
|
let anyVisible = false;
|
||||||
|
|
||||||
|
if (query) {
|
||||||
|
document.querySelectorAll('details.folder-section').forEach(function (d) {
|
||||||
|
d.open = true;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
document.querySelectorAll('.folder-section, .root-section').forEach(function (section) {
|
||||||
|
let sectionVisible = false;
|
||||||
|
section.querySelectorAll('.card').forEach(function (card) {
|
||||||
|
const name = card.querySelector('.card-name').textContent.toLowerCase();
|
||||||
|
const url = card.querySelector('.card-url').textContent.toLowerCase();
|
||||||
|
const match = !query || name.includes(query) || url.includes(query);
|
||||||
|
card.style.display = match ? ''' : 'none';
|
||||||
|
if (match) { sectionVisible = true; anyVisible = true; }
|
||||||
|
});
|
||||||
|
section.style.display = sectionVisible ? ''' : 'none';
|
||||||
|
});
|
||||||
|
|
||||||
|
noResults.style.display = anyVisible || !query ? 'none' : 'block';
|
||||||
|
});
|
||||||
|
|
||||||
|
input.addEventListener('keydown', function (e) {
|
||||||
|
if (e.key === 'Enter') {
|
||||||
|
const val = this.value.trim();
|
||||||
|
const isUrl = /^https?:\/\//i.test(val) || /^[a-zA-Z0-9-]+(\.[a-zA-Z]{2,})(\/.*)?$/.test(val);
|
||||||
|
if (isUrl) {
|
||||||
|
location.href = /^https?:\/\//i.test(val) ? val : 'https://' + val;
|
||||||
|
} else {
|
||||||
|
const first = document.querySelector('.card:not([style*="none"])');
|
||||||
|
if (first) {
|
||||||
|
location.href = first.href;
|
||||||
|
} else {
|
||||||
|
const q = encodeURIComponent(val);
|
||||||
|
if (q) location.href = 'https://www.startpage.com/sp/search?q=' + q;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (e.key === 'Escape') {
|
||||||
|
this.value = ''';
|
||||||
|
this.dispatchEvent(new Event('input'));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
'';
|
||||||
|
|
||||||
|
home.activation.qutebrowserBookmarks = lib.hm.dag.entryAfter ["writeBoundary"] ''
|
||||||
|
mkdir -p ${config.home.homeDirectory}/.config/qutebrowser/bookmarks
|
||||||
|
cat ${publicBookmarks} > ${config.home.homeDirectory}/.config/qutebrowser/bookmarks/urls
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
name = "Proton Mail";
|
||||||
|
url = "https://mail.proton.me";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Proton Drive";
|
||||||
|
url = "https://drive.proton.me";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Proton Lumo";
|
||||||
|
url = "https://lumo.proton.me";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Proton Calendar";
|
||||||
|
url = "https://calendar.proton.me";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Github";
|
||||||
|
url = "https://github.com";
|
||||||
|
}
|
||||||
|
]
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
name = "Infosec";
|
||||||
|
icon = "terminal";
|
||||||
|
bookmarks = [
|
||||||
|
{
|
||||||
|
name = "Nix 4 Cyber";
|
||||||
|
url = "https://n4c.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Cyberchef";
|
||||||
|
url = "https://cyberchef.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "TryHackMe";
|
||||||
|
url = "https://tryhackme.com";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Root-Me";
|
||||||
|
url = "https://root-me.org";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Hack The Box";
|
||||||
|
url = "https://hackthebox.com";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Iknowyou";
|
||||||
|
url = "https://iknowyou-prod.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Exploit-DB";
|
||||||
|
url = "https://exploit-db.com";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "GTFOBins";
|
||||||
|
url = "https://gtfobins.org/";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Crack Station";
|
||||||
|
url = "https://crackstation.net";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Osint Tracker";
|
||||||
|
url = "https://app.osintracker.com";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
]
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
name = "Jack";
|
||||||
|
icon = "dns";
|
||||||
|
bookmarks = [
|
||||||
|
{
|
||||||
|
name = "Glance";
|
||||||
|
url = "https://home.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Blog";
|
||||||
|
url = "https://hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Gitea";
|
||||||
|
url = "https://git.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Mealie";
|
||||||
|
url = "https://mealie.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Wallpapers";
|
||||||
|
url = "https://wallpapers.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Default Creds";
|
||||||
|
url = "https://default-creds.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Media";
|
||||||
|
icon = "subscriptions";
|
||||||
|
bookmarks = [
|
||||||
|
{
|
||||||
|
name = "Radarr";
|
||||||
|
url = "https://radarr.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Sonarr";
|
||||||
|
url = "https://sonarr.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Bazarr";
|
||||||
|
url = "https://bazarr.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Prowlarr";
|
||||||
|
url = "https://prowlarr.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Transmission";
|
||||||
|
url = "https://transmission.hadi.icu";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Infrastructure";
|
||||||
|
icon = "construction";
|
||||||
|
bookmarks = [
|
||||||
|
{
|
||||||
|
name = "AdGuard";
|
||||||
|
url = "https://adguard.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Umami";
|
||||||
|
url = "https://umami.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Cloudflare";
|
||||||
|
url = "https://dash.cloudflare.com";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Cloudflare Zero Trust";
|
||||||
|
url = "https://one.dash.cloudflare.com";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
]
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
name = "Other";
|
||||||
|
icon = "category";
|
||||||
|
bookmarks = [
|
||||||
|
{
|
||||||
|
name = "Documentation";
|
||||||
|
icon = "menu_book";
|
||||||
|
bookmarks = [
|
||||||
|
{
|
||||||
|
name = "Hyprland Wiki";
|
||||||
|
url = "https://wiki.hypr.land";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Stylix Wiki";
|
||||||
|
url = "https://nix-community.github.io/stylix/";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Nixpkgs";
|
||||||
|
url = "https://github.com/NixOS/nixpkgs";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "tldr";
|
||||||
|
url = "https://tldr.inbrowser.app/";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Startpage Config";
|
||||||
|
url = "https://www.startpage.com/do/mypage.pl?prfe=45d331deb05471d659dba933e7400df51d952bb103da6f6125c0e769a6be1d65610456a479f495ceeee7e97311cf227d7c1bb198de0ceeb193d8cddf9c455c19a409cc35c3e3f542ee27bd7cecd3";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Feedly";
|
||||||
|
url = "https://feedly.com";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "MyNixOS";
|
||||||
|
url = "https://mynixos.com";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Amazon";
|
||||||
|
url = "https://amazon.fr";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
]
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
name = "Entertainment";
|
||||||
|
icon = "movie";
|
||||||
|
bookmarks = [
|
||||||
|
{
|
||||||
|
name = "Youtube";
|
||||||
|
url = "https://youtube.com";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Jellyfin";
|
||||||
|
url = "https://media.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Seerr";
|
||||||
|
url = "https://demandemedia.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Social Media";
|
||||||
|
icon = "group";
|
||||||
|
bookmarks = [
|
||||||
|
{
|
||||||
|
name = "Medium";
|
||||||
|
url = "https://medium.com";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Bluesky";
|
||||||
|
url = "https://bsky.app";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Reddit";
|
||||||
|
url = "https://reddit.com";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Instagram";
|
||||||
|
url = "https://instagram.com";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Discord";
|
||||||
|
url = "https://discord.com/channels/@me/";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Gitlab";
|
||||||
|
url = "https://gitlab.com/";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
]
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
name = "Tools";
|
||||||
|
icon = "handyman";
|
||||||
|
bookmarks = [
|
||||||
|
{
|
||||||
|
name = "Maps";
|
||||||
|
url = "https://maps.apple.com";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Excalidraw";
|
||||||
|
url = "https://excalidraw.com";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Cobalt (downloader)";
|
||||||
|
url = "https://cobalt.meowing.de";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Mazanoke (image)";
|
||||||
|
url = "https://mazanoke.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Vert";
|
||||||
|
url = "https://vert.sh";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Markdown to PDF";
|
||||||
|
url = "https://md2file.com";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Image to Vector";
|
||||||
|
url = "https://www.vectorcascade.com/";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "PrivateBin";
|
||||||
|
url = "https://privatebin.net";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Claude";
|
||||||
|
url = "https://claude.ai";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Gemini";
|
||||||
|
url = "https://gemini.google.com";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
]
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{...}: {
|
{...}: {
|
||||||
imports = [
|
imports = [
|
||||||
./bookmarks.nix
|
./bookmarks
|
||||||
./search.nix
|
./search.nix
|
||||||
./keybindings.nix
|
./keybindings.nix
|
||||||
./settings.nix
|
./settings.nix
|
||||||
@@ -27,7 +27,10 @@
|
|||||||
genericName = "Web Browser";
|
genericName = "Web Browser";
|
||||||
exec = "qutebrowser --temp-basedir %U";
|
exec = "qutebrowser --temp-basedir %U";
|
||||||
icon = "qutebrowser";
|
icon = "qutebrowser";
|
||||||
categories = ["Network" "WebBrowser"];
|
categories = [
|
||||||
|
"Network"
|
||||||
|
"WebBrowser"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.qutebrowser = {
|
programs.qutebrowser = {
|
||||||
|
|||||||
@@ -1,826 +0,0 @@
|
|||||||
// ==UserScript==
|
|
||||||
// @name Don't track me Google
|
|
||||||
// @namespace Rob W
|
|
||||||
// @description Removes the annoying link-conversion at Google Search/maps/...
|
|
||||||
// @version 4.28
|
|
||||||
// @icon https://raw.githubusercontent.com/Rob--W/dont-track-me-google/master/icon48.png
|
|
||||||
// @supportURL https://github.com/Rob--W/dont-track-me-google/issues
|
|
||||||
// @license MIT
|
|
||||||
// @run-at document-start
|
|
||||||
// @match *://*.google.com/*
|
|
||||||
// @match *://*.google.ad/*
|
|
||||||
// @match *://*.google.ae/*
|
|
||||||
// @match *://*.google.com.af/*
|
|
||||||
// @match *://*.google.com.ag/*
|
|
||||||
// @match *://*.google.com.ai/*
|
|
||||||
// @match *://*.google.al/*
|
|
||||||
// @match *://*.google.am/*
|
|
||||||
// @match *://*.google.co.ao/*
|
|
||||||
// @match *://*.google.com.ar/*
|
|
||||||
// @match *://*.google.as/*
|
|
||||||
// @match *://*.google.at/*
|
|
||||||
// @match *://*.google.com.au/*
|
|
||||||
// @match *://*.google.az/*
|
|
||||||
// @match *://*.google.ba/*
|
|
||||||
// @match *://*.google.com.bd/*
|
|
||||||
// @match *://*.google.be/*
|
|
||||||
// @match *://*.google.bf/*
|
|
||||||
// @match *://*.google.bg/*
|
|
||||||
// @match *://*.google.com.bh/*
|
|
||||||
// @match *://*.google.bi/*
|
|
||||||
// @match *://*.google.bj/*
|
|
||||||
// @match *://*.google.com.bn/*
|
|
||||||
// @match *://*.google.com.bo/*
|
|
||||||
// @match *://*.google.com.br/*
|
|
||||||
// @match *://*.google.bs/*
|
|
||||||
// @match *://*.google.bt/*
|
|
||||||
// @match *://*.google.co.bw/*
|
|
||||||
// @match *://*.google.by/*
|
|
||||||
// @match *://*.google.com.bz/*
|
|
||||||
// @match *://*.google.ca/*
|
|
||||||
// @match *://*.google.cd/*
|
|
||||||
// @match *://*.google.cf/*
|
|
||||||
// @match *://*.google.cg/*
|
|
||||||
// @match *://*.google.ch/*
|
|
||||||
// @match *://*.google.ci/*
|
|
||||||
// @match *://*.google.co.ck/*
|
|
||||||
// @match *://*.google.cl/*
|
|
||||||
// @match *://*.google.cm/*
|
|
||||||
// @match *://*.google.cn/*
|
|
||||||
// @match *://*.google.com.co/*
|
|
||||||
// @match *://*.google.co.cr/*
|
|
||||||
// @match *://*.google.com.cu/*
|
|
||||||
// @match *://*.google.cv/*
|
|
||||||
// @match *://*.google.com.cy/*
|
|
||||||
// @match *://*.google.cz/*
|
|
||||||
// @match *://*.google.de/*
|
|
||||||
// @match *://*.google.dj/*
|
|
||||||
// @match *://*.google.dk/*
|
|
||||||
// @match *://*.google.dm/*
|
|
||||||
// @match *://*.google.com.do/*
|
|
||||||
// @match *://*.google.dz/*
|
|
||||||
// @match *://*.google.com.ec/*
|
|
||||||
// @match *://*.google.ee/*
|
|
||||||
// @match *://*.google.com.eg/*
|
|
||||||
// @match *://*.google.es/*
|
|
||||||
// @match *://*.google.com.et/*
|
|
||||||
// @match *://*.google.fi/*
|
|
||||||
// @match *://*.google.com.fj/*
|
|
||||||
// @match *://*.google.fm/*
|
|
||||||
// @match *://*.google.fr/*
|
|
||||||
// @match *://*.google.ga/*
|
|
||||||
// @match *://*.google.ge/*
|
|
||||||
// @match *://*.google.gg/*
|
|
||||||
// @match *://*.google.com.gh/*
|
|
||||||
// @match *://*.google.com.gi/*
|
|
||||||
// @match *://*.google.gl/*
|
|
||||||
// @match *://*.google.gm/*
|
|
||||||
// @match *://*.google.gp/*
|
|
||||||
// @match *://*.google.gr/*
|
|
||||||
// @match *://*.google.com.gt/*
|
|
||||||
// @match *://*.google.gy/*
|
|
||||||
// @match *://*.google.com.hk/*
|
|
||||||
// @match *://*.google.hn/*
|
|
||||||
// @match *://*.google.hr/*
|
|
||||||
// @match *://*.google.ht/*
|
|
||||||
// @match *://*.google.hu/*
|
|
||||||
// @match *://*.google.co.id/*
|
|
||||||
// @match *://*.google.ie/*
|
|
||||||
// @match *://*.google.co.il/*
|
|
||||||
// @match *://*.google.im/*
|
|
||||||
// @match *://*.google.co.in/*
|
|
||||||
// @match *://*.google.iq/*
|
|
||||||
// @match *://*.google.is/*
|
|
||||||
// @match *://*.google.it/*
|
|
||||||
// @match *://*.google.je/*
|
|
||||||
// @match *://*.google.com.jm/*
|
|
||||||
// @match *://*.google.jo/*
|
|
||||||
// @match *://*.google.co.jp/*
|
|
||||||
// @match *://*.google.co.ke/*
|
|
||||||
// @match *://*.google.com.kh/*
|
|
||||||
// @match *://*.google.ki/*
|
|
||||||
// @match *://*.google.kg/*
|
|
||||||
// @match *://*.google.co.kr/*
|
|
||||||
// @match *://*.google.com.kw/*
|
|
||||||
// @match *://*.google.kz/*
|
|
||||||
// @match *://*.google.la/*
|
|
||||||
// @match *://*.google.com.lb/*
|
|
||||||
// @match *://*.google.li/*
|
|
||||||
// @match *://*.google.lk/*
|
|
||||||
// @match *://*.google.co.ls/*
|
|
||||||
// @match *://*.google.lt/*
|
|
||||||
// @match *://*.google.lu/*
|
|
||||||
// @match *://*.google.lv/*
|
|
||||||
// @match *://*.google.com.ly/*
|
|
||||||
// @match *://*.google.co.ma/*
|
|
||||||
// @match *://*.google.md/*
|
|
||||||
// @match *://*.google.me/*
|
|
||||||
// @match *://*.google.mg/*
|
|
||||||
// @match *://*.google.mk/*
|
|
||||||
// @match *://*.google.ml/*
|
|
||||||
// @match *://*.google.com.mm/*
|
|
||||||
// @match *://*.google.mn/*
|
|
||||||
// @match *://*.google.ms/*
|
|
||||||
// @match *://*.google.com.mt/*
|
|
||||||
// @match *://*.google.mu/*
|
|
||||||
// @match *://*.google.mv/*
|
|
||||||
// @match *://*.google.mw/*
|
|
||||||
// @match *://*.google.com.mx/*
|
|
||||||
// @match *://*.google.com.my/*
|
|
||||||
// @match *://*.google.co.mz/*
|
|
||||||
// @match *://*.google.com.na/*
|
|
||||||
// @match *://*.google.com.nf/*
|
|
||||||
// @match *://*.google.com.ng/*
|
|
||||||
// @match *://*.google.com.ni/*
|
|
||||||
// @match *://*.google.ne/*
|
|
||||||
// @match *://*.google.nl/*
|
|
||||||
// @match *://*.google.no/*
|
|
||||||
// @match *://*.google.com.np/*
|
|
||||||
// @match *://*.google.nr/*
|
|
||||||
// @match *://*.google.nu/*
|
|
||||||
// @match *://*.google.co.nz/*
|
|
||||||
// @match *://*.google.com.om/*
|
|
||||||
// @match *://*.google.com.pa/*
|
|
||||||
// @match *://*.google.com.pe/*
|
|
||||||
// @match *://*.google.com.pg/*
|
|
||||||
// @match *://*.google.com.ph/*
|
|
||||||
// @match *://*.google.com.pk/*
|
|
||||||
// @match *://*.google.pl/*
|
|
||||||
// @match *://*.google.pn/*
|
|
||||||
// @match *://*.google.com.pr/*
|
|
||||||
// @match *://*.google.ps/*
|
|
||||||
// @match *://*.google.pt/*
|
|
||||||
// @match *://*.google.com.py/*
|
|
||||||
// @match *://*.google.com.qa/*
|
|
||||||
// @match *://*.google.ro/*
|
|
||||||
// @match *://*.google.ru/*
|
|
||||||
// @match *://*.google.rw/*
|
|
||||||
// @match *://*.google.com.sa/*
|
|
||||||
// @match *://*.google.com.sb/*
|
|
||||||
// @match *://*.google.sc/*
|
|
||||||
// @match *://*.google.se/*
|
|
||||||
// @match *://*.google.com.sg/*
|
|
||||||
// @match *://*.google.sh/*
|
|
||||||
// @match *://*.google.si/*
|
|
||||||
// @match *://*.google.sk/*
|
|
||||||
// @match *://*.google.com.sl/*
|
|
||||||
// @match *://*.google.sn/*
|
|
||||||
// @match *://*.google.so/*
|
|
||||||
// @match *://*.google.sm/*
|
|
||||||
// @match *://*.google.sr/*
|
|
||||||
// @match *://*.google.st/*
|
|
||||||
// @match *://*.google.com.sv/*
|
|
||||||
// @match *://*.google.td/*
|
|
||||||
// @match *://*.google.tg/*
|
|
||||||
// @match *://*.google.co.th/*
|
|
||||||
// @match *://*.google.com.tj/*
|
|
||||||
// @match *://*.google.tk/*
|
|
||||||
// @match *://*.google.tl/*
|
|
||||||
// @match *://*.google.tm/*
|
|
||||||
// @match *://*.google.tn/*
|
|
||||||
// @match *://*.google.to/*
|
|
||||||
// @match *://*.google.com.tr/*
|
|
||||||
// @match *://*.google.tt/*
|
|
||||||
// @match *://*.google.com.tw/*
|
|
||||||
// @match *://*.google.co.tz/*
|
|
||||||
// @match *://*.google.com.ua/*
|
|
||||||
// @match *://*.google.co.ug/*
|
|
||||||
// @match *://*.google.co.uk/*
|
|
||||||
// @match *://*.google.com.uy/*
|
|
||||||
// @match *://*.google.co.uz/*
|
|
||||||
// @match *://*.google.com.vc/*
|
|
||||||
// @match *://*.google.co.ve/*
|
|
||||||
// @match *://*.google.vg/*
|
|
||||||
// @match *://*.google.co.vi/*
|
|
||||||
// @match *://*.google.com.vn/*
|
|
||||||
// @match *://*.google.vu/*
|
|
||||||
// @match *://*.google.ws/*
|
|
||||||
// @match *://*.google.rs/*
|
|
||||||
// @match *://*.google.co.za/*
|
|
||||||
// @match *://*.google.co.zm/*
|
|
||||||
// @match *://*.google.co.zw/*
|
|
||||||
// @match *://*.google.cat/*
|
|
||||||
// @match *://*.google.ng/*
|
|
||||||
// @downloadURL https://update.greasyfork.org/scripts/428243/Don%27t%20track%20me%20Google.user.js
|
|
||||||
// @updateURL https://update.greasyfork.org/scripts/428243/Don%27t%20track%20me%20Google.meta.js
|
|
||||||
// ==/UserScript==
|
|
||||||
|
|
||||||
document.addEventListener('mousedown', handlePointerPress, true);
|
|
||||||
document.addEventListener('touchstart', handlePointerPress, true);
|
|
||||||
document.addEventListener('click', handleClick, true);
|
|
||||||
var scriptCspNonce;
|
|
||||||
var needsCspNonce = typeof browser !== 'undefined'; // Firefox.
|
|
||||||
var preferenceObservers = [];
|
|
||||||
setupAggresiveUglyLinkPreventer();
|
|
||||||
|
|
||||||
var forceNoReferrer = true;
|
|
||||||
var noping = true;
|
|
||||||
if (typeof chrome == 'object' && chrome.storage) {
|
|
||||||
(chrome.storage.sync || chrome.storage.local).get({
|
|
||||||
forceNoReferrer: true,
|
|
||||||
// From version 4.7 until 4.11, the preference was the literal value of
|
|
||||||
// the referrer policy.
|
|
||||||
referrerPolicy: 'no-referrer',
|
|
||||||
noping: true,
|
|
||||||
}, function(items) {
|
|
||||||
if (items) {
|
|
||||||
// Migration code (to be removed in the future).
|
|
||||||
if (items.referrerPolicy === '') {
|
|
||||||
// User explicitly allowed referrers to be sent, respect that.
|
|
||||||
items.forceNoReferrer = false;
|
|
||||||
}
|
|
||||||
forceNoReferrer = items.forceNoReferrer;
|
|
||||||
noping = items.noping;
|
|
||||||
callPreferenceObservers();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
chrome.storage.onChanged.addListener(function(changes) {
|
|
||||||
if (changes.forceNoReferrer) {
|
|
||||||
forceNoReferrer = changes.forceNoReferrer.newValue;
|
|
||||||
}
|
|
||||||
if (changes.noping) {
|
|
||||||
noping = changes.noping.newValue;
|
|
||||||
}
|
|
||||||
callPreferenceObservers();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function callImmediatelyAndOnPreferenceUpdate(callback) {
|
|
||||||
callback();
|
|
||||||
preferenceObservers.push(callback);
|
|
||||||
}
|
|
||||||
function callPreferenceObservers() {
|
|
||||||
// This method is usually once, and occasionally more than once if the user
|
|
||||||
// changes a preference. For simplicity we don't check whether a pref was
|
|
||||||
// changed before calling a callback - these are cheap anyway.
|
|
||||||
preferenceObservers.forEach(function(callback) {
|
|
||||||
callback();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function getReferrerPolicy() {
|
|
||||||
return forceNoReferrer ? 'origin' : '';
|
|
||||||
}
|
|
||||||
|
|
||||||
function updateReferrerPolicy(a) {
|
|
||||||
if (a.referrerPolicy === 'no-referrer') {
|
|
||||||
// "no-referrer" is more privacy-friendly than "origin".
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var referrerPolicy = getReferrerPolicy();
|
|
||||||
if (referrerPolicy) {
|
|
||||||
a.referrerPolicy = referrerPolicy;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function handlePointerPress(e) {
|
|
||||||
var a = e.target;
|
|
||||||
while (a && !a.href) {
|
|
||||||
a = a.parentElement;
|
|
||||||
}
|
|
||||||
if (!a) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var inlineMousedown = a.getAttribute('onmousedown');
|
|
||||||
// return rwt(....); // E.g Google search results.
|
|
||||||
// return google.rwt(...); // E.g. sponsored search results
|
|
||||||
// return google.arwt(this); // E.g. sponsored search results (dec 2016).
|
|
||||||
if (inlineMousedown && /\ba?rwt\(/.test(inlineMousedown)) {
|
|
||||||
a.removeAttribute('onmousedown');
|
|
||||||
// Just in case:
|
|
||||||
a.removeAttribute('ping');
|
|
||||||
// In Chrome, removing onmousedown during event dispatch does not
|
|
||||||
// prevent the inline listener from running... So we have to cancel
|
|
||||||
// event propagation just in case.
|
|
||||||
e.stopImmediatePropagation();
|
|
||||||
}
|
|
||||||
if (noping) {
|
|
||||||
a.removeAttribute('ping');
|
|
||||||
}
|
|
||||||
var realLink = getRealLinkFromGoogleUrl(a);
|
|
||||||
if (realLink) {
|
|
||||||
a.href = realLink;
|
|
||||||
// Sometimes, two fixups are needed, on old mobile user agents:
|
|
||||||
// /url?q=https://googleweblight.com/fp?u=... -> ...
|
|
||||||
realLink = getRealLinkFromGoogleUrl(a);
|
|
||||||
if (realLink) {
|
|
||||||
a.href = realLink;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
updateReferrerPolicy(a);
|
|
||||||
|
|
||||||
if (e.eventPhase === Event.CAPTURING_PHASE) {
|
|
||||||
// Our event listener runs first, to sanitize the link.
|
|
||||||
// But the page may have an event handler that modifies the link again.
|
|
||||||
// We can append a listener to the bubbling phase of the (current)
|
|
||||||
// event dispatch to fix the link up again, provided that the page did
|
|
||||||
// not call stopPropagation() or stopImmediatePropagation().
|
|
||||||
var eventOptions = { capture: false, once: true };
|
|
||||||
a.addEventListener(e.type, handlePointerPress, eventOptions);
|
|
||||||
document.addEventListener(e.type, handlePointerPress, eventOptions);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// This is specifically designed for catching clicks in Gmail.
|
|
||||||
// Gmail binds a click handler to a <div> and cancels the event after opening
|
|
||||||
// a window with an ugly URL. It uses a blank window + meta refresh in Firefox,
|
|
||||||
// which is too crazy to patch. So we just make sure that the browser's default
|
|
||||||
// click handler is activated (=open link in new tab).
|
|
||||||
// The entry point for this crazy stuff is shown in my comment at
|
|
||||||
// https://github.com/Rob--W/dont-track-me-google/issues/2
|
|
||||||
function handleClick(e) {
|
|
||||||
if (e.button !== 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var a = e.target;
|
|
||||||
while (a && !a.href) {
|
|
||||||
a = a.parentElement;
|
|
||||||
}
|
|
||||||
if (!a) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (a.dataset && a.dataset.url) {
|
|
||||||
var realLink = getSanitizedIntentUrl(a.dataset.url);
|
|
||||||
if (realLink) {
|
|
||||||
a.dataset.url = realLink;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!location.hostname.startsWith('mail.')) {
|
|
||||||
// This hack was designed for Gmail, but broke other Google sites:
|
|
||||||
// - https://github.com/Rob--W/dont-track-me-google/issues/6
|
|
||||||
// - https://github.com/Rob--W/dont-track-me-google/issues/19
|
|
||||||
// So let's disable it for every domain except Gmail.
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// TODO: Consider using a.baseURI instead of location in case Gmail ever
|
|
||||||
// starts using <base href>?
|
|
||||||
if (a.origin === location.origin) {
|
|
||||||
// Same-origin link.
|
|
||||||
// E.g. an in-page navigation at Google Docs (#...)
|
|
||||||
// or an attachment at Gmail (https://mail.google.com/mail/u/0?ui=2&...)
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (a.protocol !== 'http:' &&
|
|
||||||
a.protocol !== 'https:' &&
|
|
||||||
a.protocol !== 'ftp:') {
|
|
||||||
// Be conservative and don't block too much. E.g. Gmail has special
|
|
||||||
// handling for mailto:-URLs, and using stopPropagation now would
|
|
||||||
// cause mailto:-links to be opened by the platform's default mailto
|
|
||||||
// handler instead of Gmail's handler (=open in new window).
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (a.target === '_blank') {
|
|
||||||
e.stopPropagation();
|
|
||||||
updateReferrerPolicy(a);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {URL|HTMLHyperlinkElementUtils} a
|
|
||||||
* @returns {String} the real URL if the given link is a Google redirect URL.
|
|
||||||
*/
|
|
||||||
function getRealLinkFromGoogleUrl(a) {
|
|
||||||
if (a.protocol !== 'https:' && a.protocol !== 'http:') {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var url;
|
|
||||||
if ((a.hostname === location.hostname || a.hostname === 'www.google.com') &&
|
|
||||||
(a.pathname === '/url' || a.pathname === '/local_url' ||
|
|
||||||
a.pathname === '/searchurl/rr.html' ||
|
|
||||||
a.pathname === '/linkredirect')) {
|
|
||||||
// Google Maps / Dito (/local_url?q=<url>)
|
|
||||||
// Mobile (/url?q=<url>)
|
|
||||||
// Google Meet's chat (/linkredirect?authuser=0&dest=<url>)
|
|
||||||
url = /[?&](?:q|url|dest)=((?:https?|ftp)[%:][^&]+)/.exec(a.search);
|
|
||||||
if (url) {
|
|
||||||
return decodeURIComponent(url[1]);
|
|
||||||
}
|
|
||||||
// Help pages, e.g. safe browsing (/url?...&q=%2Fsupport%2Fanswer...)
|
|
||||||
url = /[?&](?:q|url)=((?:%2[Ff]|\/)[^&]+)/.exec(a.search);
|
|
||||||
if (url) {
|
|
||||||
return a.origin + decodeURIComponent(url[1]);
|
|
||||||
}
|
|
||||||
// Redirect pages for Android intents (/searchurl/rr.html#...&url=...)
|
|
||||||
// rr.html only supports http(s). So restrict to http(s) only.
|
|
||||||
url = /[#&]url=(https?[:%][^&]+)/.exec(a.hash);
|
|
||||||
if (url) {
|
|
||||||
return decodeURIComponent(url[1]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Google Search with old mobile UA (e.g. Firefox 41).
|
|
||||||
if (a.hostname === 'googleweblight.com' && a.pathname === '/fp') {
|
|
||||||
url = /[?&]u=((?:https?|ftp)[%:][^&]+)/.exec(a.search);
|
|
||||||
if (url) {
|
|
||||||
return decodeURIComponent(url[1]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {string} intentUrl
|
|
||||||
* @returns {string|undefined} The sanitized intent:-URL if it was an intent URL
|
|
||||||
* with embedded tracking link.
|
|
||||||
*/
|
|
||||||
function getSanitizedIntentUrl(intentUrl) {
|
|
||||||
if (!intentUrl.startsWith('intent:')) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// https://developer.chrome.com/multidevice/android/intents#syntax
|
|
||||||
var BROWSER_FALLBACK_URL = ';S.browser_fallback_url=';
|
|
||||||
var indexStart = intentUrl.indexOf(BROWSER_FALLBACK_URL);
|
|
||||||
if (indexStart === -1) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
indexStart += BROWSER_FALLBACK_URL.length;
|
|
||||||
var indexEnd = intentUrl.indexOf(';', indexStart);
|
|
||||||
indexEnd = indexEnd === -1 ? intentUrl.length : indexEnd;
|
|
||||||
|
|
||||||
var url = decodeURIComponent(intentUrl.substring(indexStart, indexEnd));
|
|
||||||
var realUrl = getRealLinkFromGoogleUrl(newURL(url));
|
|
||||||
if (!realUrl) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
return intentUrl.substring(0, indexStart) +
|
|
||||||
encodeURIComponent(realUrl) +
|
|
||||||
intentUrl.substring(indexEnd);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Intercept the .href setter in the page so that the page can never change the
|
|
||||||
* URL to a tracking URL. Just intercepting mousedown/touchstart is not enough
|
|
||||||
* because e.g. on Google Maps, the page rewrites the URL in the contextmenu
|
|
||||||
* event at the bubbling event stage and then stops the event propagation. So
|
|
||||||
* there is no event-driven way to fix the URL. The DOMAttrModified event could
|
|
||||||
* be used, but the event is deprecated, so not a viable long-term solution.
|
|
||||||
*/
|
|
||||||
function setupAggresiveUglyLinkPreventer() {
|
|
||||||
// This content script runs as document_start, so we can have some assurance
|
|
||||||
// that the methods in the page are reliable.
|
|
||||||
var s = document.createElement('script');
|
|
||||||
if (getScriptCspNonce()) {
|
|
||||||
s.setAttribute('nonce', scriptCspNonce);
|
|
||||||
} else if (document.readyState !== 'complete' && needsCspNonce) {
|
|
||||||
// In Firefox, a page's CSP is enforced for content scripts, so we need
|
|
||||||
// to wait for the document to be loaded (we may be at document_start)
|
|
||||||
// and find a fitting CSP nonce.
|
|
||||||
findScriptCspNonce(setupAggresiveUglyLinkPreventer);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
s.textContent = '(' + function(getRealLinkFromGoogleUrl) {
|
|
||||||
var proto = HTMLAnchorElement.prototype;
|
|
||||||
// The link target can be changed in many ways, but let's only consider
|
|
||||||
// the .href attribute since it's probably the only used setter.
|
|
||||||
var hrefProp = Object.getOwnPropertyDescriptor(proto, 'href');
|
|
||||||
var hrefGet = Function.prototype.call.bind(hrefProp.get);
|
|
||||||
var hrefSet = Function.prototype.call.bind(hrefProp.set);
|
|
||||||
|
|
||||||
Object.defineProperty(proto, 'href', {
|
|
||||||
configurable: true,
|
|
||||||
enumerable: true,
|
|
||||||
get() {
|
|
||||||
return hrefGet(this);
|
|
||||||
},
|
|
||||||
set(v) {
|
|
||||||
hrefSet(this, v);
|
|
||||||
try {
|
|
||||||
v = getRealLinkFromGoogleUrl(this);
|
|
||||||
if (v) {
|
|
||||||
hrefSet(this, v);
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
// Not expected to happen, but don't break the setter if for
|
|
||||||
// some reason the (hostile) page broke the link APIs.
|
|
||||||
}
|
|
||||||
updateReferrerPolicy(this);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
function replaceAMethod(methodName, methodFunc) {
|
|
||||||
// Overwrite the methods without triggering setters, because that
|
|
||||||
// may inadvertently overwrite the prototype, as observed in
|
|
||||||
// https://github.com/Rob--W/dont-track-me-google/issues/52#issuecomment-1596207655
|
|
||||||
Object.defineProperty(proto, methodName, {
|
|
||||||
configurable: true,
|
|
||||||
// All methods that we are overriding are not part of
|
|
||||||
// HTMLAnchorElement.prototype, but inherit.
|
|
||||||
enumerable: false,
|
|
||||||
writable: true,
|
|
||||||
value: methodFunc,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// proto inherits Element.prototype.setAttribute:
|
|
||||||
var setAttribute = Function.prototype.call.bind(proto.setAttribute);
|
|
||||||
replaceAMethod('setAttribute', function(name, value) {
|
|
||||||
// Attribute names are not case-sensitive, but weird capitalizations
|
|
||||||
// are unlikely, so only check all-lowercase and all-uppercase.
|
|
||||||
if (name === 'href' || name === 'HREF') {
|
|
||||||
this.href = value;
|
|
||||||
} else {
|
|
||||||
setAttribute(this, name, value);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// proto inherits EventTarget.prototype.dispatchEvent:
|
|
||||||
var aDispatchEvent = Function.prototype.apply.bind(proto.dispatchEvent);
|
|
||||||
replaceAMethod('dispatchEvent', function() {
|
|
||||||
updateReferrerPolicy(this);
|
|
||||||
return aDispatchEvent(this, arguments);
|
|
||||||
});
|
|
||||||
|
|
||||||
// proto inherits HTMLElement.prototype.click:
|
|
||||||
var aClick = Function.prototype.apply.bind(proto.click);
|
|
||||||
replaceAMethod('click', function() {
|
|
||||||
updateReferrerPolicy(this);
|
|
||||||
return aClick(this, arguments);
|
|
||||||
});
|
|
||||||
|
|
||||||
var rpProp = Object.getOwnPropertyDescriptor(proto, 'referrerPolicy');
|
|
||||||
var rpGet = Function.prototype.call.bind(rpProp.get);
|
|
||||||
var rpSet = Function.prototype.call.bind(rpProp.set);
|
|
||||||
|
|
||||||
var currentScript = document.currentScript;
|
|
||||||
var getReferrerPolicy = Object.getOwnPropertyDescriptor(
|
|
||||||
HTMLScriptElement.prototype,
|
|
||||||
'referrerPolicy'
|
|
||||||
).get.bind(currentScript);
|
|
||||||
|
|
||||||
function updateReferrerPolicy(a) {
|
|
||||||
try {
|
|
||||||
if (rpGet(a) === 'no-referrer') {
|
|
||||||
// "no-referrer" is more privacy-friendly than "origin".
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var referrerPolicy = getReferrerPolicy();
|
|
||||||
if (referrerPolicy) {
|
|
||||||
rpSet(a, referrerPolicy);
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
// Not expected to happen, but don't break callers if it happens
|
|
||||||
// anyway.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
currentScript.dataset.jsEnabled = 1;
|
|
||||||
} + ')(' + getRealLinkFromGoogleUrl + ');';
|
|
||||||
callImmediatelyAndOnPreferenceUpdate(function forceNoReferrerChanged() {
|
|
||||||
// Send the desired referrerPolicy value to the injected script.
|
|
||||||
s.referrerPolicy = getReferrerPolicy();
|
|
||||||
});
|
|
||||||
(document.head || document.documentElement).appendChild(s);
|
|
||||||
s.remove();
|
|
||||||
if (!s.dataset.jsEnabled) {
|
|
||||||
cleanLinksWhenJsIsDisabled();
|
|
||||||
if (!needsCspNonce) {
|
|
||||||
needsCspNonce = true;
|
|
||||||
// This is not Firefox, but the script was blocked. Perhaps a CSP
|
|
||||||
// nonce is needed anyway.
|
|
||||||
findScriptCspNonce(function() {
|
|
||||||
if (scriptCspNonce) {
|
|
||||||
setupAggresiveUglyLinkPreventer();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Scripts enabled (not blocked by CSP), run other inline scripts.
|
|
||||||
blockTrackingBeacons();
|
|
||||||
overwriteWindowOpen();
|
|
||||||
|
|
||||||
if (location.hostname === 'docs.google.com') {
|
|
||||||
// Google Docs have simple non-JS interfaces where the ugly links
|
|
||||||
// are hard-coded in the HTML. Remove them (#51).
|
|
||||||
// https://docs.google.com/document/d/.../mobilebasic
|
|
||||||
// https://docs.google.com/spreadsheets/d/.../htmlview
|
|
||||||
cleanLinksWhenJsIsDisabled();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Block sendBeacon requests with destination /gen_204, because Google
|
|
||||||
// asynchronously sends beacon requests in response to mouse events on links:
|
|
||||||
// https://github.com/Rob--W/dont-track-me-google/issues/20
|
|
||||||
//
|
|
||||||
// This implementation also blocks other forms of tracking via gen_204 as a side
|
|
||||||
// effect. That is not fully intentional, but given the lack of obvious ways to
|
|
||||||
// discern such link-tracking events from others, I will block all of them.
|
|
||||||
function blockTrackingBeacons() {
|
|
||||||
var s = document.createElement('script');
|
|
||||||
if (getScriptCspNonce()) {
|
|
||||||
s.setAttribute('nonce', scriptCspNonce);
|
|
||||||
}
|
|
||||||
s.textContent = '(' + function() {
|
|
||||||
var navProto = window.Navigator.prototype;
|
|
||||||
var navProtoSendBeacon = navProto.sendBeacon;
|
|
||||||
if (!navProtoSendBeacon) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var sendBeacon = Function.prototype.apply.bind(navProtoSendBeacon);
|
|
||||||
|
|
||||||
// Blocks the following:
|
|
||||||
// gen_204
|
|
||||||
// /gen_204
|
|
||||||
// https://www.google.com/gen_204
|
|
||||||
var isTrackingUrl = RegExp.prototype.test.bind(
|
|
||||||
/^(?:(?:https?:\/\/[^\/]+)?\/)?gen_204(?:[?#]|$)/);
|
|
||||||
|
|
||||||
navProto.sendBeacon = function(url, data) {
|
|
||||||
if (isTrackingUrl(url) && isNoPingEnabled()) {
|
|
||||||
// Lie that the data has been transmitted to avoid fallbacks.
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return sendBeacon(this, arguments);
|
|
||||||
};
|
|
||||||
|
|
||||||
var currentScript = document.currentScript;
|
|
||||||
var getElementId = Object.getOwnPropertyDescriptor(
|
|
||||||
Element.prototype,
|
|
||||||
'id'
|
|
||||||
).get.bind(currentScript);
|
|
||||||
function isNoPingEnabled() {
|
|
||||||
try {
|
|
||||||
return getElementId() !== '_dtmg_do_not_touch_ping';
|
|
||||||
} catch (e) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} + ')();';
|
|
||||||
callImmediatelyAndOnPreferenceUpdate(function nopingChanged() {
|
|
||||||
// Send the noping value to the injected script. The "id" property is
|
|
||||||
// mirrored and can have an arbitrary (string) value, so we use that:
|
|
||||||
s.id = noping ? '' : '_dtmg_do_not_touch_ping';
|
|
||||||
});
|
|
||||||
(document.head || document.documentElement).appendChild(s);
|
|
||||||
s.remove();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Google sometimes uses window.open() to open ugly links.
|
|
||||||
// https://github.com/Rob--W/dont-track-me-google/issues/18
|
|
||||||
// https://github.com/Rob--W/dont-track-me-google/issues/41
|
|
||||||
function overwriteWindowOpen() {
|
|
||||||
var s = document.createElement('script');
|
|
||||||
if (getScriptCspNonce()) {
|
|
||||||
s.setAttribute('nonce', scriptCspNonce);
|
|
||||||
}
|
|
||||||
s.textContent = '(' + function() {
|
|
||||||
var open = window.open;
|
|
||||||
window.open = function(url, windowName, windowFeatures) {
|
|
||||||
var isBlankUrl = !url || url === "about:blank";
|
|
||||||
try {
|
|
||||||
if (!isBlankUrl) {
|
|
||||||
var a = document.createElement('a');
|
|
||||||
// Triggers getRealLinkFromGoogleUrl via the href setter in
|
|
||||||
// setupAggresiveUglyLinkPreventer.
|
|
||||||
a.href = url;
|
|
||||||
url = a.href;
|
|
||||||
// The origin check exists to avoid adding "noreferrer" to
|
|
||||||
// same-origin popups. That implies noopener and causes
|
|
||||||
// https://github.com/Rob--W/dont-track-me-google/issues/43
|
|
||||||
// And allow any Google domain to support auth popups:
|
|
||||||
// https://github.com/Rob--W/dont-track-me-google/issues/45
|
|
||||||
// And don't bother editing the list if it already contains
|
|
||||||
// "opener" (it would be disabled by "noreferrer").
|
|
||||||
if (a.referrerPolicy && a.origin !== location.origin &&
|
|
||||||
!/\.google\.([a-z]+)$/.test(a.hostname) &&
|
|
||||||
!/\bopener|noreferrer/.test(windowFeatures)) {
|
|
||||||
if (windowFeatures) {
|
|
||||||
windowFeatures += ',';
|
|
||||||
} else {
|
|
||||||
windowFeatures = '';
|
|
||||||
}
|
|
||||||
windowFeatures += 'noreferrer';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
// Not expected to happen, but don't break callers if it does.
|
|
||||||
}
|
|
||||||
var win = open(url, windowName, windowFeatures);
|
|
||||||
try {
|
|
||||||
if (isBlankUrl && win) {
|
|
||||||
// In Google Docs, sometimes a blank document is opened,
|
|
||||||
// and document.write is used to insert a redirector.
|
|
||||||
// https://github.com/Rob--W/dont-track-me-google/issues/41
|
|
||||||
var doc = win.document;
|
|
||||||
var docWrite = win.Function.prototype.call.bind(doc.write);
|
|
||||||
doc.write = function(markup) {
|
|
||||||
try {
|
|
||||||
markup = fixupDocMarkup(markup);
|
|
||||||
} catch (e) {
|
|
||||||
// Not expected, but don't break callers otherwise.
|
|
||||||
}
|
|
||||||
return docWrite(this, markup);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
// Not expected to happen, but don't break callers if it does.
|
|
||||||
}
|
|
||||||
return win;
|
|
||||||
};
|
|
||||||
function fixupDocMarkup(html) {
|
|
||||||
html = html || '';
|
|
||||||
html += '';
|
|
||||||
return html.replace(
|
|
||||||
/<meta [^>]*http-equiv=(["']?)refresh\1[^>]*>/i,
|
|
||||||
function(m) {
|
|
||||||
var doc = new DOMParser().parseFromString(m, 'text/html');
|
|
||||||
var meta = doc.querySelector('meta[http-equiv=refresh]');
|
|
||||||
return meta && fixupMetaUrl(meta) || m;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
function fixupMetaUrl(meta) {
|
|
||||||
var parts = /^(\d*;\s*url=)(.+)$/i.exec(meta.content);
|
|
||||||
if (!parts) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var metaPrefix = parts[1];
|
|
||||||
var url = parts[2];
|
|
||||||
var a = document.createElement('a');
|
|
||||||
// Triggers getRealLinkFromGoogleUrl via the href setter in
|
|
||||||
// setupAggresiveUglyLinkPreventer.
|
|
||||||
a.href = url;
|
|
||||||
url = a.href;
|
|
||||||
meta.content = metaPrefix + url;
|
|
||||||
|
|
||||||
var html = meta.outerHTML;
|
|
||||||
if (a.referrerPolicy) {
|
|
||||||
// Google appears to already append the no-referrer
|
|
||||||
// meta tag, but add one just in case it doesn't.
|
|
||||||
html = '<meta name="referrer" content="no-referrer">' + html;
|
|
||||||
}
|
|
||||||
return html;
|
|
||||||
}
|
|
||||||
} + ')();';
|
|
||||||
(document.head || document.documentElement).appendChild(s);
|
|
||||||
s.remove();
|
|
||||||
}
|
|
||||||
|
|
||||||
function cleanLinksWhenJsIsDisabled() {
|
|
||||||
// When JavaScript is disabled, Google sets the "href" attribute's value to
|
|
||||||
// an ugly URL. Although the link is rewritten on click, we still need to
|
|
||||||
// rewrite the link even earlier because otherwise the ugly URL is shown in
|
|
||||||
// the tooltip upon hover.
|
|
||||||
|
|
||||||
if (document.readyState == 'complete') {
|
|
||||||
cleanAllLinks();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// When JS is disabled, the links won't change after the document finishes
|
|
||||||
// loading. Until the DOM has finished loading, use the mouseover event to
|
|
||||||
// beautify links (the DOMContentLoaded may be delayed on slow networks).
|
|
||||||
document.addEventListener('mouseover', handleMouseOver);
|
|
||||||
document.addEventListener('DOMContentLoaded', function() {
|
|
||||||
document.removeEventListener('mouseover', handleMouseOver);
|
|
||||||
cleanAllLinks();
|
|
||||||
}, {once: true});
|
|
||||||
|
|
||||||
function cleanAllLinks() {
|
|
||||||
var as = document.querySelectorAll('a[href]');
|
|
||||||
for (var i = 0; i < as.length; ++i) {
|
|
||||||
var href = getRealLinkFromGoogleUrl(as[i]);
|
|
||||||
if (href) {
|
|
||||||
as[i].href = href;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleMouseOver(e) {
|
|
||||||
var a = e.target;
|
|
||||||
var href = a.href && getRealLinkFromGoogleUrl(a);
|
|
||||||
if (href) {
|
|
||||||
a.href = href;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getScriptCspNonce() {
|
|
||||||
var scripts = document.querySelectorAll('script[nonce]');
|
|
||||||
for (var i = 0; i < scripts.length && !scriptCspNonce; ++i) {
|
|
||||||
scriptCspNonce = scripts[i].nonce;
|
|
||||||
}
|
|
||||||
return scriptCspNonce;
|
|
||||||
}
|
|
||||||
|
|
||||||
function findScriptCspNonce(callback) {
|
|
||||||
var timer;
|
|
||||||
function checkDOM() {
|
|
||||||
if (getScriptCspNonce() || document.readyState === 'complete') {
|
|
||||||
document.removeEventListener('DOMContentLoaded', checkDOM, true);
|
|
||||||
if (timer) {
|
|
||||||
clearTimeout(timer);
|
|
||||||
}
|
|
||||||
callback();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
timer = setTimeout(checkDOM, 50);
|
|
||||||
}
|
|
||||||
document.addEventListener('DOMContentLoaded', checkDOM, true);
|
|
||||||
checkDOM();
|
|
||||||
}
|
|
||||||
|
|
||||||
function newURL(href) {
|
|
||||||
try {
|
|
||||||
return new URL(href);
|
|
||||||
} catch (e) {
|
|
||||||
var a = document.createElement('a');
|
|
||||||
a.href = href;
|
|
||||||
return a;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,984 +0,0 @@
|
|||||||
// ==UserScript==
|
|
||||||
// @name I don't care about cookies
|
|
||||||
// @name:vi Tôi không quan tâm về cookie
|
|
||||||
// @name:zh-CN 我不关心cookie
|
|
||||||
// @name:zh-TW 我不關心cookie
|
|
||||||
// @name:ja クッキーについては気にしない
|
|
||||||
// @name:ru Я не забочусь о куки
|
|
||||||
// @namespace http://tampermonkey.net/
|
|
||||||
// @version 2025.01.03.2
|
|
||||||
// @description Remove cookie warnings from almost all websites! Auto accept cookies and remove annoying cookie popups
|
|
||||||
// @description:vi Loại bỏ cảnh báo cookie từ hầu hết các trang web! Tự động chấp nhận cookie và xóa các popup cookie phiền phức
|
|
||||||
// @description:zh-CN 自动接受cookie并移除烦人的cookie弹窗
|
|
||||||
// @description:zh-TW 自動接受cookie並移除煩人的cookie彈窗
|
|
||||||
// @description:ru Автоматическое принятие cookie и удаление надоедливых всплывающих окон
|
|
||||||
// @description:ja 自動承認cookieと迷惑なポップアップを削除
|
|
||||||
// @author Yuusei
|
|
||||||
// @match *://*/*
|
|
||||||
// @grant none
|
|
||||||
// @icon https://lh3.googleusercontent.com/sCLTYpGX0VcVootQ_XaFQ9saRIhVWu79ngSzY5eTZ5evRpJ_Q27OdvxA4RrOoZXP7Q4enFh-u6VhxObcJLfARw1g=s60
|
|
||||||
// @compatible chrome
|
|
||||||
// @compatible edge
|
|
||||||
// @compatible firefox
|
|
||||||
// @compatible safari
|
|
||||||
// @run-at document-start
|
|
||||||
// @license gpl-3.0-only
|
|
||||||
// @downloadURL https://update.greasyfork.org/scripts/522645/I%20don%27t%20care%20about%20cookies.user.js
|
|
||||||
// @updateURL https://update.greasyfork.org/scripts/522645/I%20don%27t%20care%20about%20cookies.meta.js
|
|
||||||
// ==/UserScript==
|
|
||||||
|
|
||||||
(function () {
|
|
||||||
'use strict';
|
|
||||||
|
|
||||||
const CONSENT_TEXTS = {
|
|
||||||
en: ['accept', 'accept all', 'agree', 'continue', 'got it', 'reject all', 'decline', 'necessary only', 'required only', 'manage', 'customize'],
|
|
||||||
vi: ['chấp nhận', 'chấp nhận tất cả', 'đồng ý', 'tiếp tục', 'từ chối tất cả', 'từ chối', 'chỉ cần thiết', 'tùy chỉnh', 'quản lý', 'cho phép', 'đồng ý và tiếp tục', 'tôi đồng ý', 'xác nhận', 'tôi chấp nhận', 'đồng ý tất cả', 'chấp nhận và tiếp tục', 'cho phép tất cả'],
|
|
||||||
zh: ['接受', '接受全部', '同意', '继续', '拒绝全部', '拒绝', '仅必要', '管理', '自定义'],
|
|
||||||
ru: ['принять', 'принять все', 'согласен', 'продолжить', 'отклонить все', 'отклонить', 'только необходимые', 'настроить', 'управлять'],
|
|
||||||
ja: ['承認', '同意', '続ける', 'すべて拒否', '拒否', '必要のみ', 'カスタマイズ', '管理'],
|
|
||||||
de: ['akzeptieren', 'einverstanden', 'fortfahren', 'alle ablehnen', 'ablehnen', 'nur notwendige', 'anpassen', 'verwalten'],
|
|
||||||
fr: ['accepter', 'accepter tout', 'accepte', 'continuer', 'tout refuser', 'refuser', 'uniquement nécessaire', 'personnaliser', 'gérer'],
|
|
||||||
es: ['aceptar', 'acepto todo', 'acepto', 'continuar', 'rechazar todo', 'rechazar', 'solo necesario', 'personalizar', 'gestionar'],
|
|
||||||
it: ['accetta', 'accetto tutto', 'accetto', 'continua', 'rifiuta tutto', 'rifiuta', 'solo necessari', 'personalizza', 'gestisci'],
|
|
||||||
pl: ['akceptuj', 'akceptuj wszystko', 'zgadzam się', 'kontynuuj', 'odrzuć wszystko', 'odrzuć', 'tylko niezbędne', 'dostosuj', 'zarządzaj'],
|
|
||||||
nl: ['accepteren', 'accepteren', 'doorgaan', 'alles weigeren', 'weigeren', 'alleen noodzakelijk', 'aanpassen', 'beheren'],
|
|
||||||
ko: ['동의', '모두 동의', '계속하기', '모두 거부', '거부', '필수만', '설정', '관리'],
|
|
||||||
th: ['ยอมรับ', 'ยอมรับทั้งหมด', 'ตกลง', 'ปฏิเสธทั้งหมด', 'ปฏิเสธ', 'จำเป็นเท่านั้น', 'ตั้งค่า', 'จัดการ'],
|
|
||||||
id: ['setuju', 'setuju semua', 'lanjutkan', 'tolak semua', 'tolak', 'wajib saja', 'pengaturan', 'kelola'],
|
|
||||||
ms: ['terima', 'terima semua', 'teruskan', 'tolak semua', 'tolak', 'perlu sahaja', 'tetapan', 'urus'],
|
|
||||||
pt: ['aceitar', 'aceitar tudo', 'continuar', 'rejeitar tudo', 'rejeitar', 'necessário', 'configurar', 'gerir'],
|
|
||||||
sv: ['godkänn', 'godkänn alla', 'fortsätt', 'neka alla', 'neka', 'nödvändiga', 'inställningar', 'hantera'],
|
|
||||||
da: ['accepter', 'accepter alle', 'fortsæt', 'afvis alle', 'afvis', 'nødvendige', 'indstillinger', 'administrer'],
|
|
||||||
fi: ['hyväksy', 'hyväksy kaikki', 'jatka', 'hylkää kaikki', 'hylkää', 'välttämätön', 'asetukset', 'hallitse'],
|
|
||||||
'zh-CN': ['接受', '接受全部', '同意', '继续', '我同意', '确定', '确认', '知道了', '好的', '拒绝全部', '拒绝', '仅必要', '设置', '自定义', '管理', '保存设置', '允许', '允许全部', '接受并继续', '同意并继续', '保存并继续'],
|
|
||||||
'zh-TW': ['接受', '接受全部', '同意', '繼續', '我同意', '確定', '確認', '知道了', '好的', '拒絕全部', '拒絕', '僅必要', '設置', '自定義', '管理', '保存設置', '允許', '允許全部', '接受並繼續', '同意並繼續', '保存並繼續'],
|
|
||||||
ko: ['동의', '모두 동의', '수락', '계속하기', '확인', '거부', '거부하기', '필수만', '설정', '관리', '저장', '허용', '모두 허용'],
|
|
||||||
th: ['ยอมรับ', 'ยอมรับทั้งหมด', 'ตกลง', 'ดำเนินการต่อ', 'ปฏิเสธ', 'ปฏิเสธทั้งหมด', 'จำเป็นเท่านั้น', 'ตั้งค่า', 'จัดการ', 'บันทึก', 'อนุญาต', 'อนุญาตทั้งหมด'],
|
|
||||||
id: ['terima', 'terima semua', 'setuju', 'lanjutkan', 'tolak', 'tolak semua', 'wajib saja', 'pengaturan', 'kelola', 'simpan', 'izinkan', 'izinkan semua'],
|
|
||||||
ms: ['terima', 'terima semua', 'setuju', 'teruskan', 'tolak', 'tolak semua', 'perlu sahaja', 'tetapan', 'urus', 'simpan', 'benarkan', 'benarkan semua'],
|
|
||||||
};
|
|
||||||
|
|
||||||
function matchesConsentText(element) {
|
|
||||||
const text = element.textContent.toLowerCase();
|
|
||||||
const lang = document.documentElement.lang || 'en';
|
|
||||||
const texts = CONSENT_TEXTS[lang.split('-')[0]] || CONSENT_TEXTS['en'];
|
|
||||||
return texts.some(t => text.includes(t));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Utility functions
|
|
||||||
function _sl(selector, container) {
|
|
||||||
return (container || document).querySelector(selector);
|
|
||||||
}
|
|
||||||
|
|
||||||
function _id(id) {
|
|
||||||
return document.getElementById(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
function _ev(selector, container, full) {
|
|
||||||
return document.evaluate((typeof full == 'undefined' ? '//' : '') + selector, container || document, null, XPathResult.ANY_TYPE, null).iterateNext();
|
|
||||||
}
|
|
||||||
|
|
||||||
function _if(condition, ...selectors) {
|
|
||||||
return _sl(condition) ? _chain(...selectors) : false;
|
|
||||||
}
|
|
||||||
|
|
||||||
function _if_else(condition, if_selectors, else_selectors) {
|
|
||||||
if (_sl(condition)) return _chain(...if_selectors);
|
|
||||||
|
|
||||||
return _chain(...else_selectors);
|
|
||||||
}
|
|
||||||
|
|
||||||
function _chain(...selectors) {
|
|
||||||
let elements,
|
|
||||||
l = selectors.length;
|
|
||||||
let flagUnique = false,
|
|
||||||
flagOptional = false,
|
|
||||||
flagAllMatches = false;
|
|
||||||
|
|
||||||
for (let i = currentChainElement; i < l; i++) {
|
|
||||||
if (/^FLAG\:/.test(selectors[i])) {
|
|
||||||
selectors[i]
|
|
||||||
.split(':')[1]
|
|
||||||
.split(',')
|
|
||||||
.forEach(function (flag) {
|
|
||||||
if (flag == 'UNIQUE') flagUnique = true;
|
|
||||||
else if (flag == 'OPTIONAL') flagOptional = true;
|
|
||||||
else if (flag == 'REQUIRED') flagOptional = false;
|
|
||||||
else if (flag == 'ALL-MATCHES') flagAllMatches = true;
|
|
||||||
else if (flag == 'SINGLE-MATCH') flagAllMatches = false;
|
|
||||||
});
|
|
||||||
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flagUnique) selectors[i] += selectors[i].startsWith('//') ? '[not(contains(@class, "' + classname + '"))]' : ':not(.' + classname + ')';
|
|
||||||
|
|
||||||
if (i == l - 1) return selectors[i];
|
|
||||||
|
|
||||||
elements = _sl(selectors[i], false, flagAllMatches);
|
|
||||||
|
|
||||||
if (!flagAllMatches) elements = elements ? [elements] : [];
|
|
||||||
|
|
||||||
if (!elements.length) {
|
|
||||||
if (flagOptional) {
|
|
||||||
currentChainElement++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
currentChainElement++;
|
|
||||||
|
|
||||||
elements.forEach(function (element) {
|
|
||||||
if (flagUnique) element.classList.add(classname);
|
|
||||||
|
|
||||||
if (element.nodeName == 'OPTION') element.selected = true;
|
|
||||||
else element.click();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
function getItem(hostname) {
|
|
||||||
switch (hostname) {
|
|
||||||
case 'youtube.com':
|
|
||||||
case 'www.youtube.com':
|
|
||||||
return { strict: true, key: 'CONSENT', value: 'PENDING+999' };
|
|
||||||
|
|
||||||
case 'google.com':
|
|
||||||
case 'www.google.com':
|
|
||||||
return { strict: true, key: 'CONSENT', value: 'YES+' };
|
|
||||||
|
|
||||||
case 'twitter.com':
|
|
||||||
case 'www.twitter.com':
|
|
||||||
return { strict: false, key: 'twtr_cookie_consent', value: '1' };
|
|
||||||
|
|
||||||
case 'pepephone.com':
|
|
||||||
case 'lyricsbox.com':
|
|
||||||
return { strict: true, key: 'cookieconsent', value: '1111' };
|
|
||||||
|
|
||||||
case 'kontaktbazar.at':
|
|
||||||
case 'hoernews.de':
|
|
||||||
return { strict: false, key: 'cookieconsent_status', value: 'dismiss' };
|
|
||||||
|
|
||||||
case 'vodafoneziggo.nl':
|
|
||||||
return { strict: false, key: 'cookies-accepted', value: 'true' };
|
|
||||||
case 'frankfurt.de':
|
|
||||||
return { strict: false, key: 'cookieAccepted', value: 'needed---piwik' };
|
|
||||||
case 'hackerrank.com':
|
|
||||||
return { strict: false, key: 'show_cookie_banner', value: 'false' };
|
|
||||||
|
|
||||||
case 'facebook.com':
|
|
||||||
case 'www.facebook.com':
|
|
||||||
return { strict: true, key: 'datr', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'instagram.com':
|
|
||||||
case 'www.instagram.com':
|
|
||||||
return { strict: true, key: 'ig_did', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'linkedin.com':
|
|
||||||
case 'www.linkedin.com':
|
|
||||||
return { strict: false, key: 'lidc', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'reddit.com':
|
|
||||||
case 'www.reddit.com':
|
|
||||||
return { strict: false, key: 'eu_cookie', value: '{"opted":true}' };
|
|
||||||
|
|
||||||
case 'tiktok.com':
|
|
||||||
case 'www.tiktok.com':
|
|
||||||
return { strict: true, key: 'tt_webid', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'netflix.com':
|
|
||||||
case 'www.netflix.com':
|
|
||||||
return { strict: false, key: 'netflix-cookie-consent', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'spotify.com':
|
|
||||||
case 'www.spotify.com':
|
|
||||||
return { strict: false, key: 'sp_dc', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'amazon.com':
|
|
||||||
case 'www.amazon.com':
|
|
||||||
return { strict: false, key: 'amazon-cookie-consent', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'pinterest.com':
|
|
||||||
case 'www.pinterest.com':
|
|
||||||
return { strict: false, key: '_pinterest_sess', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'twitch.tv':
|
|
||||||
case 'www.twitch.tv':
|
|
||||||
return { strict: false, key: 'twitch_cookie_consent', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'github.com':
|
|
||||||
case 'www.github.com':
|
|
||||||
return { strict: false, key: '_gh_sess', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'medium.com':
|
|
||||||
case 'www.medium.com':
|
|
||||||
return { strict: false, key: 'medium_cookie_consent', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'quora.com':
|
|
||||||
case 'www.quora.com':
|
|
||||||
return { strict: false, key: 'm-b', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'stackoverflow.com':
|
|
||||||
case 'www.stackoverflow.com':
|
|
||||||
return { strict: false, key: 'acct', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'microsoft.com':
|
|
||||||
case 'www.microsoft.com':
|
|
||||||
return { strict: false, key: 'MUID', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'apple.com':
|
|
||||||
case 'www.apple.com':
|
|
||||||
return { strict: false, key: 'geo', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'dropbox.com':
|
|
||||||
case 'www.dropbox.com':
|
|
||||||
return { strict: false, key: 'dbx-consent', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'booking.com':
|
|
||||||
case 'www.booking.com':
|
|
||||||
return { strict: false, key: 'bkng_consent', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'vnexpress.net':
|
|
||||||
case 'www.vnexpress.net':
|
|
||||||
return { strict: false, key: 'vnexpress_cookie_consent', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'thanhnien.vn':
|
|
||||||
case 'www.thanhnien.vn':
|
|
||||||
return { strict: false, key: 'thanhnien_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'tuoitre.vn':
|
|
||||||
case 'www.tuoitre.vn':
|
|
||||||
return { strict: false, key: 'tuoitre_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'tiki.vn':
|
|
||||||
case 'www.tiki.vn':
|
|
||||||
return { strict: false, key: 'tiki_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'shopee.vn':
|
|
||||||
case 'www.shopee.vn':
|
|
||||||
return { strict: false, key: 'shopee_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'lazada.vn':
|
|
||||||
case 'www.lazada.vn':
|
|
||||||
return { strict: false, key: 'lzd_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'sendo.vn':
|
|
||||||
case 'www.sendo.vn':
|
|
||||||
return { strict: false, key: 'sendo_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'thegioididong.com':
|
|
||||||
case 'www.thegioididong.com':
|
|
||||||
return { strict: false, key: 'tgdd_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'fptshop.com.vn':
|
|
||||||
case 'www.fptshop.com.vn':
|
|
||||||
return { strict: false, key: 'fpt_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'cellphones.com.vn':
|
|
||||||
case 'www.cellphones.com.vn':
|
|
||||||
return { strict: false, key: 'cps_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'aliexpress.com':
|
|
||||||
case 'www.aliexpress.com':
|
|
||||||
return { strict: false, key: 'aep_usuc_f', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'ebay.com':
|
|
||||||
case 'www.ebay.com':
|
|
||||||
return { strict: false, key: 'ebay_cookie_consent', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'coursera.org':
|
|
||||||
case 'www.coursera.org':
|
|
||||||
return { strict: false, key: 'coursera_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'udemy.com':
|
|
||||||
case 'www.udemy.com':
|
|
||||||
return { strict: false, key: 'ud_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'bachhoaxanh.com':
|
|
||||||
case 'www.bachhoaxanh.com':
|
|
||||||
return { strict: false, key: 'bhx_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'dienmayxanh.com':
|
|
||||||
case 'www.dienmayxanh.com':
|
|
||||||
return { strict: false, key: 'dmx_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'nguyenkim.com':
|
|
||||||
case 'www.nguyenkim.com':
|
|
||||||
return { strict: false, key: 'nk_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'dantri.com.vn':
|
|
||||||
case 'www.dantri.com.vn':
|
|
||||||
return { strict: false, key: 'dantri_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'vietnamnet.vn':
|
|
||||||
case 'www.vietnamnet.vn':
|
|
||||||
return { strict: false, key: 'vietnamnet_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case '24h.com.vn':
|
|
||||||
case 'www.24h.com.vn':
|
|
||||||
return { strict: false, key: '24h_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'vietcombank.com.vn':
|
|
||||||
case 'www.vietcombank.com.vn':
|
|
||||||
return { strict: false, key: 'vcb_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'techcombank.com.vn':
|
|
||||||
case 'www.techcombank.com.vn':
|
|
||||||
return { strict: false, key: 'tcb_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'mbbank.com.vn':
|
|
||||||
case 'www.mbbank.com.vn':
|
|
||||||
return { strict: false, key: 'mb_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'amazon.co.jp':
|
|
||||||
case 'www.amazon.co.jp':
|
|
||||||
return { strict: false, key: 'amazon_jp_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'rakuten.co.jp':
|
|
||||||
case 'www.rakuten.co.jp':
|
|
||||||
return { strict: false, key: 'rakuten_jp_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'taobao.com':
|
|
||||||
case 'www.taobao.com':
|
|
||||||
return { strict: false, key: 'taobao_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'line.me':
|
|
||||||
case 'www.line.me':
|
|
||||||
return { strict: false, key: 'line_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'weibo.com':
|
|
||||||
case 'www.weibo.com':
|
|
||||||
return { strict: false, key: 'weibo_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'kakao.com':
|
|
||||||
case 'www.kakao.com':
|
|
||||||
return { strict: false, key: 'kakao_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'yahoo.co.jp':
|
|
||||||
case 'www.yahoo.co.jp':
|
|
||||||
return { strict: false, key: 'yahoo_jp_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'naver.com':
|
|
||||||
case 'www.naver.com':
|
|
||||||
return { strict: false, key: 'naver_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'baidu.com':
|
|
||||||
case 'www.baidu.com':
|
|
||||||
return { strict: false, key: 'baidu_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'zalando.com':
|
|
||||||
case 'www.zalando.com':
|
|
||||||
return { strict: false, key: 'zalando_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'asos.com':
|
|
||||||
case 'www.asos.com':
|
|
||||||
return { strict: false, key: 'asos_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'zara.com':
|
|
||||||
case 'www.zara.com':
|
|
||||||
return { strict: false, key: 'zara_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'tmall.com':
|
|
||||||
case 'www.tmall.com':
|
|
||||||
return { strict: false, key: 'tmall_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'jd.com':
|
|
||||||
case 'www.jd.com':
|
|
||||||
return { strict: false, key: 'jd_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'sina.com.cn':
|
|
||||||
case 'www.sina.com.cn':
|
|
||||||
return { strict: false, key: 'sina_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'qq.com':
|
|
||||||
case 'www.qq.com':
|
|
||||||
return { strict: false, key: 'qq_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case '163.com':
|
|
||||||
case 'www.163.com':
|
|
||||||
return { strict: false, key: 'netease_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'sohu.com':
|
|
||||||
case 'www.sohu.com':
|
|
||||||
return { strict: false, key: 'sohu_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'bilibili.com':
|
|
||||||
case 'www.bilibili.com':
|
|
||||||
return { strict: false, key: 'bilibili_cookie', value: 'accepted' };
|
|
||||||
}
|
|
||||||
|
|
||||||
const parts = hostname.split('.');
|
|
||||||
if (parts.length > 2) {
|
|
||||||
parts.shift();
|
|
||||||
return getItem(parts.join('.'));
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
function _parent(element) {
|
|
||||||
if (element && element.parentNode) return element.parentNode;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
function _iframe(iframe_selector, selector) {
|
|
||||||
var e = _sl(iframe_selector);
|
|
||||||
return e ? _sl(selector, e.contentDocument || e.contentWindow.contentDocument) : e;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Cookie consent handling logic
|
|
||||||
let searchPairs = {
|
|
||||||
'.vn-cookie-banner': ['.vn-cookie-banner__reject', '.vn-cookie-banner__customize'],
|
|
||||||
'.vn-cookie-notice': ['.vn-cookie-notice__reject', '.vn-cookie-notice__settings'],
|
|
||||||
'.vn-cookie-consent': ['.vn-cookie-consent__reject', '.vn-cookie-consent__customize'],
|
|
||||||
'.vn-cookie-popup': ['.vn-cookie-popup__reject', '.vn-cookie-popup__settings'],
|
|
||||||
|
|
||||||
'.shopee-cookie-banner': ['.shopee-cookie-banner__reject', '.shopee-cookie-banner__settings'],
|
|
||||||
'.lazada-cookie-notice': ['.lazada-cookie-notice__reject', '.lazada-cookie-notice__settings'],
|
|
||||||
'.tiki-cookie-popup': ['.tiki-cookie-popup__reject', '.tiki-cookie-popup__settings'],
|
|
||||||
'.sendo-cookie-consent': ['.sendo-cookie-consent__reject', '.sendo-cookie-consent__settings'],
|
|
||||||
|
|
||||||
'.vnexpress-cookie': ['.vnexpress-cookie__reject', '.vnexpress-cookie__settings'],
|
|
||||||
'.tuoitre-cookie': ['.tuoitre-cookie__reject', '.tuoitre-cookie__settings'],
|
|
||||||
'.thanhnien-cookie': ['.thanhnien-cookie__reject', '.thanhnien-cookie__settings'],
|
|
||||||
'.dantri-cookie': ['.dantri-cookie__reject', '.dantri-cookie__settings'],
|
|
||||||
|
|
||||||
'.tgdd-cookie-notice': ['.tgdd-cookie-notice__reject', '.tgdd-cookie-notice__settings'],
|
|
||||||
'.fpt-cookie-popup': ['.fpt-cookie-popup__reject', '.fpt-cookie-popup__settings'],
|
|
||||||
'.cps-cookie-consent': ['.cps-cookie-consent__reject', '.cps-cookie-consent__settings'],
|
|
||||||
|
|
||||||
'.vcb-cookie-notice': ['.vcb-cookie-notice__reject', '.vcb-cookie-notice__settings'],
|
|
||||||
'.tcb-cookie-popup': ['.tcb-cookie-popup__reject', '.tcb-cookie-popup__settings'],
|
|
||||||
'.mb-cookie-consent': ['.mb-cookie-consent__reject', '.mb-cookie-consent__settings'],
|
|
||||||
|
|
||||||
'div[class*="consent"]': ['button[class*="reject"]', 'button[class*="decline"]', 'button[class*="settings"]'],
|
|
||||||
'div[class*="notice"]': ['button[class*="reject"]', 'button[class*="decline"]', 'button[class*="settings"]'],
|
|
||||||
'div[class*="popup"]': ['button[class*="reject"]', 'button[class*="decline"]', 'button[class*="settings"]'],
|
|
||||||
'div[class*="banner"]': ['button[class*="reject"]', 'button[class*="decline"]', 'button[class*="settings"]'],
|
|
||||||
};
|
|
||||||
|
|
||||||
let searchGroups = [
|
|
||||||
'.qc-cmp2-summary-buttons button[mode="secondary"],\
|
|
||||||
.qc-cmp2-buttons-desktop > button:first-child,\
|
|
||||||
#didomi-popup .didomi-button-highlight:not([class*="paywall"]):not([class*="disagree"]),\
|
|
||||||
#rgpd_video .rgpd-mask a[data-rgpd-consent],\
|
|
||||||
.cli-barmodal-open #wt-cli-privacy-save-btn,\
|
|
||||||
.js--modal[style*="block"] .cookie-permission--accept-button,\
|
|
||||||
.gdpr-modal-rider .btn-cookieaccept,\
|
|
||||||
.js-cookiewall #sel-test-accept-cookies-button,\
|
|
||||||
#mpo[style*="block"] .submit.modal-privacy__btn[onclick*="privacyframe.accept"],\
|
|
||||||
.lightbox--cookie-consent .btn-cta,\
|
|
||||||
.lightbox.cookie-consent .cookie-consent-button-decline,\
|
|
||||||
.js-modal-gdpr.is-active .btn[data-level="2"],\
|
|
||||||
#CybotCookiebotDialogBodyLevelButtonLevelOptinAllowallSelection,\
|
|
||||||
#cookieNotificationModal.in .btn.accept-cookie,\
|
|
||||||
.has-ccwindow .cc-compliance .cc-dismiss,\
|
|
||||||
.ds2-cookie-disclaimer--slidedown .ds2-cookie-disclaimer-js--submit,\
|
|
||||||
#mdlCookieCompliance.in .cookieClose,\
|
|
||||||
#cookieModal.in .js-acceptDefaultCookie,\
|
|
||||||
.c-cookiebutton .c-cookiebutton__close,\
|
|
||||||
#normativa_cookies.in .btn,\
|
|
||||||
#cookiewall.in .btn-primary,\
|
|
||||||
.outerCookieBar .EuCookieBar__cookieButton,\
|
|
||||||
#TOS-POPUP .rhododendron-popup__button--agree,\
|
|
||||||
#cookie-wall #accept-cookies,\
|
|
||||||
#popup-wrapper .button[href*="/cookies.consent.php"],\
|
|
||||||
.reveal.cookies[style*="block"] button[click*="aceptaCookies"],\
|
|
||||||
.mnd-cookie-modal[style*="block"] .btn.is--primary,\
|
|
||||||
.cookieHandler.cookieHandler--modalOpen #acceptAllCookies,\
|
|
||||||
.gdpr-modal--active .btn--primary,\
|
|
||||||
#dpi-banner:not(.hidden) #btn-agree-cookie,\
|
|
||||||
.gh-banner.gh-banner-active #gh-cookiebanner-close,\
|
|
||||||
#mrktpref.notification-bar .btn-success,\
|
|
||||||
#PopinGDPRCookie[style*="block"] .jsbd-popin-ok,\
|
|
||||||
#modal-rodo.in .btn-primary,\
|
|
||||||
.cookie-compliance-modal.in .btn-primary,\
|
|
||||||
.cookieconsent.show .btn[data-dm*="accept"],\
|
|
||||||
.cookie-wall-modal.in .btn.ja,\
|
|
||||||
#modal-consent.in .modal-consent-accept,\
|
|
||||||
.rodo #cookies.in .btn-primary,\
|
|
||||||
.js-cookie-alert.in .js-cookie-alert-accept,\
|
|
||||||
#modal_gdpr_intro_popup.in #gdpr-modal-btn-ok-agree,\
|
|
||||||
#consentButtonContainer > button[onclick*="sendAndRedirect"],\
|
|
||||||
#eu-consent[style*="block"] .btn.yes,\
|
|
||||||
.modal--gdpr.is-open .js-gdpr-consent,\
|
|
||||||
#cookiePopupModal.in .cookiepopup-agreed,\
|
|
||||||
.polityka-cookie-rodo[style*="block"] .button-zgoda,\
|
|
||||||
.ui-dialog.consent-modal[style*="block"] .js-btn-agree,\
|
|
||||||
#up-cookie.active .button[onclick*="setCookiePreference"],\
|
|
||||||
.RodoModal.in .close,\
|
|
||||||
.consent-popup form[action*="cookie-consent"] .consent-popup__button,\
|
|
||||||
#consent form[action*="cookie-consent"] .one-btn,\
|
|
||||||
#cookiewall-wrapper .button[href*="accept"],\
|
|
||||||
#cookieChoiceButtonAccept,\
|
|
||||||
.mod-cookie-consent[style*="block"] .btn-all-cookies,\
|
|
||||||
.c-layer--consent .layer-button--accept,\
|
|
||||||
.button.button-ok[onclick*="acceptAVG"],\
|
|
||||||
#meredithGdprConsentFormButton,\
|
|
||||||
#advanced-cookie-modal.in .cookie-accept,\
|
|
||||||
.show-modal .cookie-settings-manager-container .initial-dialog .js-accept-button,\
|
|
||||||
.cookie-settings-manager-container .initial-dialog[style*="block"] .js-accept-button,\
|
|
||||||
.gdprLightbox[data-module="gdprLightbox"] ._type_gdpr_agree,\
|
|
||||||
.cookie.showa #Row1_Column1_Cell1_CookieSettings_AdvancedSaveAccept,\
|
|
||||||
#core-cookie-container[style*="block"] .btn--agree,\
|
|
||||||
.cookie-consent-modal._show .action-primary,\
|
|
||||||
#dsgvoModal.show #dsvgo-banner__button,\
|
|
||||||
.basicLightbox--visible #accept-all-gdpr,\
|
|
||||||
#gdpr-modal.in .gdpr-modal__btn--accept,\
|
|
||||||
.cookiehint .btn.cookieagree,\
|
|
||||||
#cookiealert .modal.in .btn[href*="accept"],\
|
|
||||||
#lml-data-consent-accept,\
|
|
||||||
#CBCookieMsg.in .btn[onclick*="approveCookies"],\
|
|
||||||
#cookiewall-container .button[name="submit"],\
|
|
||||||
#cookie_disclaimer.in .cookie_disclaimer_button,\
|
|
||||||
.m-cookie.iziModal[style*="block"] .m-cookie__save2.button,\
|
|
||||||
kamino-cookie-policy .mat-raised-button,\
|
|
||||||
#surbma-gpga-modal[style*="block"] button,\
|
|
||||||
#GDPR.overlayBox .menuButton,\
|
|
||||||
#cookiebar .cookie-selection-button.accept,\
|
|
||||||
.modal.in .btn.close-modal-cookie,\
|
|
||||||
#consent-module[style*="block"] #consent-module-text-button,\
|
|
||||||
.modal #consentButton,\
|
|
||||||
#consent-modal[style*="block"] .lm_modal__modal__content__body__buttons__ok,\
|
|
||||||
.cookiesOverlay3Box #cookiesConsentOK,\
|
|
||||||
.bemCookieOverlay--activePopup .bemCookieOverlay__btn--save,\
|
|
||||||
#root main ~ div [data-gi-selector="reject-all-cookies"] ~ div a,\
|
|
||||||
.cookies-management .cookies-deny,\
|
|
||||||
.offcanvas.is-open .js-offcanvas-cookie-submit,\
|
|
||||||
.force--consent.show--consent #cs_save__btn,\
|
|
||||||
.force--consent.show--consent #s-sv-bn,\
|
|
||||||
#cookieNoticeModal.vrm-reveal[style*="block"] .vrm-reveal__icon--close',
|
|
||||||
'.cookie-banner .cookie-banner__buttons .cookie-banner__button--reject,\
|
|
||||||
.cookie-consent-banner .cookie-consent-banner__reject,\
|
|
||||||
.cookie-notification .cookie-notification__buttons .cookie-notification__reject,\
|
|
||||||
.cookie-policy-banner .cookie-policy-banner__buttons .cookie-policy-banner__reject,\
|
|
||||||
.cookie-warning .cookie-warning__buttons .cookie-warning__reject,\
|
|
||||||
.cookie-notice .cookie-notice__buttons .cookie-notice__reject,\
|
|
||||||
.cookie-alert .cookie-alert__buttons .cookie-alert__reject,\
|
|
||||||
.cookie-popup .cookie-popup__buttons .cookie-popup__reject,\
|
|
||||||
.cookie-modal .cookie-modal__buttons .cookie-modal__reject,\
|
|
||||||
.cookie-dialog .cookie-dialog__buttons .cookie-dialog__reject,\
|
|
||||||
.gdpr-banner .gdpr-banner__buttons .gdpr-banner__reject,\
|
|
||||||
.gdpr-modal .gdpr-modal__buttons .gdpr-modal__reject,\
|
|
||||||
.gdpr-notice .gdpr-notice__buttons .gdpr-notice__reject,\
|
|
||||||
.gdpr-popup .gdpr-popup__buttons .gdpr-popup__reject,\
|
|
||||||
.gdpr-dialog .gdpr-dialog__buttons .gdpr-dialog__reject,\
|
|
||||||
.privacy-banner .privacy-banner__buttons .privacy-banner__reject,\
|
|
||||||
.privacy-modal .privacy-modal__buttons .privacy-modal__reject,\
|
|
||||||
.privacy-notice .privacy-notice__buttons .privacy-notice__reject,\
|
|
||||||
.privacy-popup .privacy-popup__buttons .privacy-popup__reject,\
|
|
||||||
.privacy-dialog .privacy-dialog__buttons .privacy-dialog__reject',
|
|
||||||
|
|
||||||
'.consent-banner .consent-banner__buttons .consent-banner__reject,\
|
|
||||||
.consent-modal .consent-modal__buttons .consent-modal__reject,\
|
|
||||||
.consent-notice .consent-notice__buttons .consent-notice__reject,\
|
|
||||||
.consent-popup .consent-popup__buttons .consent-popup__reject,\
|
|
||||||
.consent-dialog .consent-dialog__buttons .consent-dialog__reject,\
|
|
||||||
.tracking-banner .tracking-banner__buttons .tracking-banner__reject,\
|
|
||||||
.tracking-modal .tracking-modal__buttons .tracking-modal__reject,\
|
|
||||||
.tracking-notice .tracking-notice__buttons .tracking-notice__reject,\
|
|
||||||
.tracking-popup .tracking-popup__buttons .tracking-popup__reject,\
|
|
||||||
.tracking-dialog .tracking-dialog__buttons .tracking-dialog__reject',
|
|
||||||
|
|
||||||
'.cookie-settings-modal .cookie-settings__reject,\
|
|
||||||
.cookie-settings-modal .cookie-settings__customize,\
|
|
||||||
.cookie-preferences-modal .cookie-preferences__reject,\
|
|
||||||
.cookie-preferences-modal .cookie-preferences__customize,\
|
|
||||||
.cookie-manager-modal .cookie-manager__reject,\
|
|
||||||
.cookie-manager-modal .cookie-manager__customize,\
|
|
||||||
.cookie-control-modal .cookie-control__reject,\
|
|
||||||
.cookie-control-modal .cookie-control__customize,\
|
|
||||||
.cookie-options-modal .cookie-options__reject,\
|
|
||||||
.cookie-options-modal .cookie-options__customize',
|
|
||||||
|
|
||||||
'.data-privacy-modal .data-privacy__reject,\
|
|
||||||
.data-privacy-modal .data-privacy__customize,\
|
|
||||||
.data-protection-modal .data-protection__reject,\
|
|
||||||
.data-protection-modal .data-protection__customize,\
|
|
||||||
.data-consent-modal .data-consent__reject,\
|
|
||||||
.data-consent-modal .data-consent__customize,\
|
|
||||||
.data-settings-modal .data-settings__reject,\
|
|
||||||
.data-settings-modal .data-settings__customize,\
|
|
||||||
.data-preferences-modal .data-preferences__reject,\
|
|
||||||
.data-preferences-modal .data-preferences__customize',
|
|
||||||
|
|
||||||
'.privacy-manager-modal .privacy-manager__reject,\
|
|
||||||
.privacy-manager-modal .privacy-manager__customize,\
|
|
||||||
.privacy-settings-modal .privacy-settings__reject,\
|
|
||||||
.privacy-settings-modal .privacy-settings__customize,\
|
|
||||||
.privacy-options-modal .privacy-options__reject,\
|
|
||||||
.privacy-options-modal .privacy-options__customize,\
|
|
||||||
.privacy-control-modal .privacy-control__reject,\
|
|
||||||
.privacy-control-modal .privacy-control__customize,\
|
|
||||||
.privacy-preferences-modal .privacy-preferences__reject,\
|
|
||||||
.privacy-preferences-modal .privacy-preferences__customize',
|
|
||||||
|
|
||||||
'.consent-manager-modal .consent-manager__reject,\
|
|
||||||
.consent-manager-modal .consent-manager__customize,\
|
|
||||||
.consent-settings-modal .consent-settings__reject,\
|
|
||||||
.consent-settings-modal .consent-settings__customize,\
|
|
||||||
.consent-options-modal .consent-options__reject,\
|
|
||||||
.consent-options-modal .consent-options__customize,\
|
|
||||||
.consent-control-modal .consent-control__reject,\
|
|
||||||
.consent-control-modal .consent-control__customize,\
|
|
||||||
.consent-preferences-modal .consent-preferences__reject,\
|
|
||||||
.consent-preferences-modal .consent-preferences__customize',
|
|
||||||
|
|
||||||
'.tracking-manager-modal .tracking-manager__reject,\
|
|
||||||
.tracking-manager-modal .tracking-manager__customize,\
|
|
||||||
.tracking-settings-modal .tracking-settings__reject,\
|
|
||||||
.tracking-settings-modal .tracking-settings__customize,\
|
|
||||||
.tracking-options-modal .tracking-options__reject,\
|
|
||||||
.tracking-options-modal .tracking-options__customize,\
|
|
||||||
.tracking-control-modal .tracking-control__reject,\
|
|
||||||
.tracking-control-modal .tracking-control__customize,\
|
|
||||||
.tracking-preferences-modal .tracking-preferences__reject,\
|
|
||||||
.tracking-preferences-modal .tracking-preferences__customize',
|
|
||||||
|
|
||||||
'.gdpr-manager-modal .gdpr-manager__reject,\
|
|
||||||
.gdpr-manager-modal .gdpr-manager__customize,\
|
|
||||||
.gdpr-settings-modal .gdpr-settings__reject,\
|
|
||||||
.gdpr-settings-modal .gdpr-settings__customize,\
|
|
||||||
.gdpr-options-modal .gdpr-options__reject,\
|
|
||||||
.gdpr-options-modal .gdpr-options__customize,\
|
|
||||||
.gdpr-control-modal .gdpr-control__reject,\
|
|
||||||
.gdpr-control-modal .gdpr-control__customize,\
|
|
||||||
.gdpr-preferences-modal .gdpr-preferences__reject,\
|
|
||||||
.gdpr-preferences-modal .gdpr-preferences__customize',
|
|
||||||
|
|
||||||
'div[class*="cookie-banner"] button[class*="reject"],\
|
|
||||||
div[class*="cookie-banner"] button[class*="decline"],\
|
|
||||||
div[class*="cookie-banner"] button[class*="settings"],\
|
|
||||||
div[id*="cookie-banner"] button[class*="reject"],\
|
|
||||||
div[id*="cookie-banner"] button[class*="decline"],\
|
|
||||||
div[id*="cookie-banner"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="cookie-consent"] button[class*="reject"],\
|
|
||||||
div[class*="cookie-consent"] button[class*="decline"],\
|
|
||||||
div[class*="cookie-consent"] button[class*="settings"],\
|
|
||||||
div[id*="cookie-consent"] button[class*="reject"],\
|
|
||||||
div[id*="cookie-consent"] button[class*="decline"],\
|
|
||||||
div[id*="cookie-consent"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="cookie-notice"] button[class*="reject"],\
|
|
||||||
div[class*="cookie-notice"] button[class*="decline"],\
|
|
||||||
div[class*="cookie-notice"] button[class*="settings"],\
|
|
||||||
div[id*="cookie-notice"] button[class*="reject"],\
|
|
||||||
div[id*="cookie-notice"] button[class*="decline"],\
|
|
||||||
div[id*="cookie-notice"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'[data-*="cookie"] button[data-*="reject"],\
|
|
||||||
[data-*="cookie"] button[data-*="decline"],\
|
|
||||||
[data-*="cookie"] button[data-*="settings"],\
|
|
||||||
[data-*="gdpr"] button[data-*="reject"],\
|
|
||||||
[data-*="gdpr"] button[data-*="decline"],\
|
|
||||||
[data-*="gdpr"] button[data-*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="cookie-layer"] button[class*="reject"],\
|
|
||||||
div[class*="cookie-layer"] button[class*="decline"],\
|
|
||||||
div[class*="cookie-layer"] button[class*="settings"],\
|
|
||||||
div[id*="cookie-layer"] button[class*="reject"],\
|
|
||||||
div[id*="cookie-layer"] button[class*="decline"],\
|
|
||||||
div[id*="cookie-layer"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="cookie-section"] button[class*="reject"],\
|
|
||||||
div[class*="cookie-section"] button[class*="decline"],\
|
|
||||||
div[class*="cookie-section"] button[class*="settings"],\
|
|
||||||
div[id*="cookie-section"] button[class*="reject"],\
|
|
||||||
div[id*="cookie-section"] button[class*="decline"],\
|
|
||||||
div[id*="cookie-section"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="cookie-container"] button[class*="reject"],\
|
|
||||||
div[class*="cookie-container"] button[class*="decline"],\
|
|
||||||
div[class*="cookie-container"] button[class*="settings"],\
|
|
||||||
div[id*="cookie-container"] button[class*="reject"],\
|
|
||||||
div[id*="cookie-container"] button[class*="decline"],\
|
|
||||||
div[id*="cookie-container"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'[data-purpose*="cookie"] button[data-purpose*="reject"],\
|
|
||||||
[data-purpose*="cookie"] button[data-purpose*="decline"],\
|
|
||||||
[data-purpose*="cookie"] button[data-purpose*="settings"],\
|
|
||||||
[data-ref*="cookie"] button[data-ref*="reject"],\
|
|
||||||
[data-ref*="cookie"] button[data-ref*="decline"],\
|
|
||||||
[data-ref*="cookie"] button[data-ref*="settings"]',
|
|
||||||
|
|
||||||
'[id*="cookie-manager"] button[id*="reject"],\
|
|
||||||
[id*="cookie-manager"] button[id*="decline"],\
|
|
||||||
[id*="cookie-manager"] button[id*="settings"],\
|
|
||||||
[id*="cookie-control"] button[id*="reject"],\
|
|
||||||
[id*="cookie-control"] button[id*="decline"],\
|
|
||||||
[id*="cookie-control"] button[id*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="vn-cookie"] button[class*="reject"],\
|
|
||||||
div[class*="vn-cookie"] button[class*="decline"],\
|
|
||||||
div[class*="vn-cookie"] button[class*="settings"],\
|
|
||||||
div[id*="vn-cookie"] button[class*="reject"],\
|
|
||||||
div[id*="vn-cookie"] button[class*="decline"],\
|
|
||||||
div[id*="vn-cookie"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="ecommerce"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="ecommerce"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="ecommerce"] button[class*="cookie-settings"],\
|
|
||||||
div[id*="ecommerce"] button[class*="cookie-reject"],\
|
|
||||||
div[id*="ecommerce"] button[class*="cookie-decline"],\
|
|
||||||
div[id*="ecommerce"] button[class*="cookie-settings"]',
|
|
||||||
|
|
||||||
'div[class*="news"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="news"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="news"] button[class*="cookie-settings"],\
|
|
||||||
div[id*="news"] button[class*="cookie-reject"],\
|
|
||||||
div[id*="news"] button[class*="cookie-decline"],\
|
|
||||||
div[id*="news"] button[class*="cookie-settings"]',
|
|
||||||
|
|
||||||
'div[class*="retail"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="retail"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="retail"] button[class*="cookie-settings"],\
|
|
||||||
div[id*="retail"] button[class*="cookie-reject"],\
|
|
||||||
div[id*="retail"] button[class*="cookie-decline"],\
|
|
||||||
div[id*="retail"] button[class*="cookie-settings"]',
|
|
||||||
|
|
||||||
'div[class*="gdpr"] button[class*="reject"],\
|
|
||||||
div[class*="gdpr"] button[class*="decline"],\
|
|
||||||
div[class*="gdpr"] button[class*="settings"],\
|
|
||||||
div[id*="gdpr"] button[class*="reject"],\
|
|
||||||
div[id*="gdpr"] button[class*="decline"],\
|
|
||||||
div[id*="gdpr"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="privacy"] button[class*="reject"],\
|
|
||||||
div[class*="privacy"] button[class*="decline"],\
|
|
||||||
div[class*="privacy"] button[class*="settings"],\
|
|
||||||
div[id*="privacy"] button[class*="reject"],\
|
|
||||||
div[id*="privacy"] button[class*="decline"],\
|
|
||||||
div[id*="privacy"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="bank"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="bank"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="bank"] button[class*="cookie-settings"],\
|
|
||||||
div[id*="bank"] button[class*="cookie-reject"],\
|
|
||||||
div[id*="bank"] button[class*="cookie-decline"],\
|
|
||||||
div[id*="bank"] button[class*="cookie-settings"]',
|
|
||||||
|
|
||||||
'div[class*="consent"] button[class*="reject"],\
|
|
||||||
div[class*="consent"] button[class*="decline"],\
|
|
||||||
div[class*="consent"] button[class*="settings"],\
|
|
||||||
div[id*="consent"] button[class*="reject"],\
|
|
||||||
div[id*="consent"] button[class*="decline"],\
|
|
||||||
div[id*="consent"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="notice"] button[class*="reject"],\
|
|
||||||
div[class*="notice"] button[class*="decline"],\
|
|
||||||
div[class*="notice"] button[class*="settings"],\
|
|
||||||
div[id*="notice"] button[class*="reject"],\
|
|
||||||
div[id*="notice"] button[class*="decline"],\
|
|
||||||
div[id*="notice"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="popup"] button[class*="reject"],\
|
|
||||||
div[class*="popup"] button[class*="decline"],\
|
|
||||||
div[class*="popup"] button[class*="settings"],\
|
|
||||||
div[id*="popup"] button[class*="reject"],\
|
|
||||||
div[id*="popup"] button[class*="decline"],\
|
|
||||||
div[id*="popup"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="eu-cookie-banner"] button[class*="reject"],\
|
|
||||||
div[class*="eu-cookie-banner"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="gdpr-notice"] button[class*="reject"],\
|
|
||||||
div[class*="gdpr-notice"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="privacy-consent"] button[class*="reject"],\
|
|
||||||
div[class*="privacy-consent"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="asia"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="asia"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="asia"] button[class*="cookie-settings"]',
|
|
||||||
|
|
||||||
'div[class*="europe"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="europe"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="europe"] button[class*="cookie-settings"]',
|
|
||||||
|
|
||||||
'div[class*="global"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="global"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="global"] button[class*="cookie-settings"]',
|
|
||||||
|
|
||||||
'div[class*="america"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="america"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="america"] button[class*="cookie-settings"]',
|
|
||||||
|
|
||||||
'div[class*="oceania"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="oceania"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="oceania"] button[class*="cookie-settings"]',
|
|
||||||
];
|
|
||||||
|
|
||||||
let currentChainElement = 0;
|
|
||||||
const classname = Math.random()
|
|
||||||
.toString(36)
|
|
||||||
.replace(/[^a-z]+/g, '');
|
|
||||||
|
|
||||||
// Search loop function
|
|
||||||
let searchGroupsLength = searchGroups.length,
|
|
||||||
searchPairsKeys = Object.keys(searchPairs),
|
|
||||||
searchPairsJoinedKeys = searchPairsKeys.join(','),
|
|
||||||
timeoutDuration = 300;
|
|
||||||
|
|
||||||
function querySelectorAllShadowRoot(selector, root = document) {
|
|
||||||
const elements = [];
|
|
||||||
const findElements = node => {
|
|
||||||
if (node.shadowRoot) {
|
|
||||||
node.shadowRoot.querySelectorAll(selector).forEach(el => elements.push(el));
|
|
||||||
node.shadowRoot.querySelectorAll('*').forEach(findElements);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
root.querySelectorAll('*').forEach(findElements);
|
|
||||||
return elements;
|
|
||||||
}
|
|
||||||
|
|
||||||
function searchLoop(counter) {
|
|
||||||
if (document.cookie.indexOf('cookie_consent') !== -1) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const dynamicTimeout = Math.min(timeoutDuration * (counter + 1), 2000);
|
|
||||||
|
|
||||||
setTimeout(function () {
|
|
||||||
document.querySelectorAll(searchPairsJoinedKeys).forEach(function (box) {
|
|
||||||
searchPairsKeys.forEach(function (selector) {
|
|
||||||
if (box.matches(selector)) {
|
|
||||||
const shadowElements = querySelectorAllShadowRoot(searchPairs[selector].join(','), box);
|
|
||||||
shadowElements.forEach(button => {
|
|
||||||
if (button.click && !button.classList.contains(classname)) {
|
|
||||||
button.classList.add(classname);
|
|
||||||
|
|
||||||
if (typeof chrome == 'object' && chrome.runtime) chrome.runtime.sendMessage({ command: 'cookie_warning_dismissed', url: document.location.href });
|
|
||||||
|
|
||||||
button.click();
|
|
||||||
|
|
||||||
if (selector != '.message-container' && button.getAttribute('href') != '#cookieman-settings')
|
|
||||||
setTimeout(function () {
|
|
||||||
if (button) button.click();
|
|
||||||
}, 500);
|
|
||||||
|
|
||||||
timeoutDuration += 500;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
document.querySelectorAll(searchGroups[counter % searchGroupsLength]).forEach(function (element) {
|
|
||||||
if (element.click && !element.classList.contains(classname)) {
|
|
||||||
element.classList.add(classname);
|
|
||||||
|
|
||||||
if (typeof chrome == 'object' && chrome.runtime) chrome.runtime.sendMessage({ command: 'cookie_warning_dismissed', url: document.location.href });
|
|
||||||
|
|
||||||
element.click();
|
|
||||||
|
|
||||||
if (element.getAttribute('aria-pressed') != 'true')
|
|
||||||
setTimeout(function () {
|
|
||||||
if (element) element.click();
|
|
||||||
}, 500);
|
|
||||||
|
|
||||||
timeoutDuration += 500;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (counter < 100 * searchGroupsLength) {
|
|
||||||
searchLoop(counter + 1);
|
|
||||||
}
|
|
||||||
}, dynamicTimeout);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Embeds handling
|
|
||||||
function handleEmbeds() {
|
|
||||||
var l = document.location,
|
|
||||||
is_audioboom = false,
|
|
||||||
is_dailymotion = false,
|
|
||||||
is_dailybuzz = false,
|
|
||||||
is_playerclipslaliga = false;
|
|
||||||
|
|
||||||
switch (l.hostname) {
|
|
||||||
case 'embeds.audioboom.com':
|
|
||||||
is_audioboom = true;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'dailymotion.com':
|
|
||||||
case 'www.dailymotion.com':
|
|
||||||
is_dailymotion = l.pathname.indexOf('/embed') === 0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'geo.dailymotion.com':
|
|
||||||
is_dailymotion = l.pathname.indexOf('/player') === 0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'dailybuzz.nl':
|
|
||||||
is_dailybuzz = l.pathname.indexOf('/buzz/embed') === 0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'playerclipslaliga.tv':
|
|
||||||
is_playerclipslaliga = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
function searchEmbeds() {
|
|
||||||
setTimeout(function () {
|
|
||||||
if (is_audioboom) {
|
|
||||||
document.querySelectorAll('div[id^="cookie-modal"] .modal[style*="block"] .btn.mrs:not(.' + classname + ')').forEach(function (button) {
|
|
||||||
button.className += ' ' + classname;
|
|
||||||
button.click();
|
|
||||||
});
|
|
||||||
} else if (is_dailymotion) {
|
|
||||||
document.querySelectorAll('.np_DialogConsent-accept:not(.' + classname + '), .consent_screen-accept:not(.' + classname + ')').forEach(function (button) {
|
|
||||||
button.className += ' ' + classname;
|
|
||||||
button.click();
|
|
||||||
});
|
|
||||||
} else if (is_dailybuzz) {
|
|
||||||
document.querySelectorAll('#ask-consent #accept:not(.' + classname + ')').forEach(function (button) {
|
|
||||||
button.className += ' ' + classname;
|
|
||||||
button.click();
|
|
||||||
});
|
|
||||||
} else if (is_playerclipslaliga) {
|
|
||||||
document.querySelectorAll('#cookies button[onclick*="saveCookiesSelection"]:not(.' + classname + ')').forEach(function (button) {
|
|
||||||
button.className += ' ' + classname;
|
|
||||||
button.click();
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
searchEmbeds();
|
|
||||||
}, 1000);
|
|
||||||
}
|
|
||||||
|
|
||||||
searchEmbeds();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize
|
|
||||||
var start = setInterval(function () {
|
|
||||||
var html = document.querySelector('html');
|
|
||||||
|
|
||||||
if (!html || /idc0_350/.test(html.className)) return;
|
|
||||||
|
|
||||||
clearInterval(start);
|
|
||||||
|
|
||||||
html.className += ' idc0_350';
|
|
||||||
searchLoop(0);
|
|
||||||
handleEmbeds();
|
|
||||||
}, 500);
|
|
||||||
|
|
||||||
var hostname = document.location.hostname.replace(/^w{2,3}\d*\./i, ''),
|
|
||||||
items = getItem(hostname);
|
|
||||||
|
|
||||||
if (items) {
|
|
||||||
(items instanceof Array ? items : [items]).forEach(function (item) {
|
|
||||||
let value = localStorage.getItem(item.key);
|
|
||||||
if (value == null || (item.strict && value != item.value)) {
|
|
||||||
localStorage.setItem(item.key, item.value);
|
|
||||||
counter++;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (counter > 0) document.location.reload();
|
|
||||||
}
|
|
||||||
})();
|
|
||||||
@@ -1,704 +0,0 @@
|
|||||||
// ==UserScript==
|
|
||||||
// @name Return YouTube Dislike
|
|
||||||
// @namespace https://www.returnyoutubedislike.com/
|
|
||||||
// @homepage https://www.returnyoutubedislike.com/
|
|
||||||
// @version 3.1.5
|
|
||||||
// @encoding utf-8
|
|
||||||
// @description Return of the YouTube Dislike, Based off https://www.returnyoutubedislike.com/
|
|
||||||
// @icon https://github.com/Anarios/return-youtube-dislike/raw/main/Icons/Return%20Youtube%20Dislike%20-%20Transparent.png
|
|
||||||
// @author Anarios & JRWR
|
|
||||||
// @match *://*.youtube.com/*
|
|
||||||
// @exclude *://music.youtube.com/*
|
|
||||||
// @exclude *://*.music.youtube.com/*
|
|
||||||
// @compatible chrome
|
|
||||||
// @compatible firefox
|
|
||||||
// @compatible opera
|
|
||||||
// @compatible safari
|
|
||||||
// @compatible edge
|
|
||||||
// @grant GM.xmlHttpRequest
|
|
||||||
// @connect youtube.com
|
|
||||||
// @grant GM_addStyle
|
|
||||||
// @run-at document-end
|
|
||||||
// @downloadURL https://update.greasyfork.org/scripts/436115/Return%20YouTube%20Dislike.user.js
|
|
||||||
// @updateURL https://update.greasyfork.org/scripts/436115/Return%20YouTube%20Dislike.meta.js
|
|
||||||
// ==/UserScript==
|
|
||||||
|
|
||||||
const extConfig = {
|
|
||||||
// BEGIN USER OPTIONS
|
|
||||||
// You may change the following variables to allowed values listed in the corresponding brackets (* means default). Keep the style and keywords intact.
|
|
||||||
showUpdatePopup: false, // [true, false*] Show a popup tab after extension update (See what's new)
|
|
||||||
disableVoteSubmission: false, // [true, false*] Disable like/dislike submission (Stops counting your likes and dislikes)
|
|
||||||
disableLogging: true, // [true*, false] Disable Logging API Response in JavaScript Console.
|
|
||||||
coloredThumbs: false, // [true, false*] Colorize thumbs (Use custom colors for thumb icons)
|
|
||||||
coloredBar: false, // [true, false*] Colorize ratio bar (Use custom colors for ratio bar)
|
|
||||||
colorTheme: "classic", // [classic*, accessible, neon] Color theme (red/green, blue/yellow, pink/cyan)
|
|
||||||
numberDisplayFormat: "compactShort", // [compactShort*, compactLong, standard] Number format (For non-English locale users, you may be able to improve appearance with a different option. Please file a feature request if your locale is not covered)
|
|
||||||
numberDisplayRoundDown: true, // [true*, false] Round down numbers (Show rounded down numbers)
|
|
||||||
tooltipPercentageMode: "none", // [none*, dash_like, dash_dislike, both, only_like, only_dislike] Mode of showing percentage in like/dislike bar tooltip.
|
|
||||||
numberDisplayReformatLikes: false, // [true, false*] Re-format like numbers (Make likes and dislikes format consistent)
|
|
||||||
rateBarEnabled: false, // [true, false*] Enables ratio bar under like/dislike buttons
|
|
||||||
// END USER OPTIONS
|
|
||||||
};
|
|
||||||
|
|
||||||
const LIKED_STATE = "LIKED_STATE";
|
|
||||||
const DISLIKED_STATE = "DISLIKED_STATE";
|
|
||||||
const NEUTRAL_STATE = "NEUTRAL_STATE";
|
|
||||||
let previousState = 3; //1=LIKED, 2=DISLIKED, 3=NEUTRAL
|
|
||||||
let likesvalue = 0;
|
|
||||||
let dislikesvalue = 0;
|
|
||||||
let preNavigateLikeButton = null;
|
|
||||||
|
|
||||||
let isMobile = location.hostname == "m.youtube.com";
|
|
||||||
let isShorts = () => location.pathname.startsWith("/shorts");
|
|
||||||
let mobileDislikes = 0;
|
|
||||||
function cLog(text, subtext = "") {
|
|
||||||
if (!extConfig.disableLogging) {
|
|
||||||
subtext = subtext.trim() === "" ? "" : `(${subtext})`;
|
|
||||||
console.log(`[Return YouTube Dislikes] ${text} ${subtext}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function isInViewport(element) {
|
|
||||||
const rect = element.getBoundingClientRect();
|
|
||||||
const height = innerHeight || document.documentElement.clientHeight;
|
|
||||||
const width = innerWidth || document.documentElement.clientWidth;
|
|
||||||
return (
|
|
||||||
// When short (channel) is ignored, the element (like/dislike AND short itself) is
|
|
||||||
// hidden with a 0 DOMRect. In this case, consider it outside of Viewport
|
|
||||||
!(rect.top == 0 && rect.left == 0 && rect.bottom == 0 && rect.right == 0) &&
|
|
||||||
rect.top >= 0 &&
|
|
||||||
rect.left >= 0 &&
|
|
||||||
rect.bottom <= height &&
|
|
||||||
rect.right <= width
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function getButtons() {
|
|
||||||
if (isShorts()) {
|
|
||||||
let elements = document.querySelectorAll(
|
|
||||||
isMobile ? "ytm-like-button-renderer" : "#like-button > ytd-like-button-renderer",
|
|
||||||
);
|
|
||||||
for (let element of elements) {
|
|
||||||
if (isInViewport(element)) {
|
|
||||||
return element;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (isMobile) {
|
|
||||||
return (
|
|
||||||
document.querySelector(".slim-video-action-bar-actions .segmented-buttons") ??
|
|
||||||
document.querySelector(".slim-video-action-bar-actions")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (document.getElementById("menu-container")?.offsetParent === null) {
|
|
||||||
return (
|
|
||||||
document.querySelector("ytd-menu-renderer.ytd-watch-metadata > div") ??
|
|
||||||
document.querySelector("ytd-menu-renderer.ytd-video-primary-info-renderer > div")
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
return document.getElementById("menu-container")?.querySelector("#top-level-buttons-computed");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getDislikeButton() {
|
|
||||||
if (getButtons().children[0].tagName === "YTD-SEGMENTED-LIKE-DISLIKE-BUTTON-RENDERER") {
|
|
||||||
if (getButtons().children[0].children[1] === undefined) {
|
|
||||||
return document.querySelector("#segmented-dislike-button");
|
|
||||||
} else {
|
|
||||||
return getButtons().children[0].children[1];
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (getButtons().querySelector("segmented-like-dislike-button-view-model")) {
|
|
||||||
const dislikeViewModel = getButtons().querySelector("dislike-button-view-model");
|
|
||||||
if (!dislikeViewModel) cLog("Dislike button wasn't added to DOM yet...");
|
|
||||||
return dislikeViewModel;
|
|
||||||
} else {
|
|
||||||
return getButtons().children[1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getLikeButton() {
|
|
||||||
return getButtons().children[0].tagName === "YTD-SEGMENTED-LIKE-DISLIKE-BUTTON-RENDERER"
|
|
||||||
? document.querySelector("#segmented-like-button") !== null
|
|
||||||
? document.querySelector("#segmented-like-button")
|
|
||||||
: getButtons().children[0].children[0]
|
|
||||||
: getButtons().querySelector("like-button-view-model") ?? getButtons().children[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
function getLikeTextContainer() {
|
|
||||||
return (
|
|
||||||
getLikeButton().querySelector("#text") ??
|
|
||||||
getLikeButton().getElementsByTagName("yt-formatted-string")[0] ??
|
|
||||||
getLikeButton().querySelector("span[role='text']")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function getDislikeTextContainer() {
|
|
||||||
const dislikeButton = getDislikeButton();
|
|
||||||
let result =
|
|
||||||
dislikeButton?.querySelector("#text") ??
|
|
||||||
dislikeButton?.getElementsByTagName("yt-formatted-string")[0] ??
|
|
||||||
dislikeButton?.querySelector("span[role='text']");
|
|
||||||
if (result === null) {
|
|
||||||
let textSpan = document.createElement("span");
|
|
||||||
textSpan.id = "text";
|
|
||||||
textSpan.style.marginLeft = "6px";
|
|
||||||
dislikeButton?.querySelector("button").appendChild(textSpan);
|
|
||||||
if (dislikeButton) dislikeButton.querySelector("button").style.width = "auto";
|
|
||||||
result = textSpan;
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
function createObserver(options, callback) {
|
|
||||||
const observerWrapper = new Object();
|
|
||||||
observerWrapper.options = options;
|
|
||||||
observerWrapper.observer = new MutationObserver(callback);
|
|
||||||
observerWrapper.observe = function (element) {
|
|
||||||
this.observer.observe(element, this.options);
|
|
||||||
};
|
|
||||||
observerWrapper.disconnect = function () {
|
|
||||||
this.observer.disconnect();
|
|
||||||
};
|
|
||||||
return observerWrapper;
|
|
||||||
}
|
|
||||||
|
|
||||||
let shortsObserver = null;
|
|
||||||
|
|
||||||
if (isShorts() && !shortsObserver) {
|
|
||||||
cLog("Initializing shorts mutation observer");
|
|
||||||
shortsObserver = createObserver(
|
|
||||||
{
|
|
||||||
attributes: true,
|
|
||||||
},
|
|
||||||
(mutationList) => {
|
|
||||||
mutationList.forEach((mutation) => {
|
|
||||||
if (
|
|
||||||
mutation.type === "attributes" &&
|
|
||||||
mutation.target.nodeName === "TP-YT-PAPER-BUTTON" &&
|
|
||||||
mutation.target.id === "button"
|
|
||||||
) {
|
|
||||||
cLog("Short thumb button status changed");
|
|
||||||
if (mutation.target.getAttribute("aria-pressed") === "true") {
|
|
||||||
mutation.target.style.color =
|
|
||||||
mutation.target.parentElement.parentElement.id === "like-button"
|
|
||||||
? getColorFromTheme(true)
|
|
||||||
: getColorFromTheme(false);
|
|
||||||
} else {
|
|
||||||
mutation.target.style.color = "unset";
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
cLog("Unexpected mutation observer event: " + mutation.target + mutation.type);
|
|
||||||
});
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function isVideoLiked() {
|
|
||||||
if (isMobile) {
|
|
||||||
return getLikeButton().querySelector("button").getAttribute("aria-label") == "true";
|
|
||||||
}
|
|
||||||
return getLikeButton().classList.contains("style-default-active");
|
|
||||||
}
|
|
||||||
|
|
||||||
function isVideoDisliked() {
|
|
||||||
if (isMobile) {
|
|
||||||
return getDislikeButton()?.querySelector("button").getAttribute("aria-label") == "true";
|
|
||||||
}
|
|
||||||
return getDislikeButton()?.classList.contains("style-default-active");
|
|
||||||
}
|
|
||||||
|
|
||||||
function isVideoNotLiked() {
|
|
||||||
if (isMobile) {
|
|
||||||
return !isVideoLiked();
|
|
||||||
}
|
|
||||||
return getLikeButton().classList.contains("style-text");
|
|
||||||
}
|
|
||||||
|
|
||||||
function isVideoNotDisliked() {
|
|
||||||
if (isMobile) {
|
|
||||||
return !isVideoDisliked();
|
|
||||||
}
|
|
||||||
return getDislikeButton()?.classList.contains("style-text");
|
|
||||||
}
|
|
||||||
|
|
||||||
function checkForUserAvatarButton() {
|
|
||||||
if (isMobile) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (document.querySelector("#avatar-btn")) {
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getState() {
|
|
||||||
if (isVideoLiked()) {
|
|
||||||
return LIKED_STATE;
|
|
||||||
}
|
|
||||||
if (isVideoDisliked()) {
|
|
||||||
return DISLIKED_STATE;
|
|
||||||
}
|
|
||||||
return NEUTRAL_STATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
function setLikes(likesCount) {
|
|
||||||
if (isMobile) {
|
|
||||||
getButtons().children[0].querySelector(".button-renderer-text").innerText = likesCount;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
getLikeTextContainer().innerText = likesCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
function setDislikes(dislikesCount) {
|
|
||||||
if (isMobile) {
|
|
||||||
mobileDislikes = dislikesCount;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const _container = getDislikeTextContainer();
|
|
||||||
_container?.removeAttribute("is-empty");
|
|
||||||
if (_container?.innerText !== dislikesCount) {
|
|
||||||
_container.innerText = dislikesCount;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getLikeCountFromButton() {
|
|
||||||
try {
|
|
||||||
if (isShorts()) {
|
|
||||||
//Youtube Shorts don't work with this query. It's not necessary; we can skip it and still see the results.
|
|
||||||
//It should be possible to fix this function, but it's not critical to showing the dislike count.
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
let likeButton =
|
|
||||||
getLikeButton().querySelector("yt-formatted-string#text") ?? getLikeButton().querySelector("button");
|
|
||||||
|
|
||||||
let likesStr = likeButton.getAttribute("aria-label").replace(/\D/g, "");
|
|
||||||
return likesStr.length > 0 ? parseInt(likesStr) : false;
|
|
||||||
} catch {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
(typeof GM_addStyle != "undefined"
|
|
||||||
? GM_addStyle
|
|
||||||
: (styles) => {
|
|
||||||
let styleNode = document.createElement("style");
|
|
||||||
styleNode.type = "text/css";
|
|
||||||
styleNode.innerText = styles;
|
|
||||||
document.head.appendChild(styleNode);
|
|
||||||
})(`
|
|
||||||
#return-youtube-dislike-bar-container {
|
|
||||||
background: var(--yt-spec-icon-disabled);
|
|
||||||
border-radius: 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#return-youtube-dislike-bar {
|
|
||||||
background: var(--yt-spec-text-primary);
|
|
||||||
border-radius: 2px;
|
|
||||||
transition: all 0.15s ease-in-out;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ryd-tooltip {
|
|
||||||
position: absolute;
|
|
||||||
display: block;
|
|
||||||
height: 2px;
|
|
||||||
bottom: -10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ryd-tooltip-bar-container {
|
|
||||||
width: 100%;
|
|
||||||
height: 2px;
|
|
||||||
position: absolute;
|
|
||||||
padding-top: 6px;
|
|
||||||
padding-bottom: 12px;
|
|
||||||
top: -6px;
|
|
||||||
}
|
|
||||||
|
|
||||||
ytd-menu-renderer.ytd-watch-metadata {
|
|
||||||
overflow-y: visible !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
#top-level-buttons-computed {
|
|
||||||
position: relative !important;
|
|
||||||
}
|
|
||||||
`);
|
|
||||||
|
|
||||||
function createRateBar(likes, dislikes) {
|
|
||||||
if (isMobile || !extConfig.rateBarEnabled) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
let rateBar = document.getElementById("return-youtube-dislike-bar-container");
|
|
||||||
|
|
||||||
const widthPx = getLikeButton().clientWidth + (getDislikeButton()?.clientWidth ?? 52);
|
|
||||||
|
|
||||||
const widthPercent = likes + dislikes > 0 ? (likes / (likes + dislikes)) * 100 : 50;
|
|
||||||
|
|
||||||
var likePercentage = parseFloat(widthPercent.toFixed(1));
|
|
||||||
const dislikePercentage = (100 - likePercentage).toLocaleString();
|
|
||||||
likePercentage = likePercentage.toLocaleString();
|
|
||||||
|
|
||||||
var tooltipInnerHTML;
|
|
||||||
switch (extConfig.tooltipPercentageMode) {
|
|
||||||
case "dash_like":
|
|
||||||
tooltipInnerHTML = `${likes.toLocaleString()} / ${dislikes.toLocaleString()} - ${likePercentage}%`;
|
|
||||||
break;
|
|
||||||
case "dash_dislike":
|
|
||||||
tooltipInnerHTML = `${likes.toLocaleString()} / ${dislikes.toLocaleString()} - ${dislikePercentage}%`;
|
|
||||||
break;
|
|
||||||
case "both":
|
|
||||||
tooltipInnerHTML = `${likePercentage}% / ${dislikePercentage}%`;
|
|
||||||
break;
|
|
||||||
case "only_like":
|
|
||||||
tooltipInnerHTML = `${likePercentage}%`;
|
|
||||||
break;
|
|
||||||
case "only_dislike":
|
|
||||||
tooltipInnerHTML = `${dislikePercentage}%`;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
tooltipInnerHTML = `${likes.toLocaleString()} / ${dislikes.toLocaleString()}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!rateBar && !isMobile) {
|
|
||||||
let colorLikeStyle = "";
|
|
||||||
let colorDislikeStyle = "";
|
|
||||||
if (extConfig.coloredBar) {
|
|
||||||
colorLikeStyle = "; background-color: " + getColorFromTheme(true);
|
|
||||||
colorDislikeStyle = "; background-color: " + getColorFromTheme(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
getButtons().insertAdjacentHTML(
|
|
||||||
"beforeend",
|
|
||||||
`
|
|
||||||
<div class="ryd-tooltip" style="width: ${widthPx}px">
|
|
||||||
<div class="ryd-tooltip-bar-container">
|
|
||||||
<div
|
|
||||||
id="return-youtube-dislike-bar-container"
|
|
||||||
style="width: 100%; height: 2px;${colorDislikeStyle}"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
id="return-youtube-dislike-bar"
|
|
||||||
style="width: ${widthPercent}%; height: 100%${colorDislikeStyle}"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<tp-yt-paper-tooltip position="top" id="ryd-dislike-tooltip" class="style-scope ytd-sentiment-bar-renderer" role="tooltip" tabindex="-1">
|
|
||||||
<!--css-build:shady-->${tooltipInnerHTML}
|
|
||||||
</tp-yt-paper-tooltip>
|
|
||||||
</div>
|
|
||||||
`,
|
|
||||||
);
|
|
||||||
let descriptionAndActionsElement = document.getElementById("top-row");
|
|
||||||
descriptionAndActionsElement.style.borderBottom = "1px solid var(--yt-spec-10-percent-layer)";
|
|
||||||
descriptionAndActionsElement.style.paddingBottom = "10px";
|
|
||||||
} else {
|
|
||||||
document.querySelector(".ryd-tooltip").style.width = widthPx + "px";
|
|
||||||
document.getElementById("return-youtube-dislike-bar").style.width = widthPercent + "%";
|
|
||||||
|
|
||||||
if (extConfig.coloredBar) {
|
|
||||||
document.getElementById("return-youtube-dislike-bar-container").style.backgroundColor = getColorFromTheme(false);
|
|
||||||
document.getElementById("return-youtube-dislike-bar").style.backgroundColor = getColorFromTheme(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function setState() {
|
|
||||||
cLog("Fetching votes...");
|
|
||||||
let statsSet = false;
|
|
||||||
|
|
||||||
fetch(`https://returnyoutubedislikeapi.com/votes?videoId=${getVideoId()}`).then((response) => {
|
|
||||||
response.json().then((json) => {
|
|
||||||
if (json && !("traceId" in response) && !statsSet) {
|
|
||||||
const { dislikes, likes } = json;
|
|
||||||
cLog(`Received count: ${dislikes}`);
|
|
||||||
likesvalue = likes;
|
|
||||||
dislikesvalue = dislikes;
|
|
||||||
setDislikes(numberFormat(dislikes));
|
|
||||||
if (extConfig.numberDisplayReformatLikes === true) {
|
|
||||||
const nativeLikes = getLikeCountFromButton();
|
|
||||||
if (nativeLikes !== false) {
|
|
||||||
setLikes(numberFormat(nativeLikes));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
createRateBar(likes, dislikes);
|
|
||||||
if (extConfig.coloredThumbs === true) {
|
|
||||||
const dislikeButton = getDislikeButton();
|
|
||||||
if (isShorts()) {
|
|
||||||
// for shorts, leave deactived buttons in default color
|
|
||||||
const shortLikeButton = getLikeButton().querySelector("tp-yt-paper-button#button");
|
|
||||||
const shortDislikeButton = dislikeButton?.querySelector("tp-yt-paper-button#button");
|
|
||||||
if (shortLikeButton.getAttribute("aria-pressed") === "true") {
|
|
||||||
shortLikeButton.style.color = getColorFromTheme(true);
|
|
||||||
}
|
|
||||||
if (shortDislikeButton && shortDislikeButton.getAttribute("aria-pressed") === "true") {
|
|
||||||
shortDislikeButton.style.color = getColorFromTheme(false);
|
|
||||||
}
|
|
||||||
shortsObserver.observe(shortLikeButton);
|
|
||||||
shortsObserver.observe(shortDislikeButton);
|
|
||||||
} else {
|
|
||||||
getLikeButton().style.color = getColorFromTheme(true);
|
|
||||||
if (dislikeButton) dislikeButton.style.color = getColorFromTheme(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function updateDOMDislikes() {
|
|
||||||
setDislikes(numberFormat(dislikesvalue));
|
|
||||||
createRateBar(likesvalue, dislikesvalue);
|
|
||||||
}
|
|
||||||
|
|
||||||
function likeClicked() {
|
|
||||||
if (checkForUserAvatarButton() == true) {
|
|
||||||
if (previousState == 1) {
|
|
||||||
likesvalue--;
|
|
||||||
updateDOMDislikes();
|
|
||||||
previousState = 3;
|
|
||||||
} else if (previousState == 2) {
|
|
||||||
likesvalue++;
|
|
||||||
dislikesvalue--;
|
|
||||||
updateDOMDislikes();
|
|
||||||
previousState = 1;
|
|
||||||
} else if (previousState == 3) {
|
|
||||||
likesvalue++;
|
|
||||||
updateDOMDislikes();
|
|
||||||
previousState = 1;
|
|
||||||
}
|
|
||||||
if (extConfig.numberDisplayReformatLikes === true) {
|
|
||||||
const nativeLikes = getLikeCountFromButton();
|
|
||||||
if (nativeLikes !== false) {
|
|
||||||
setLikes(numberFormat(nativeLikes));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function dislikeClicked() {
|
|
||||||
if (checkForUserAvatarButton() == true) {
|
|
||||||
if (previousState == 3) {
|
|
||||||
dislikesvalue++;
|
|
||||||
updateDOMDislikes();
|
|
||||||
previousState = 2;
|
|
||||||
} else if (previousState == 2) {
|
|
||||||
dislikesvalue--;
|
|
||||||
updateDOMDislikes();
|
|
||||||
previousState = 3;
|
|
||||||
} else if (previousState == 1) {
|
|
||||||
likesvalue--;
|
|
||||||
dislikesvalue++;
|
|
||||||
updateDOMDislikes();
|
|
||||||
previousState = 2;
|
|
||||||
if (extConfig.numberDisplayReformatLikes === true) {
|
|
||||||
const nativeLikes = getLikeCountFromButton();
|
|
||||||
if (nativeLikes !== false) {
|
|
||||||
setLikes(numberFormat(nativeLikes));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function setInitialState() {
|
|
||||||
setState();
|
|
||||||
}
|
|
||||||
|
|
||||||
function getVideoId() {
|
|
||||||
const urlObject = new URL(window.location.href);
|
|
||||||
const pathname = urlObject.pathname;
|
|
||||||
if (pathname.startsWith("/clip")) {
|
|
||||||
return (document.querySelector("meta[itemprop='videoId']") || document.querySelector("meta[itemprop='identifier']")).content;
|
|
||||||
} else {
|
|
||||||
if (pathname.startsWith("/shorts")) {
|
|
||||||
return pathname.slice(8);
|
|
||||||
}
|
|
||||||
return urlObject.searchParams.get("v");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function isVideoLoaded() {
|
|
||||||
if (isMobile) {
|
|
||||||
return document.getElementById("player").getAttribute("loading") == "false";
|
|
||||||
}
|
|
||||||
const videoId = getVideoId();
|
|
||||||
|
|
||||||
return (
|
|
||||||
// desktop: spring 2024 UI
|
|
||||||
document.querySelector(`ytd-watch-grid[video-id='${videoId}']`) !== null ||
|
|
||||||
// desktop: older UI
|
|
||||||
document.querySelector(`ytd-watch-flexy[video-id='${videoId}']`) !== null ||
|
|
||||||
// mobile: no video-id attribute
|
|
||||||
document.querySelector('#player[loading="false"]:not([hidden])') !== null
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function roundDown(num) {
|
|
||||||
if (num < 1000) return num;
|
|
||||||
const int = Math.floor(Math.log10(num) - 2);
|
|
||||||
const decimal = int + (int % 3 ? 1 : 0);
|
|
||||||
const value = Math.floor(num / 10 ** decimal);
|
|
||||||
return value * 10 ** decimal;
|
|
||||||
}
|
|
||||||
|
|
||||||
function numberFormat(numberState) {
|
|
||||||
let numberDisplay;
|
|
||||||
if (extConfig.numberDisplayRoundDown === false) {
|
|
||||||
numberDisplay = numberState;
|
|
||||||
} else {
|
|
||||||
numberDisplay = roundDown(numberState);
|
|
||||||
}
|
|
||||||
return getNumberFormatter(extConfig.numberDisplayFormat).format(numberDisplay);
|
|
||||||
}
|
|
||||||
|
|
||||||
function getNumberFormatter(optionSelect) {
|
|
||||||
let userLocales;
|
|
||||||
if (document.documentElement.lang) {
|
|
||||||
userLocales = document.documentElement.lang;
|
|
||||||
} else if (navigator.language) {
|
|
||||||
userLocales = navigator.language;
|
|
||||||
} else {
|
|
||||||
try {
|
|
||||||
userLocales = new URL(
|
|
||||||
Array.from(document.querySelectorAll("head > link[rel='search']"))
|
|
||||||
?.find((n) => n?.getAttribute("href")?.includes("?locale="))
|
|
||||||
?.getAttribute("href"),
|
|
||||||
)?.searchParams?.get("locale");
|
|
||||||
} catch {
|
|
||||||
cLog("Cannot find browser locale. Use en as default for number formatting.");
|
|
||||||
userLocales = "en";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let formatterNotation;
|
|
||||||
let formatterCompactDisplay;
|
|
||||||
switch (optionSelect) {
|
|
||||||
case "compactLong":
|
|
||||||
formatterNotation = "compact";
|
|
||||||
formatterCompactDisplay = "long";
|
|
||||||
break;
|
|
||||||
case "standard":
|
|
||||||
formatterNotation = "standard";
|
|
||||||
formatterCompactDisplay = "short";
|
|
||||||
break;
|
|
||||||
case "compactShort":
|
|
||||||
default:
|
|
||||||
formatterNotation = "compact";
|
|
||||||
formatterCompactDisplay = "short";
|
|
||||||
}
|
|
||||||
|
|
||||||
const formatter = Intl.NumberFormat(userLocales, {
|
|
||||||
notation: formatterNotation,
|
|
||||||
compactDisplay: formatterCompactDisplay,
|
|
||||||
});
|
|
||||||
return formatter;
|
|
||||||
}
|
|
||||||
|
|
||||||
function getColorFromTheme(voteIsLike) {
|
|
||||||
let colorString;
|
|
||||||
switch (extConfig.colorTheme) {
|
|
||||||
case "accessible":
|
|
||||||
if (voteIsLike === true) {
|
|
||||||
colorString = "dodgerblue";
|
|
||||||
} else {
|
|
||||||
colorString = "gold";
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case "neon":
|
|
||||||
if (voteIsLike === true) {
|
|
||||||
colorString = "aqua";
|
|
||||||
} else {
|
|
||||||
colorString = "magenta";
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case "classic":
|
|
||||||
default:
|
|
||||||
if (voteIsLike === true) {
|
|
||||||
colorString = "lime";
|
|
||||||
} else {
|
|
||||||
colorString = "red";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return colorString;
|
|
||||||
}
|
|
||||||
|
|
||||||
let smartimationObserver = null;
|
|
||||||
|
|
||||||
function setEventListeners(evt) {
|
|
||||||
let jsInitChecktimer;
|
|
||||||
|
|
||||||
function checkForJS_Finish() {
|
|
||||||
//console.log();
|
|
||||||
if (isShorts() || (getButtons()?.offsetParent && isVideoLoaded())) {
|
|
||||||
const buttons = getButtons();
|
|
||||||
const dislikeButton = getDislikeButton();
|
|
||||||
|
|
||||||
if (preNavigateLikeButton !== getLikeButton() && dislikeButton) {
|
|
||||||
cLog("Registering button listeners...");
|
|
||||||
try {
|
|
||||||
getLikeButton().addEventListener("click", likeClicked);
|
|
||||||
dislikeButton?.addEventListener("click", dislikeClicked);
|
|
||||||
getLikeButton().addEventListener("touchstart", likeClicked);
|
|
||||||
dislikeButton?.addEventListener("touchstart", dislikeClicked);
|
|
||||||
dislikeButton?.addEventListener("focusin", updateDOMDislikes);
|
|
||||||
dislikeButton?.addEventListener("focusout", updateDOMDislikes);
|
|
||||||
preNavigateLikeButton = getLikeButton();
|
|
||||||
|
|
||||||
if (!smartimationObserver) {
|
|
||||||
smartimationObserver = createObserver(
|
|
||||||
{
|
|
||||||
attributes: true,
|
|
||||||
subtree: true,
|
|
||||||
childList: true,
|
|
||||||
},
|
|
||||||
updateDOMDislikes,
|
|
||||||
);
|
|
||||||
smartimationObserver.container = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const smartimationContainer = buttons.querySelector("yt-smartimation");
|
|
||||||
if (smartimationContainer && smartimationObserver.container != smartimationContainer) {
|
|
||||||
cLog("Initializing smartimation mutation observer");
|
|
||||||
smartimationObserver.disconnect();
|
|
||||||
smartimationObserver.observe(smartimationContainer);
|
|
||||||
smartimationObserver.container = smartimationContainer;
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
return;
|
|
||||||
} //Don't spam errors into the console
|
|
||||||
}
|
|
||||||
if (dislikeButton) {
|
|
||||||
setInitialState();
|
|
||||||
clearInterval(jsInitChecktimer);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cLog("Setting up...");
|
|
||||||
jsInitChecktimer = setInterval(checkForJS_Finish, 111);
|
|
||||||
}
|
|
||||||
|
|
||||||
(function () {
|
|
||||||
"use strict";
|
|
||||||
window.addEventListener("yt-navigate-finish", setEventListeners, true);
|
|
||||||
setEventListeners();
|
|
||||||
})();
|
|
||||||
if (isMobile) {
|
|
||||||
let originalPush = history.pushState;
|
|
||||||
history.pushState = function (...args) {
|
|
||||||
window.returnDislikeButtonlistenersSet = false;
|
|
||||||
setEventListeners(args[2]);
|
|
||||||
return originalPush.apply(history, args);
|
|
||||||
};
|
|
||||||
setInterval(() => {
|
|
||||||
const dislikeButton = getDislikeButton();
|
|
||||||
if (dislikeButton?.querySelector(".button-renderer-text") === null) {
|
|
||||||
getDislikeTextContainer().innerText = mobileDislikes;
|
|
||||||
} else {
|
|
||||||
if (dislikeButton) dislikeButton.querySelector(".button-renderer-text").innerText = mobileDislikes;
|
|
||||||
}
|
|
||||||
}, 1000);
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,18 +0,0 @@
|
|||||||
// ==UserScript==
|
|
||||||
// @name Startpage - Hide Ads
|
|
||||||
// @match https://www.startpage.com/*
|
|
||||||
// @run-at document-start
|
|
||||||
// ==/UserScript==
|
|
||||||
|
|
||||||
new MutationObserver(function(mutations) {
|
|
||||||
mutations.forEach((mutation) => {
|
|
||||||
if (mutation.type === 'childList') {
|
|
||||||
mutation.addedNodes.forEach((node) => {
|
|
||||||
if (node.nodeType === 1 && node.nodeName === 'DIV' && node.id === 'gcsa-top') {
|
|
||||||
node.remove();
|
|
||||||
this.disconnect();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}).observe(document, { childList: true, subtree: true });
|
|
||||||
@@ -1,191 +0,0 @@
|
|||||||
// ==UserScript==
|
|
||||||
// @name TrackingTokenStripper
|
|
||||||
// @version 1.4
|
|
||||||
// @description Remove most of the annoying tracking token from URL parameters
|
|
||||||
// @license MIT
|
|
||||||
// @homepage https://blog.miniasp.com/
|
|
||||||
// @homepageURL https://blog.miniasp.com/
|
|
||||||
// @website https://www.facebook.com/will.fans
|
|
||||||
// @source https://github.com/doggy8088/TrackingTokenStripper/raw/refs/heads/master/TrackingTokenStripper.user.js
|
|
||||||
// @namespace https://github.com/doggy8088/TrackingTokenStripper
|
|
||||||
// @author Will Huang
|
|
||||||
// @match *://*/*
|
|
||||||
// @run-at document-start
|
|
||||||
// ==/UserScript==
|
|
||||||
|
|
||||||
(function () {
|
|
||||||
'use strict';
|
|
||||||
|
|
||||||
const oldReplaceState = history.replaceState;
|
|
||||||
history.replaceState = function replaceState() {
|
|
||||||
let ret = oldReplaceState.apply(this, arguments);
|
|
||||||
window.dispatchEvent(new Event('replacestate'));
|
|
||||||
window.dispatchEvent(new Event('locationchange'));
|
|
||||||
return ret;
|
|
||||||
};
|
|
||||||
|
|
||||||
window.addEventListener('popstate', () => {
|
|
||||||
window.dispatchEvent(new Event('locationchange'));
|
|
||||||
});
|
|
||||||
|
|
||||||
window.addEventListener('locationchange', function () {
|
|
||||||
executeActions();
|
|
||||||
});
|
|
||||||
|
|
||||||
executeActions();
|
|
||||||
|
|
||||||
let id = setInterval(executeActions, 500);
|
|
||||||
|
|
||||||
setTimeout(() => { clearInterval(id); }, 2000);
|
|
||||||
|
|
||||||
function executeActions() {
|
|
||||||
|
|
||||||
var s = TrackingTokenStripper(location.href)
|
|
||||||
// facebook
|
|
||||||
.remove('fbclid')
|
|
||||||
.removeByDomain('www.facebook.com', 'privacy_mutation_token')
|
|
||||||
.removeByDomain('www.facebook.com', 'acontext')
|
|
||||||
.removeByDomain('www.facebook.com', '__xts__[0]')
|
|
||||||
.removeByDomain('www.facebook.com', 'notif_t')
|
|
||||||
.removeByDomain('www.facebook.com', 'notif_id')
|
|
||||||
.removeByDomain('www.facebook.com', 'notif_ids[0]')
|
|
||||||
.removeByDomain('www.facebook.com', 'notif_ids[1]')
|
|
||||||
.removeByDomain('www.facebook.com', 'notif_ids[2]')
|
|
||||||
.removeByDomain('www.facebook.com', 'notif_ids[3]')
|
|
||||||
.removeByDomain('www.facebook.com', 'ref', 'notif')
|
|
||||||
.removeByDomain('www.facebook.com', 'ref=watch_permalink')
|
|
||||||
|
|
||||||
// Dropbox
|
|
||||||
.removeByDomain('www.dropbox.com', '_ad')
|
|
||||||
.removeByDomain('www.dropbox.com', '_camp')
|
|
||||||
.removeByDomain('www.dropbox.com', '_tk')
|
|
||||||
|
|
||||||
// YouTube
|
|
||||||
// https://youtu.be/4f-Y9G5ENPc?si=SHSu2hEdSbXGy4_Q
|
|
||||||
// https://www.youtube.com/embed/4f-Y9G5ENPc?si=GQFJV_nKMXxpiQb6
|
|
||||||
.removeByDomain('youtu.be', 'si')
|
|
||||||
.removeByDomain('www.youtube.com', 'si')
|
|
||||||
|
|
||||||
// Google Analytics
|
|
||||||
// https://support.google.com/analytics/answer/1033863?hl=en
|
|
||||||
.remove('utm_id')
|
|
||||||
.remove('utm_source')
|
|
||||||
.remove('utm_medium')
|
|
||||||
.remove('utm_campaign')
|
|
||||||
.remove('utm_term')
|
|
||||||
.remove('utm_content')
|
|
||||||
.remove('_ga')
|
|
||||||
|
|
||||||
// GA - others
|
|
||||||
.remove('utm_campaignid')
|
|
||||||
.remove('utm_cid')
|
|
||||||
.remove('utm_reader')
|
|
||||||
.remove('utm_referrer')
|
|
||||||
.remove('utm_name')
|
|
||||||
.remove('utm_social')
|
|
||||||
.remove('utm_social-type')
|
|
||||||
.remove('gclid')
|
|
||||||
.remove('igshid')
|
|
||||||
.remove('_hsenc')
|
|
||||||
.remove('_hsmi')
|
|
||||||
.remove('mc_cid')
|
|
||||||
.remove('mc_eid')
|
|
||||||
.remove('mkt_tok')
|
|
||||||
.remove('yclid')
|
|
||||||
.remove('_openstat')
|
|
||||||
|
|
||||||
// devblogs.microsoft.com
|
|
||||||
.removeByDomain('devblogs.microsoft.com', 'utm_issue')
|
|
||||||
.removeByDomain('devblogs.microsoft.com', 'utm_position')
|
|
||||||
.removeByDomain('devblogs.microsoft.com', 'utm_topic')
|
|
||||||
.removeByDomain('devblogs.microsoft.com', 'utm_section')
|
|
||||||
.removeByDomain('devblogs.microsoft.com', 'utm_cta')
|
|
||||||
.removeByDomain('devblogs.microsoft.com', 'utm_description')
|
|
||||||
.removeByDomain('devblogs.microsoft.com', 'ocid')
|
|
||||||
|
|
||||||
// Microsoft
|
|
||||||
.remove('wt.mc_id')
|
|
||||||
.removeByDomain('learn.microsoft.com', 'ocid')
|
|
||||||
.removeByDomain('learn.microsoft.com', 'redirectedfrom')
|
|
||||||
|
|
||||||
.removeByDomain('azure.microsoft.com', 'OCID')
|
|
||||||
.removeByDomain('azure.microsoft.com', 'ef_id')
|
|
||||||
|
|
||||||
.removeByDomain('www.msn.com', 'ocid')
|
|
||||||
.removeByDomain('www.msn.com', 'cvid')
|
|
||||||
|
|
||||||
// bilibili
|
|
||||||
.removeByDomain('www.bilibili.com', 'share_source')
|
|
||||||
.removeByDomain('www.bilibili.com', 'share_medium')
|
|
||||||
|
|
||||||
// Others
|
|
||||||
.remove('__tn__')
|
|
||||||
.remove('gclsrc')
|
|
||||||
.remove('itm_source')
|
|
||||||
.remove('itm_medium')
|
|
||||||
.remove('itm_campaign')
|
|
||||||
.remove('mc') // sendgrid.com
|
|
||||||
.remove('mcd') // sendgrid.com
|
|
||||||
.remove('cvosrc') // sendgrid.com
|
|
||||||
.remove('cr_cc') // https://blogs.microsoft.com/
|
|
||||||
|
|
||||||
.remove('sc_channel')
|
|
||||||
.remove('sc_campaign')
|
|
||||||
.remove('sc_geo')
|
|
||||||
.remove('trk')
|
|
||||||
.remove('sc_publisher')
|
|
||||||
.remove('trkCampaign')
|
|
||||||
.remove('sc_outcome')
|
|
||||||
.remove('sc_country')
|
|
||||||
|
|
||||||
.remove('__hstc')
|
|
||||||
.remove('__hssc')
|
|
||||||
.remove('__hsfp')
|
|
||||||
.remove('_gl')
|
|
||||||
|
|
||||||
// Yahoo News
|
|
||||||
.remove('guce_referrer')
|
|
||||||
.remove('guce_referrer_sig')
|
|
||||||
|
|
||||||
.toString();
|
|
||||||
|
|
||||||
if (s && location.href !== s) {
|
|
||||||
// console.log('Changing URL', s);
|
|
||||||
// location.href = s;
|
|
||||||
oldReplaceState.apply(history, [{}, '', s]);
|
|
||||||
}
|
|
||||||
|
|
||||||
function TrackingTokenStripper(url) {
|
|
||||||
const parsedUrl = new URL(url);
|
|
||||||
return {
|
|
||||||
remove(name, value) {
|
|
||||||
if (parsedUrl.searchParams.has(name)) {
|
|
||||||
if (value && value === parsedUrl.searchParams.get(name)) {
|
|
||||||
parsedUrl.searchParams.delete(name);
|
|
||||||
}
|
|
||||||
if (!value) {
|
|
||||||
parsedUrl.searchParams.delete(name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return TrackingTokenStripper(parsedUrl.toString());
|
|
||||||
},
|
|
||||||
removeByDomain(domain, name) {
|
|
||||||
if (parsedUrl.hostname.toLocaleLowerCase() === domain.toLocaleLowerCase()) {
|
|
||||||
if (name.indexOf('=') >= 0) {
|
|
||||||
var [key, value] = name.split("=");
|
|
||||||
return this.remove(key, value);
|
|
||||||
} else {
|
|
||||||
return this.remove(name);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
toString() {
|
|
||||||
return parsedUrl.toString();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
})();
|
|
||||||
@@ -7,7 +7,11 @@
|
|||||||
};
|
};
|
||||||
new_instance_open_target = "window";
|
new_instance_open_target = "window";
|
||||||
"tabs.last_close" = "close";
|
"tabs.last_close" = "close";
|
||||||
"statusbar.widgets" = ["keypress" "url" "progress"];
|
"statusbar.widgets" = [
|
||||||
|
"keypress"
|
||||||
|
"url"
|
||||||
|
"progress"
|
||||||
|
];
|
||||||
|
|
||||||
# Adblock
|
# Adblock
|
||||||
"content.blocking.enabled" = true;
|
"content.blocking.enabled" = true;
|
||||||
@@ -26,7 +30,12 @@
|
|||||||
"downloads.location.prompt" = false;
|
"downloads.location.prompt" = false;
|
||||||
|
|
||||||
# Editor (Ctrl+e in text fields)
|
# Editor (Ctrl+e in text fields)
|
||||||
"editor.command" = ["ghostty" "-e" "nvim" "{}"];
|
"editor.command" = [
|
||||||
|
"ghostty"
|
||||||
|
"-e"
|
||||||
|
"nvim"
|
||||||
|
"{}"
|
||||||
|
];
|
||||||
|
|
||||||
# Tabs
|
# Tabs
|
||||||
# "tabs.show" = "switching";
|
# "tabs.show" = "switching";
|
||||||
@@ -46,6 +55,7 @@
|
|||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
c.statusbar.padding = {'top': 6, 'bottom': 6, 'left': 8, 'right': 8}
|
c.statusbar.padding = {'top': 6, 'bottom': 6, 'left': 8, 'right': 8}
|
||||||
c.tabs.padding = {'top': 6, 'bottom': 6, 'left': 8, 'right': 8}
|
c.tabs.padding = {'top': 6, 'bottom': 6, 'left': 8, 'right': 8}
|
||||||
|
config.set('content.local_content_can_access_remote_urls', True, 'file://*')
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,27 +1,47 @@
|
|||||||
{
|
{
|
||||||
xdg.dataFile = {
|
config,
|
||||||
# Startpage - hide sponsored results
|
lib,
|
||||||
"qutebrowser/greasemonkey/startpage-no-ads.user.js".source =
|
pkgs,
|
||||||
./greasemonkey/startpage-no-ads.user.js;
|
...
|
||||||
|
}: {
|
||||||
|
xdg.dataFile."qutebrowser/greasemonkey/startpage-no-ads.user.js".text = ''
|
||||||
|
// ==UserScript==
|
||||||
|
// @name Startpage - Hide Ads
|
||||||
|
// @match https://www.startpage.com/*
|
||||||
|
// @run-at document-start
|
||||||
|
// ==/UserScript==
|
||||||
|
|
||||||
# Return YouTube Dislike
|
new MutationObserver(function(mutations) {
|
||||||
"qutebrowser/greasemonkey/return-youtube-dislike.user.js".source =
|
mutations.forEach((mutation) => {
|
||||||
./greasemonkey/return-youtube-dislike.user.js;
|
if (mutation.type === 'childList') {
|
||||||
|
mutation.addedNodes.forEach((node) => {
|
||||||
|
if (node.nodeType === 1 && node.nodeName === 'DIV' && node.id === 'gcsa-top') {
|
||||||
|
node.remove();
|
||||||
|
this.disconnect();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}).observe(document, { childList: true, subtree: true });
|
||||||
|
'';
|
||||||
|
|
||||||
# SponsorBlock Lite - auto-skip sponsors on YouTube
|
home.activation.downloadUserscripts = lib.hm.dag.entryAfter ["writeBoundary"] ''
|
||||||
"qutebrowser/greasemonkey/sponsorblock-lite.user.js".source =
|
scripts_dir="${config.home.homeDirectory}/.local/share/qutebrowser/greasemonkey"
|
||||||
./greasemonkey/sponsorblock-lite.user.js;
|
$DRY_RUN_CMD mkdir -p "$scripts_dir"
|
||||||
|
|
||||||
# Don't Track Me Google - remove Google tracking redirects
|
download() {
|
||||||
"qutebrowser/greasemonkey/dont-track-me-google.user.js".source =
|
local name="$1" url="$2"
|
||||||
./greasemonkey/dont-track-me-google.user.js;
|
if [[ ! -f "$scripts_dir/$name" ]]; then
|
||||||
|
$DRY_RUN_CMD ${pkgs.curl}/bin/curl -sSL -o "$scripts_dir/$name" "$url" || true
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# I don't care about cookies - auto-dismiss cookie banners
|
download "return-youtube-dislike.user.js" "https://update.greasyfork.org/scripts/436115/Return%20YouTube%20Dislike.user.js"
|
||||||
"qutebrowser/greasemonkey/i-dont-care-about-cookies.user.js".source =
|
download "sponsorblock-lite.user.js" "https://update.greasyfork.org/scripts/560869/SponsorBlock%20Lite.user.js"
|
||||||
./greasemonkey/i-dont-care-about-cookies.user.js;
|
download "dont-track-me-google.user.js" "https://update.greasyfork.org/scripts/428243/Don%27t%20track%20me%20Google.user.js"
|
||||||
|
download "i-dont-care-about-cookies.user.js" "https://update.greasyfork.org/scripts/522645/I%20don%27t%20care%20about%20cookies.user.js"
|
||||||
# TrackingTokenStripper - remove tracking params from URLs (utm_*, fbclid, etc.)
|
download "tracking-token-stripper.user.js" "https://github.com/doggy8088/TrackingTokenStripper/raw/refs/heads/master/TrackingTokenStripper.user.js"
|
||||||
"qutebrowser/greasemonkey/tracking-token-stripper.user.js".source =
|
download "bypass-paywalls-clean.user.js" "https://gitflic.ru/project/magnolia1234/bypass-paywalls-clean-filters/blob/raw?file=userscript/bpc.en.user.js"
|
||||||
./greasemonkey/tracking-token-stripper.user.js;
|
download "anti-adblock-fuckoff.user.js" "https://update.greasyfork.org/scripts/397070/Anti-AdBlocker%20Fuckoff.user.js"
|
||||||
};
|
'';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,10 @@
|
|||||||
# Import all shell configurations
|
# Import all shell configurations
|
||||||
{
|
{
|
||||||
imports = [./fzf.nix ./zsh.nix ./starship.nix ./zoxide.nix ./eza.nix];
|
imports = [
|
||||||
|
./fzf.nix
|
||||||
|
./zsh.nix
|
||||||
|
./starship.nix
|
||||||
|
./zoxide.nix
|
||||||
|
./eza.nix
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,9 @@ in {
|
|||||||
"$git_status"
|
"$git_status"
|
||||||
"$character"
|
"$character"
|
||||||
];
|
];
|
||||||
directory = {style = accent;};
|
directory = {
|
||||||
|
style = accent;
|
||||||
|
};
|
||||||
|
|
||||||
character = {
|
character = {
|
||||||
success_symbol = "[❯](${accent})";
|
success_symbol = "[❯](${accent})";
|
||||||
|
|||||||
+15
-33
@@ -7,7 +7,12 @@
|
|||||||
}: let
|
}: let
|
||||||
fetch = config.theme.fetch; # neofetch, nerdfetch, pfetch
|
fetch = config.theme.fetch; # neofetch, nerdfetch, pfetch
|
||||||
in {
|
in {
|
||||||
home.packages = with pkgs; [bat ripgrep tldr witr];
|
home.packages = with pkgs; [
|
||||||
|
bat
|
||||||
|
ripgrep
|
||||||
|
tldr
|
||||||
|
witr
|
||||||
|
];
|
||||||
|
|
||||||
# Add go binaries to the PATH
|
# Add go binaries to the PATH
|
||||||
home.sessionPath = ["$HOME/go/bin"];
|
home.sessionPath = ["$HOME/go/bin"];
|
||||||
@@ -22,7 +27,14 @@ in {
|
|||||||
autosuggestion.enable = true;
|
autosuggestion.enable = true;
|
||||||
syntaxHighlighting = {
|
syntaxHighlighting = {
|
||||||
enable = true;
|
enable = true;
|
||||||
highlighters = ["main" "brackets" "pattern" "regexp" "root" "line"];
|
highlighters = [
|
||||||
|
"main"
|
||||||
|
"brackets"
|
||||||
|
"pattern"
|
||||||
|
"regexp"
|
||||||
|
"root"
|
||||||
|
"line"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
historySubstringSearch.enable = true;
|
historySubstringSearch.enable = true;
|
||||||
|
|
||||||
@@ -33,9 +45,7 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
profileExtra = lib.optionalString (config.home.sessionPath != []) ''
|
profileExtra = lib.optionalString (config.home.sessionPath != []) ''
|
||||||
export PATH="$PATH''${PATH:+:}${
|
export PATH="$PATH''${PATH:+:}${lib.concatStringsSep ":" config.home.sessionPath}"
|
||||||
lib.concatStringsSep ":" config.home.sessionPath
|
|
||||||
}"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
@@ -96,29 +106,6 @@ in {
|
|||||||
else ""
|
else ""
|
||||||
}
|
}
|
||||||
|
|
||||||
function sesh-sessions() {
|
|
||||||
session=$(sesh list -t -c | fzf --height 70% --reverse)
|
|
||||||
[[ -z "$session" ]] && return
|
|
||||||
sesh connect $session
|
|
||||||
}
|
|
||||||
|
|
||||||
function chatgptfolder(){
|
|
||||||
echo "################################"
|
|
||||||
echo "### TREE ###"
|
|
||||||
echo "################################"
|
|
||||||
${pkgs.eza}/bin/eza --tree -aF --icons never
|
|
||||||
echo -e "\n\n"
|
|
||||||
echo "##############################"
|
|
||||||
echo "### CONTENT ###"
|
|
||||||
echo "##############################"
|
|
||||||
find . -type f -not -path '*/.git/*' -print0 | while IFS= read -r -d "" file; do
|
|
||||||
echo -e "\n--- DEBUT: $file ---\n"
|
|
||||||
cat "$file"
|
|
||||||
echo -e "\n--- FIN: $file ---\n"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
function n4c() {
|
function n4c() {
|
||||||
category=''${1:-all}
|
category=''${1:-all}
|
||||||
shift
|
shift
|
||||||
@@ -126,11 +113,6 @@ in {
|
|||||||
nix develop "github:nix4cyber/n4c#''${category}" ''${args} -c zsh
|
nix develop "github:nix4cyber/n4c#''${category}" ''${args} -c zsh
|
||||||
}
|
}
|
||||||
|
|
||||||
zle -N sesh-sessions
|
|
||||||
bindkey -M emacs '\es' sesh-sessions
|
|
||||||
bindkey -M vicmd '\es' sesh-sessions
|
|
||||||
bindkey -M viins '\es' sesh-sessions
|
|
||||||
|
|
||||||
# search history based on what's typed in the prompt
|
# search history based on what's typed in the prompt
|
||||||
autoload -U history-search-end
|
autoload -U history-search-end
|
||||||
zle -N history-beginning-search-backward-end history-search-end
|
zle -N history-beginning-search-backward-end history-search-end
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ in {
|
|||||||
background.enabled = false;
|
background.enabled = false;
|
||||||
appearance = {
|
appearance = {
|
||||||
transparency = {
|
transparency = {
|
||||||
enable = true;
|
enabled = true;
|
||||||
base = 0.85;
|
base = 0.85;
|
||||||
layers = 0.4;
|
layers = 0.4;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -19,7 +19,6 @@
|
|||||||
label = " ";
|
label = " ";
|
||||||
occupiedBg = true;
|
occupiedBg = true;
|
||||||
occupiedLabel = " ";
|
occupiedLabel = " ";
|
||||||
rounded = true;
|
|
||||||
showWindows = false;
|
showWindows = false;
|
||||||
shown = 5;
|
shown = 5;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
inputs,
|
||||||
|
lib,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
@@ -56,6 +57,16 @@
|
|||||||
"caelestia scheme set -n custom"
|
"caelestia scheme set -n custom"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# shell.json is managed by home-manager (read-only symlink) but caelestia
|
||||||
|
# needs to write to it at runtime: replace the symlink with a mutable copy
|
||||||
|
home.activation.caelestiaWritableShellConfig = lib.hm.dag.entryAfter ["linkGeneration"] ''
|
||||||
|
if [ -L "$HOME/.config/caelestia/shell.json" ]; then
|
||||||
|
$DRY_RUN_CMD cp --remove-destination \
|
||||||
|
"$(readlink -f "$HOME/.config/caelestia/shell.json")" \
|
||||||
|
"$HOME/.config/caelestia/shell.json"
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
|
||||||
services.cliphist = {
|
services.cliphist = {
|
||||||
enable = true;
|
enable = true;
|
||||||
allowImages = true;
|
allowImages = true;
|
||||||
|
|||||||
@@ -1,10 +1,22 @@
|
|||||||
{
|
{
|
||||||
programs.caelestia.settings = {
|
programs.caelestia.settings = {
|
||||||
session.commands = {
|
session.commands = {
|
||||||
shutdown = ["systemctl" "poweroff"];
|
shutdown = [
|
||||||
logout = ["loginctl" "lock-session"];
|
"systemctl"
|
||||||
hibernate = ["systemctl" "hibernate"];
|
"poweroff"
|
||||||
reboot = ["systemctl" "reboot"];
|
];
|
||||||
|
logout = [
|
||||||
|
"loginctl"
|
||||||
|
"lock-session"
|
||||||
|
];
|
||||||
|
hibernate = [
|
||||||
|
"systemctl"
|
||||||
|
"hibernate"
|
||||||
|
];
|
||||||
|
reboot = [
|
||||||
|
"systemctl"
|
||||||
|
"reboot"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
launcher = {
|
launcher = {
|
||||||
actionPrefix = "/";
|
actionPrefix = "/";
|
||||||
@@ -13,7 +25,10 @@
|
|||||||
name = "Calculator";
|
name = "Calculator";
|
||||||
icon = "calculate";
|
icon = "calculate";
|
||||||
description = "Do simple math equations (powered by Qalc)";
|
description = "Do simple math equations (powered by Qalc)";
|
||||||
command = ["autocomplete" "calc"];
|
command = [
|
||||||
|
"autocomplete"
|
||||||
|
"calc"
|
||||||
|
];
|
||||||
enabled = true;
|
enabled = true;
|
||||||
dangerous = false;
|
dangerous = false;
|
||||||
}
|
}
|
||||||
@@ -21,7 +36,10 @@
|
|||||||
name = "Shutdown";
|
name = "Shutdown";
|
||||||
icon = "power_settings_new";
|
icon = "power_settings_new";
|
||||||
description = "Shutdown the system";
|
description = "Shutdown the system";
|
||||||
command = ["systemctl" "poweroff"];
|
command = [
|
||||||
|
"systemctl"
|
||||||
|
"poweroff"
|
||||||
|
];
|
||||||
enabled = true;
|
enabled = true;
|
||||||
dangerous = true;
|
dangerous = true;
|
||||||
}
|
}
|
||||||
@@ -29,7 +47,10 @@
|
|||||||
name = "Reboot";
|
name = "Reboot";
|
||||||
icon = "cached";
|
icon = "cached";
|
||||||
description = "Reboot the system";
|
description = "Reboot the system";
|
||||||
command = ["systemctl" "reboot"];
|
command = [
|
||||||
|
"systemctl"
|
||||||
|
"reboot"
|
||||||
|
];
|
||||||
enabled = true;
|
enabled = true;
|
||||||
dangerous = true;
|
dangerous = true;
|
||||||
}
|
}
|
||||||
@@ -37,7 +58,11 @@
|
|||||||
name = "Logout";
|
name = "Logout";
|
||||||
icon = "exit_to_app";
|
icon = "exit_to_app";
|
||||||
description = "Log out of the current session";
|
description = "Log out of the current session";
|
||||||
command = ["loginctl" "terminate-user" ""];
|
command = [
|
||||||
|
"loginctl"
|
||||||
|
"terminate-user"
|
||||||
|
""
|
||||||
|
];
|
||||||
enabled = true;
|
enabled = true;
|
||||||
dangerous = true;
|
dangerous = true;
|
||||||
}
|
}
|
||||||
@@ -45,7 +70,10 @@
|
|||||||
name = "Lock";
|
name = "Lock";
|
||||||
icon = "lock";
|
icon = "lock";
|
||||||
description = "Lock the current session";
|
description = "Lock the current session";
|
||||||
command = ["loginctl" "lock-session"];
|
command = [
|
||||||
|
"loginctl"
|
||||||
|
"lock-session"
|
||||||
|
];
|
||||||
enabled = true;
|
enabled = true;
|
||||||
dangerous = false;
|
dangerous = false;
|
||||||
}
|
}
|
||||||
@@ -53,7 +81,10 @@
|
|||||||
name = "Sleep";
|
name = "Sleep";
|
||||||
icon = "bedtime";
|
icon = "bedtime";
|
||||||
description = "Suspend then hibernate";
|
description = "Suspend then hibernate";
|
||||||
command = ["systemctl" "suspend-then-hibernate"];
|
command = [
|
||||||
|
"systemctl"
|
||||||
|
"suspend-then-hibernate"
|
||||||
|
];
|
||||||
enabled = true;
|
enabled = true;
|
||||||
dangerous = false;
|
dangerous = false;
|
||||||
}
|
}
|
||||||
@@ -61,7 +92,12 @@
|
|||||||
name = "Restart caelestia";
|
name = "Restart caelestia";
|
||||||
icon = "cached";
|
icon = "cached";
|
||||||
description = "Restart caelestia";
|
description = "Restart caelestia";
|
||||||
command = ["hyprctl" "dispatch" "exec" "caelestia-shell kill | sleep 1 | caelestia-shell"];
|
command = [
|
||||||
|
"hyprctl"
|
||||||
|
"dispatch"
|
||||||
|
"exec"
|
||||||
|
"caelestia-shell kill | sleep 1 | caelestia-shell"
|
||||||
|
];
|
||||||
enabled = true;
|
enabled = true;
|
||||||
dangerous = false;
|
dangerous = false;
|
||||||
}
|
}
|
||||||
@@ -69,7 +105,11 @@
|
|||||||
name = "Emoji Picker";
|
name = "Emoji Picker";
|
||||||
icon = "mood";
|
icon = "mood";
|
||||||
description = "Toggle the emoji picker";
|
description = "Toggle the emoji picker";
|
||||||
command = ["caelestia" "emoji" "-p"];
|
command = [
|
||||||
|
"caelestia"
|
||||||
|
"emoji"
|
||||||
|
"-p"
|
||||||
|
];
|
||||||
enabled = true;
|
enabled = true;
|
||||||
dangerous = false;
|
dangerous = false;
|
||||||
}
|
}
|
||||||
@@ -77,7 +117,10 @@
|
|||||||
name = "Clipboard History";
|
name = "Clipboard History";
|
||||||
icon = "content_paste";
|
icon = "content_paste";
|
||||||
description = "Toggle the clipboard history";
|
description = "Toggle the clipboard history";
|
||||||
command = ["caelestia" "clipboard"];
|
command = [
|
||||||
|
"caelestia"
|
||||||
|
"clipboard"
|
||||||
|
];
|
||||||
enabled = true;
|
enabled = true;
|
||||||
dangerous = false;
|
dangerous = false;
|
||||||
}
|
}
|
||||||
@@ -85,7 +128,10 @@
|
|||||||
name = "Delete from Clipboard History";
|
name = "Delete from Clipboard History";
|
||||||
icon = "content_paste_off";
|
icon = "content_paste_off";
|
||||||
description = "Delete a line from the clipboard history";
|
description = "Delete a line from the clipboard history";
|
||||||
command = ["caelestia" "clipboard"];
|
command = [
|
||||||
|
"caelestia"
|
||||||
|
"clipboard"
|
||||||
|
];
|
||||||
enabled = true;
|
enabled = true;
|
||||||
dangerous = false;
|
dangerous = false;
|
||||||
}
|
}
|
||||||
@@ -101,7 +147,10 @@
|
|||||||
name = "Hyprpicker";
|
name = "Hyprpicker";
|
||||||
icon = "colorize";
|
icon = "colorize";
|
||||||
description = "Pick an hex color";
|
description = "Pick an hex color";
|
||||||
command = ["hyprpicker" "-a"];
|
command = [
|
||||||
|
"hyprpicker"
|
||||||
|
"-a"
|
||||||
|
];
|
||||||
enabled = true;
|
enabled = true;
|
||||||
dangerous = false;
|
dangerous = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -122,7 +122,9 @@
|
|||||||
|
|
||||||
colorsHash = builtins.hashString "sha256" (builtins.toJSON colors);
|
colorsHash = builtins.hashString "sha256" (builtins.toJSON colors);
|
||||||
|
|
||||||
customCli = inputs.caelestia-cli.packages.${pkgs.stdenv.hostPlatform.system}.default.overrideAttrs (oldAttrs: {
|
customCli =
|
||||||
|
inputs.caelestia-cli.packages.${pkgs.stdenv.hostPlatform.system}.default.overrideAttrs
|
||||||
|
(oldAttrs: {
|
||||||
name = "${oldAttrs.name or "caelestia-cli"}-themed-${colorsHash}";
|
name = "${oldAttrs.name or "caelestia-cli"}-themed-${colorsHash}";
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
mkdir -p $sourceRoot/src/caelestia/data/schemes/custom/main
|
mkdir -p $sourceRoot/src/caelestia/data/schemes/custom/main
|
||||||
|
|||||||
@@ -7,9 +7,8 @@
|
|||||||
colors = config.lib.stylix.colors;
|
colors = config.lib.stylix.colors;
|
||||||
|
|
||||||
mkMenu = menu: let
|
mkMenu = menu: let
|
||||||
configFile =
|
configFile = pkgs.writeText "config.yaml" (
|
||||||
pkgs.writeText "config.yaml"
|
lib.generators.toYAML {} {
|
||||||
(lib.generators.toYAML {} {
|
|
||||||
anchor = "bottom-right";
|
anchor = "bottom-right";
|
||||||
border = "#${colors.base0D}80";
|
border = "#${colors.base0D}80";
|
||||||
background = "#${colors.base01}EE";
|
background = "#${colors.base01}EE";
|
||||||
@@ -19,7 +18,8 @@
|
|||||||
rows_per_column = 5;
|
rows_per_column = 5;
|
||||||
|
|
||||||
inherit menu;
|
inherit menu;
|
||||||
});
|
}
|
||||||
|
);
|
||||||
in
|
in
|
||||||
pkgs.writeShellScriptBin "menu" ''
|
pkgs.writeShellScriptBin "menu" ''
|
||||||
exec ${lib.getExe pkgs.wlr-which-key} ${configFile}
|
exec ${lib.getExe pkgs.wlr-which-key} ${configFile}
|
||||||
@@ -32,7 +32,8 @@ in {
|
|||||||
bind =
|
bind =
|
||||||
[
|
[
|
||||||
# Applications
|
# Applications
|
||||||
("$shiftMod, A, exec, "
|
(
|
||||||
|
"$shiftMod, A, exec, "
|
||||||
+ lib.getExe (mkMenu [
|
+ lib.getExe (mkMenu [
|
||||||
{
|
{
|
||||||
key = "a";
|
key = "a";
|
||||||
@@ -84,14 +85,16 @@ in {
|
|||||||
desc = "Qutebrowser (Temp session)";
|
desc = "Qutebrowser (Temp session)";
|
||||||
cmd = "${pkgs.qutebrowser}/bin/qutebrowser --temp-basedir";
|
cmd = "${pkgs.qutebrowser}/bin/qutebrowser --temp-basedir";
|
||||||
}
|
}
|
||||||
]))
|
])
|
||||||
|
)
|
||||||
|
|
||||||
# Web links
|
# Web links
|
||||||
"$mod,B, exec, uwsm app -- ${pkgs.qutebrowser}/bin/qutebrowser" # Browser (Qutebrowser)
|
"$mod,B, exec, uwsm app -- ${pkgs.qutebrowser}/bin/qutebrowser" # Browser (Qutebrowser)
|
||||||
|
|
||||||
# Power
|
# Power
|
||||||
"$mod, X, global, caelestia:session" # Powermenu
|
"$mod, X, global, caelestia:session" # Powermenu
|
||||||
("$shiftMod, X, exec, "
|
(
|
||||||
|
"$shiftMod, X, exec, "
|
||||||
+ lib.getExe (mkMenu [
|
+ lib.getExe (mkMenu [
|
||||||
{
|
{
|
||||||
key = "l";
|
key = "l";
|
||||||
@@ -123,7 +126,8 @@ in {
|
|||||||
desc = "Restart caelestia";
|
desc = "Restart caelestia";
|
||||||
cmd = "hyprctl dispatch exec 'caelestia-shell kill | sleep 1 | caelestia-shell'";
|
cmd = "hyprctl dispatch exec 'caelestia-shell kill | sleep 1 | caelestia-shell'";
|
||||||
}
|
}
|
||||||
]))
|
])
|
||||||
|
)
|
||||||
|
|
||||||
# Quick launch
|
# Quick launch
|
||||||
"$mod,RETURN, exec, uwsm app -- ${pkgs.ghostty}/bin/ghostty" # Ghostty (terminal)
|
"$mod,RETURN, exec, uwsm app -- ${pkgs.ghostty}/bin/ghostty" # Ghostty (terminal)
|
||||||
@@ -154,13 +158,17 @@ in {
|
|||||||
", Print, global, caelestia:screenshotFreeze" # Capture region (freeze)
|
", Print, global, caelestia:screenshotFreeze" # Capture region (freeze)
|
||||||
"$shiftMod+Alt, S, global, caelestia:screenshot" # Capture region
|
"$shiftMod+Alt, S, global, caelestia:screenshot" # Capture region
|
||||||
]
|
]
|
||||||
++ (builtins.concatLists (builtins.genList (i: let
|
++ (builtins.concatLists (
|
||||||
|
builtins.genList (
|
||||||
|
i: let
|
||||||
ws = i + 1;
|
ws = i + 1;
|
||||||
in [
|
in [
|
||||||
"$mod,code:1${toString i}, workspace, ${toString ws}"
|
"$mod,code:1${toString i}, workspace, ${toString ws}"
|
||||||
"$mod SHIFT,code:1${toString i}, movetoworkspace, ${toString ws}"
|
"$mod SHIFT,code:1${toString i}, movetoworkspace, ${toString ws}"
|
||||||
])
|
]
|
||||||
9));
|
)
|
||||||
|
9
|
||||||
|
));
|
||||||
|
|
||||||
bindm = [
|
bindm = [
|
||||||
"$mod,mouse:272, movewindow" # Move Window (mouse)
|
"$mod,mouse:272, movewindow" # Move Window (mouse)
|
||||||
|
|||||||
@@ -62,9 +62,6 @@ in {
|
|||||||
];
|
];
|
||||||
|
|
||||||
monitor = [
|
monitor = [
|
||||||
"eDP-2,highres,0x0,1" # My internal laptop screen
|
|
||||||
"desc:AOC U34G2G1 0x00000E06,3440x1440@99.98,auto,1" # My external monitor
|
|
||||||
"desc:Philips Consumer Electronics Company PHL 221B8L ZV02144013987,highres,0x0,1"
|
|
||||||
",prefered,auto,1" # default
|
",prefered,auto,1" # default
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -39,4 +39,6 @@
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
command = "bash ${keyboard-backlight}/bin/keyboard-backlight &";
|
command = "bash ${keyboard-backlight}/bin/keyboard-backlight &";
|
||||||
in {wayland.windowManager.hyprland.settings.exec-once = [command];}
|
in {
|
||||||
|
wayland.windowManager.hyprland.settings.exec-once = [command];
|
||||||
|
}
|
||||||
|
|||||||
@@ -8,8 +8,7 @@
|
|||||||
splash = false;
|
splash = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
systemd.user.services.hyprpaper.Unit.After =
|
systemd.user.services.hyprpaper.Unit.After = lib.mkForce "graphical-session.target";
|
||||||
lib.mkForce "graphical-session.target";
|
|
||||||
|
|
||||||
wayland.windowManager.hyprland.settings.exec-once = [
|
wayland.windowManager.hyprland.settings.exec-once = [
|
||||||
"systemctl --user enable --now hyprpaper.service"
|
"systemctl --user enable --now hyprpaper.service"
|
||||||
|
|||||||
@@ -117,14 +117,17 @@ with lib; let
|
|||||||
desktopName = "Neovim (Ghostty)";
|
desktopName = "Neovim (Ghostty)";
|
||||||
exec = ''ghostty --title="Neovim Editor" -e nvim %F'';
|
exec = ''ghostty --title="Neovim Editor" -e nvim %F'';
|
||||||
terminal = false;
|
terminal = false;
|
||||||
categories = ["Development" "TextEditor"];
|
categories = [
|
||||||
|
"Development"
|
||||||
|
"TextEditor"
|
||||||
|
];
|
||||||
mimeTypes = mimeMap.code ++ mimeMap.text;
|
mimeTypes = mimeMap.code ++ mimeMap.text;
|
||||||
};
|
};
|
||||||
|
|
||||||
associations = with lists;
|
associations = with lists;
|
||||||
listToAttrs (flatten (mapAttrsToList
|
listToAttrs (
|
||||||
(key: map (type: attrsets.nameValuePair type defaultApps."${key}"))
|
flatten (mapAttrsToList (key: map (type: attrsets.nameValuePair type defaultApps."${key}")) mimeMap)
|
||||||
mimeMap));
|
);
|
||||||
in {
|
in {
|
||||||
home.packages = [nvim-ghostty];
|
home.packages = [nvim-ghostty];
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
../../nixos/users.nix
|
../../nixos/users.nix
|
||||||
../../nixos/utils.nix
|
../../nixos/utils.nix
|
||||||
../../nixos/hyprland.nix
|
../../nixos/hyprland.nix
|
||||||
|
../../nixos/usbguard.nix
|
||||||
|
|
||||||
../../nixos/omen.nix # CHANGEME: For my laptop only, remove this (OMEN 16)
|
../../nixos/omen.nix # CHANGEME: For my laptop only, remove this (OMEN 16)
|
||||||
|
|
||||||
@@ -20,6 +21,29 @@
|
|||||||
./variables.nix
|
./variables.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# USBGuard:
|
||||||
|
# Allow all USB devices until a proper policy is configured.
|
||||||
|
# Run `sudo usbguard generate-policy` with your devices plugged in,
|
||||||
|
# then set rules = "<output>" and switch implicitPolicyTarget to "block".
|
||||||
|
# services.usbguard.implicitPolicyTarget = lib.mkForce "allow";
|
||||||
|
|
||||||
|
services.usbguard.rules = ''
|
||||||
|
allow id 1532:02a1 serial "" name "Razer Ornata V3" hash "wfuIjBhhGuge8gflyA526SKqKoy8rHJZQZ+2o6usMiE=" parent-hash "MSXcPAlZqkpTyZQylOhSIB8eMfST2AzVHV9EbrBGTWc=" with-interface { 03:01:01 03:00:01 03:00:02 } with-connect-type "unknown"
|
||||||
|
allow id 1d6b:0002 serial "0000:05:00.3" name "xHCI Host Controller" hash "4a4NgfdUaJO43rkCzmWRSeHHR/uUh5+SNsXnhosm9qs=" parent-hash "ldMchY4Tt4GPUYo30eNGvai+Fs/EdnVY3vMyxJUq4Nk=" with-interface 09:00:00 with-connect-type ""
|
||||||
|
allow id 1d6b:0003 serial "0000:05:00.3" name "xHCI Host Controller" hash "d+DNGWARDtv9nEK2ZvnNOCtFernuMu5/e/oZ7kCppqQ=" parent-hash "ldMchY4Tt4GPUYo30eNGvai+Fs/EdnVY3vMyxJUq4Nk=" with-interface 09:00:00 with-connect-type ""
|
||||||
|
allow id 0bda:c85c serial "00e04c000001" name "Bluetooth Radio" hash "Q/wlToV8WQgEYHBW/UIhnSwCCusCGqAR2D5gspSCImQ=" parent-hash "4a4NgfdUaJO43rkCzmWRSeHHR/uUh5+SNsXnhosm9qs=" with-interface { e0:01:01 e0:01:01 e0:01:01 e0:01:01 e0:01:01 e0:01:01 e0:01:01 e0:01:01 } with-connect-type "hardwired"
|
||||||
|
allow id 30c9:009f serial "01.00.00" name "HP True Vision FHD Camera" hash "eYW5fqReJd29tfHXkEktKC63dGfDpmlRMo5uMGUWwME=" parent-hash "icotY3rI59mWiKsGxc59BGZZeBjfbuH0b4NUByj3cbQ=" with-interface { 0e:01:01 0e:02:01 0e:02:01 0e:02:01 0e:02:01 0e:02:01 0e:02:01 0e:02:01 0e:02:01 0e:02:01 0e:02:01 0e:02:01 0e:02:01 fe:01:01 } with-connect-type "hardwired"
|
||||||
|
allow id 03f0:036b serial "" name "HP USB-C Dock G5" hash "iPFGrgGz0sWgKQjWD/F8eNOhkeR728dTG8JJtkUSvuM=" parent-hash "Hp8B0Enf+ACRT2tyy0EqXj7eNsFDAnTRZadzuh/Iqd4=" with-interface { 09:00:01 09:00:02 } with-connect-type "hotplug"
|
||||||
|
allow id 03f0:066b serial "" name "HP USB-C Dock G5" hash "JHDjLFApQNqijjmuKdJSWH5+1oLL7S6LQ9QHTAk5fTk=" parent-hash "rJ3LKdvkCK3SUrCU3lV8qVbmPjA+r9Fe5106x2HlgK4=" with-interface 09:00:00 with-connect-type "hotplug"
|
||||||
|
allow id 03f0:056b serial "201604140001" name "USB Audio" hash "OxQ8HQenW3/4HSGEBOSYFS15rXDTOaNDnjMbICweHgw=" parent-hash "iPFGrgGz0sWgKQjWD/F8eNOhkeR728dTG8JJtkUSvuM=" with-interface { 01:01:00 01:02:00 01:02:00 01:02:00 01:02:00 03:00:00 } with-connect-type "unknown"
|
||||||
|
allow id 03f0:086b serial "" name "USB2734" hash "MSXcPAlZqkpTyZQylOhSIB8eMfST2AzVHV9EbrBGTWc=" parent-hash "iPFGrgGz0sWgKQjWD/F8eNOhkeR728dTG8JJtkUSvuM=" with-interface { 09:00:01 09:00:02 } with-connect-type "unknown"
|
||||||
|
allow id 03f0:046b serial "11AD1D0A89EA2D08310E0B00" name "HP USB-C Dock G5" hash "DEGeuj1u4lwqrzp0UksFX7mSEY9JnGLxg7yxGbglAKE=" parent-hash "iPFGrgGz0sWgKQjWD/F8eNOhkeR728dTG8JJtkUSvuM=" with-interface { 11:00:00 ff:03:00 03:00:00 } with-connect-type "unknown"
|
||||||
|
allow id 03f0:076b serial "" name "USB5734" hash "BshoqybYo0IKgoDORYPRtbhhlmQrYAxPQb2EAm1JsWA=" parent-hash "JHDjLFApQNqijjmuKdJSWH5+1oLL7S6LQ9QHTAk5fTk=" with-interface 09:00:00 with-connect-type "unknown"
|
||||||
|
allow id 0bda:8153 serial "000001000000" name "USB 10/100/1000 LAN" hash "utEnXKJ57kRUbPcGUaNWhEyoOEbLOYAFxvlsyC0PZkk=" parent-hash "JHDjLFApQNqijjmuKdJSWH5+1oLL7S6LQ9QHTAk5fTk=" with-interface { ff:ff:00 02:06:00 0a:00:00 0a:00:00 } with-connect-type "unknown"
|
||||||
|
allow id 046d:0ab7 serial "2046BAB04T68" name "Blue Microphones" hash "cC6AQ2e1Q/BeFeostpbf1mH2WpoUmt6bhau4NlA3niU=" parent-hash "MSXcPAlZqkpTyZQylOhSIB8eMfST2AzVHV9EbrBGTWc=" with-interface { 01:01:00 01:02:00 01:02:00 01:02:00 01:02:00 01:02:00 01:02:00 03:00:00 } with-connect-type "unknown"
|
||||||
|
allow id 13fd:5900 serial "50026B76861EE752 " name "External" hash "Xebp3uQRrhCKBHdGRVKXH0I5Vdawi4mSpuu0ttKgDyE=" parent-hash "BshoqybYo0IKgoDORYPRtbhhlmQrYAxPQb2EAm1JsWA=" with-interface { 08:06:50 08:06:62 } with-connect-type "unknown"
|
||||||
|
'';
|
||||||
|
|
||||||
home-manager.users."${config.var.username}" = import ./home.nix;
|
home-manager.users."${config.var.username}" = import ./home.nix;
|
||||||
|
|
||||||
# Don't touch this
|
# Don't touch this
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
{
|
||||||
|
inputs,
|
||||||
|
nixpkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
nixpkgs.lib.nixosSystem {
|
||||||
|
modules = [
|
||||||
|
{
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(final: prev: {
|
||||||
|
# FIXME: Workaround: Mesa crash with AMD GPU + Wayland + Qt 6.11.0
|
||||||
|
qutebrowser = prev.symlinkJoin {
|
||||||
|
name = "qutebrowser";
|
||||||
|
paths = [prev.qutebrowser];
|
||||||
|
buildInputs = [prev.makeWrapper];
|
||||||
|
postBuild = ''
|
||||||
|
wrapProgram $out/bin/qutebrowser \
|
||||||
|
--set LIBGL_ALWAYS_SOFTWARE 1
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
})
|
||||||
|
];
|
||||||
|
_module.args = {inherit inputs;};
|
||||||
|
}
|
||||||
|
inputs.nixos-hardware.nixosModules.omen-16-n0005ne
|
||||||
|
inputs.home-manager.nixosModules.home-manager
|
||||||
|
inputs.stylix.nixosModules.stylix
|
||||||
|
inputs.nix-index-database.nixosModules.default
|
||||||
|
./configuration.nix
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -11,7 +11,13 @@
|
|||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "uas" "usbhid" "sd_mod"];
|
boot.initrd.availableKernelModules = [
|
||||||
|
"nvme"
|
||||||
|
"xhci_pci"
|
||||||
|
"uas"
|
||||||
|
"usbhid"
|
||||||
|
"sd_mod"
|
||||||
|
];
|
||||||
boot.initrd.kernelModules = [];
|
boot.initrd.kernelModules = [];
|
||||||
boot.kernelModules = ["kvm-amd"];
|
boot.kernelModules = ["kvm-amd"];
|
||||||
boot.extraModulePackages = [];
|
boot.extraModulePackages = [];
|
||||||
@@ -24,7 +30,10 @@
|
|||||||
fileSystems."/boot" = {
|
fileSystems."/boot" = {
|
||||||
device = "/dev/disk/by-uuid/5251-9B85";
|
device = "/dev/disk/by-uuid/5251-9B85";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = ["fmask=0077" "dmask=0077"];
|
options = [
|
||||||
|
"fmask=0077"
|
||||||
|
"dmask=0077"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [];
|
swapDevices = [];
|
||||||
|
|||||||
+15
-2
@@ -36,7 +36,9 @@
|
|||||||
home = {
|
home = {
|
||||||
inherit (config.var) username;
|
inherit (config.var) username;
|
||||||
homeDirectory = "/home/" + config.var.username;
|
homeDirectory = "/home/" + config.var.username;
|
||||||
file.".face" = {source = ./profile_picture.png;};
|
file.".face" = {
|
||||||
|
source = ./profile_picture.png;
|
||||||
|
};
|
||||||
|
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
AQ_DRM_DEVICES = "/dev/dri/card2:/dev/dri/card1"; # CHANGEME: Related to the GPU
|
AQ_DRM_DEVICES = "/dev/dri/card2:/dev/dri/card1"; # CHANGEME: Related to the GPU
|
||||||
@@ -46,5 +48,16 @@
|
|||||||
stateVersion = "24.05";
|
stateVersion = "24.05";
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.home-manager.enable = true;
|
wayland.windowManager.hyprland.settings.monitor = [
|
||||||
|
"eDP-2,highres,0x0,1" # My internal laptop screen
|
||||||
|
"desc:AOC U34G2G1 0x00000E06,3440x1440@99.98,auto,1" # My external monitor
|
||||||
|
];
|
||||||
|
|
||||||
|
programs = {
|
||||||
|
home-manager.enable = true;
|
||||||
|
nixy = {
|
||||||
|
enable = true;
|
||||||
|
configDirectory = config.var.configDirectory;
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,11 +14,21 @@ in {
|
|||||||
age.keyFile = "${home}/.config/sops/age/keys.txt";
|
age.keyFile = "${home}/.config/sops/age/keys.txt";
|
||||||
defaultSopsFile = ./secrets.yaml;
|
defaultSopsFile = ./secrets.yaml;
|
||||||
secrets = {
|
secrets = {
|
||||||
ssh-config = {path = "${home}/.ssh/config";};
|
ssh-config = {
|
||||||
github-key = {path = "${home}/.ssh/github";};
|
path = "${home}/.ssh/config";
|
||||||
jack-key = {path = "${home}/.ssh/jack";};
|
};
|
||||||
signing-key = {path = "${home}/.ssh/key";};
|
github-key = {
|
||||||
signing-pub-key = {path = "${home}/.ssh/key.pub";};
|
path = "${home}/.ssh/github";
|
||||||
|
};
|
||||||
|
jack-key = {
|
||||||
|
path = "${home}/.ssh/jack";
|
||||||
|
};
|
||||||
|
signing-key = {
|
||||||
|
path = "${home}/.ssh/key";
|
||||||
|
};
|
||||||
|
signing-pub-key = {
|
||||||
|
path = "${home}/.ssh/key.pub";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -42,7 +52,10 @@ in {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
systemd.user.services.mbsync.Unit.After = ["sops-nix.service"];
|
systemd.user.services.mbsync.Unit.After = ["sops-nix.service"];
|
||||||
home.packages = with pkgs; [sops age];
|
home.packages = with pkgs; [
|
||||||
|
sops
|
||||||
|
age
|
||||||
|
];
|
||||||
|
|
||||||
wayland.windowManager.hyprland.settings.exec-once = ["systemctl --user start sops-nix"];
|
wayland.windowManager.hyprland.settings.exec-once = ["systemctl --user start sops-nix"];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
ssh-config: ENC[AES256_GCM,data:LE468Anl/ri1JBOdNOsMPanhHcasn68NCOHewCLOfU7NpMxCdJ9sdHFxuFJ34F8OB2qPjGTtRCv0d+75aeJNrh1hwUyyD5DBoWgM0vvQit/VpmpNgLPndWo6dIo2Xf1xPJdaADiLBIjsNNgUUmo6N8InT4eLihDOepbHwyVD0qFYFC1vze+V253aodLADfp3YbRI7MvUQrn+vjiDtuyEBMcYBqUQF1DhLYDbM/S6ez6NdscxTJvdM33u4rRehn8p3hE1mOovM/0f7gjvmtXpJqaBQ1aP7CoitI5U/eORQj51KrtIBtwQbDRA9CUWTQmm7Q6EAfDuyPsQYbwvqbl46GpbHaXLXMe04NUnxGxeDoMLw3S348iH5owfAp+NKRxK8QBc6cguIw9fwEzDixvaHzbMuby5Xxlm2O0OtZ3EE/M7Q721rZ2y9mfGksDmIYlYMO8DyrHppFXwoBr7ZSGd3R4CGg==,iv:7w9YqC3Dt7MMnEe0jFRsIhhbU+vMdmxpLM4RPL4viHY=,tag:3Tuccvume125sFgXoqXTRw==,type:str]
|
ssh-config: ENC[AES256_GCM,data:/TWslzoF2wtZ9T41H1y0wLNEx+Xzff8pQGr6AfEcACExRCv4rd5hD9pNAlmlcTtISJJBPEWY45WsLfSKuD4r3715IENM2biQUvlq47THfkGviQuQ6KAXiJxBQ/7qRNqGGt7WFRlWFRGYCiyjw9h4pOhovGgw8TU6tIgIsXjo0psclHoJoE4B3cSOby7DbN8jVI9NjpBGiQMXmUB3JVz7muC9F5EAs+XZUIl7TjQMxob3PiF5LqTJITODSxboAAk901rjS5gjQKpQKfj28TpUs5yCIo9RzSBO3z5orJy+ylupocRuqtC8ujAMqNb828G+0nRx18tpiGqXxRWUBZRNbM+vQHWzb5JWQpEBsu1twsOownVVrkyPkbLpYX4YSSnRdnL8VHmlZfLk1ZFURbsdDSRf57F+Bxo5Yn8XAkFaM5HYgUo4VBabGzVVAHOBWJWi3lRrlAqYdMBbSvDl1t6eQ0xp990RGh7wZvwnaTDqtkOJnLoAknTFi4yjMzSyk5UV,iv:1UJQU4eBZE1BMVnJY2CQTDH8jXSMlrv3gGU3cKTOvdU=,tag:OzLQRkTAKG2KQXv+Vh7Msw==,type:str]
|
||||||
github-key: ENC[AES256_GCM,data:xUgFMlBo8e+3eXqNscxbby1dWug3SgUagDiNUe/IGVbU6cczkaJ3uOaB0OuRBQ8AYhOLkzXj0pIKjUrElHwmYrhURtS1aF4SFEGJsjhhobNA//j3E2/5/nLVjfco+lRzyHdwmsNhEUCqEhsXrrodJMb39H4b5oip3z0rjc729YveiWUKQxXVZVPurp3nq9yNnix9R4CA6XYFRW6T6MNqgPD5qhbcDlhxLb/SN+uI5h+5eZIS24VDWlKaTaCLL5KLhZmfuA37SquOQ+edi9Yg8MnfrZkMrp/3qmAjP2rSQLMOc4QdQCLQBQSf0/snpydgLwY+FoJmMSztwtkqUdIZWOfDUJbJxegEOrAR68jLTNbp+GYiDn3thtOZDiK5p/M1amjCT+A9qeFMed5WS+aZHNTRbR9UcfiP6+48MGZFt1mr7q+/CoL04/DTp0w6tUf6/SZD31NvTJDqngkhpc0ZH9Dh5+2JcnBWpq25AM36kZTn1hIQCLNTr/oGWZXSLA2tksAhQCaUcFj4IIh6Bl96,iv:GEJsAs5NriwENYTV/VShgJF6iMmrtTwNiXOvfXyEP8E=,tag:nfZgsFqaet075GjQAoVZxQ==,type:str]
|
github-key: ENC[AES256_GCM,data:xUgFMlBo8e+3eXqNscxbby1dWug3SgUagDiNUe/IGVbU6cczkaJ3uOaB0OuRBQ8AYhOLkzXj0pIKjUrElHwmYrhURtS1aF4SFEGJsjhhobNA//j3E2/5/nLVjfco+lRzyHdwmsNhEUCqEhsXrrodJMb39H4b5oip3z0rjc729YveiWUKQxXVZVPurp3nq9yNnix9R4CA6XYFRW6T6MNqgPD5qhbcDlhxLb/SN+uI5h+5eZIS24VDWlKaTaCLL5KLhZmfuA37SquOQ+edi9Yg8MnfrZkMrp/3qmAjP2rSQLMOc4QdQCLQBQSf0/snpydgLwY+FoJmMSztwtkqUdIZWOfDUJbJxegEOrAR68jLTNbp+GYiDn3thtOZDiK5p/M1amjCT+A9qeFMed5WS+aZHNTRbR9UcfiP6+48MGZFt1mr7q+/CoL04/DTp0w6tUf6/SZD31NvTJDqngkhpc0ZH9Dh5+2JcnBWpq25AM36kZTn1hIQCLNTr/oGWZXSLA2tksAhQCaUcFj4IIh6Bl96,iv:GEJsAs5NriwENYTV/VShgJF6iMmrtTwNiXOvfXyEP8E=,tag:nfZgsFqaet075GjQAoVZxQ==,type:str]
|
||||||
jack-key: ENC[AES256_GCM,data:VfCl3wH0MMBc8QDyjLDFeSvzSEsf7uGpfJvRjFrmjW+bPRUXBpZhJV8a9VQIAz7z7zZXvzARMfCeI0ydyC57CW81GH5/H5pneJ4b+xreINjVfdLbL1nC1thelo/O64jda/L+xVKhgE+QQi8/zt4JmXGghkP+74nYcTTaMpmcbgWw354J1ybXqyCEY+88nsJ1d2s+M7M2bplx4fGb7sLUs6sqdsad3sENzhH/0HQCFXreHTtgsLbIs8ccmdRgFNKM8/wD0OoW76rOQsJoA9JY4yOTQNVoX5M8+Olj6+wVlt6QBrWrYRuEztGnHrHvzxiHXtmEkMwVNfoPpEflQyRYRa0rVp/66REOkMckGx6/LbxKFgrxnifRlsK3kWd28v2bRGVQOghUluYUtVkaJ+eh6o6ik0NQKx8/H6BznBSDE6MjDwbLv434LHBfDtAqhWN1eMbOlunFivsl5Hb/6rl9kydHlcCS6FY8cUHoKQ90gDaUuDrvUifwmdO5hU0GH5tgvGi1ReK9ndcpQsrHptG6,iv:oC1xU5Tu3The105VYRmxIw4kEwDoqe8T/EH6mmqpqwQ=,tag:Pu8c536u6W7ALrqjRsvXDw==,type:str]
|
jack-key: ENC[AES256_GCM,data:VfCl3wH0MMBc8QDyjLDFeSvzSEsf7uGpfJvRjFrmjW+bPRUXBpZhJV8a9VQIAz7z7zZXvzARMfCeI0ydyC57CW81GH5/H5pneJ4b+xreINjVfdLbL1nC1thelo/O64jda/L+xVKhgE+QQi8/zt4JmXGghkP+74nYcTTaMpmcbgWw354J1ybXqyCEY+88nsJ1d2s+M7M2bplx4fGb7sLUs6sqdsad3sENzhH/0HQCFXreHTtgsLbIs8ccmdRgFNKM8/wD0OoW76rOQsJoA9JY4yOTQNVoX5M8+Olj6+wVlt6QBrWrYRuEztGnHrHvzxiHXtmEkMwVNfoPpEflQyRYRa0rVp/66REOkMckGx6/LbxKFgrxnifRlsK3kWd28v2bRGVQOghUluYUtVkaJ+eh6o6ik0NQKx8/H6BznBSDE6MjDwbLv434LHBfDtAqhWN1eMbOlunFivsl5Hb/6rl9kydHlcCS6FY8cUHoKQ90gDaUuDrvUifwmdO5hU0GH5tgvGi1ReK9ndcpQsrHptG6,iv:oC1xU5Tu3The105VYRmxIw4kEwDoqe8T/EH6mmqpqwQ=,tag:Pu8c536u6W7ALrqjRsvXDw==,type:str]
|
||||||
signing-key: ENC[AES256_GCM,data:NvLqmt7NzrWkbQQqFfosmSMvEv8C8+MDDpxSoDo3zZ3MR6WXr9B+6CnUc6rtevM230wgE17VC9XlmcQxX+PjJsWq6gZteK5THTIcrR5zPJVNlVCEyeLKoFj/6m7qBgyyoN3OjCNjgMkhsm009jwBgNk0qJMAYebOGo8eoP/al+4ytm7dhna+iX5WZabAg0J4z4JMDQonqQl3SaDnCEdHvk9m7ZEP2vUFscPkbLj4ewgFq+bUCHOOQb2uqRJoEgcR/NetRFcQfzcU6lp7JxobaICaO3zdmomUm7oabIUTrc3Kom3Wjw8ryqfqC1/SC0SHr5XGk2ygk0WnlQ4kNshqriL2dwbWAzy1Z/cTX9+aB/KNtC0U6zWG1bpnL3dgSgvhRiocIis/eNg1HWsLWVicmdebL/lXHztxFMdTuX/gWgQBotggTmx+OFGZfP9ZGlF3635mDxM/fEOCtTyA195dMicCUsjEpBegNtXsp+oOtxyRI0jSW47MBcXFP09f5ywELTPyz4eOUHO8sQ6UfJ6X,iv:KNQUlMPaiR4x1Fw+HZe/EOmh/gfsrqlefpq23uflz/8=,tag:illu42HKunQXnijjsUIvnQ==,type:str]
|
signing-key: ENC[AES256_GCM,data:NvLqmt7NzrWkbQQqFfosmSMvEv8C8+MDDpxSoDo3zZ3MR6WXr9B+6CnUc6rtevM230wgE17VC9XlmcQxX+PjJsWq6gZteK5THTIcrR5zPJVNlVCEyeLKoFj/6m7qBgyyoN3OjCNjgMkhsm009jwBgNk0qJMAYebOGo8eoP/al+4ytm7dhna+iX5WZabAg0J4z4JMDQonqQl3SaDnCEdHvk9m7ZEP2vUFscPkbLj4ewgFq+bUCHOOQb2uqRJoEgcR/NetRFcQfzcU6lp7JxobaICaO3zdmomUm7oabIUTrc3Kom3Wjw8ryqfqC1/SC0SHr5XGk2ygk0WnlQ4kNshqriL2dwbWAzy1Z/cTX9+aB/KNtC0U6zWG1bpnL3dgSgvhRiocIis/eNg1HWsLWVicmdebL/lXHztxFMdTuX/gWgQBotggTmx+OFGZfP9ZGlF3635mDxM/fEOCtTyA195dMicCUsjEpBegNtXsp+oOtxyRI0jSW47MBcXFP09f5ywELTPyz4eOUHO8sQ6UfJ6X,iv:KNQUlMPaiR4x1Fw+HZe/EOmh/gfsrqlefpq23uflz/8=,tag:illu42HKunQXnijjsUIvnQ==,type:str]
|
||||||
@@ -14,7 +14,7 @@ sops:
|
|||||||
cmVxVC8rVDlWMUdZaGw3bmdOaWZGS1EKYahBlc8XpB5UdKZQkvxbLcKQ/xkFJjWo
|
cmVxVC8rVDlWMUdZaGw3bmdOaWZGS1EKYahBlc8XpB5UdKZQkvxbLcKQ/xkFJjWo
|
||||||
FSfQWnjhe/a7BJtJEcKZkjOQU0mYqlSu+uT2RA9diCQeRUJPRF+nAw==
|
FSfQWnjhe/a7BJtJEcKZkjOQU0mYqlSu+uT2RA9diCQeRUJPRF+nAw==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2026-04-17T22:53:33Z"
|
lastmodified: "2026-04-25T11:23:30Z"
|
||||||
mac: ENC[AES256_GCM,data:dA/D1q3t+AA4M7UOSF8lhTtC71D56l6njhh/Oaxnro0zQYRTCHO+K3u43srVzTdwaCAtQtKRcpbrjANpO3sgb9iqZme5asfLFGqDr0bbWXir7BwDyZVgkw8XiYGPtpEYlgdwLwYxejpZtRlE7IeFCRkEmlvWJHq4R3SfbjKkOxE=,iv:0JHoWrQbjzW/gmj6HcBf+2O0cZeBC9kT76ue8ubJwaU=,tag:9fSVDwN2qgsre5yVr7DpMw==,type:str]
|
mac: ENC[AES256_GCM,data:ZnLSwtyhaiMIcXxzlwhtk0dWVnOkn0avfeRezPPNBUXd0oyJY+krBsLXJdSNPHV/X/L58476okYjUzfIQzEAkrL9Fb7v/Jt0aw4SDrxbF+qbcfdvsWPUjFDJIPovuf3ee3o7iXGU2ItGTaJa2eFACoyd37KVc7jZd6gvYYAyULA=,iv:7IKqe0c5CTgJrS7OgCQWhtxaCVKo+UWEibttFUVCWGM=,tag:OfCrKPzrPBZThCR1j7IB7A==,type:str]
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.12.2
|
version: 3.12.2
|
||||||
|
|||||||
@@ -11,10 +11,7 @@
|
|||||||
config.var = {
|
config.var = {
|
||||||
hostname = "h-laptop";
|
hostname = "h-laptop";
|
||||||
username = "hadi";
|
username = "hadi";
|
||||||
configDirectory =
|
configDirectory = "/home/" + config.var.username + "/.config/nixos"; # The path of the nixos configuration directory
|
||||||
"/home/"
|
|
||||||
+ config.var.username
|
|
||||||
+ "/.config/nixos"; # The path of the nixos configuration directory
|
|
||||||
|
|
||||||
keyboardLayout = "fr";
|
keyboardLayout = "fr";
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
inputs,
|
||||||
|
nixpkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
nixpkgs.lib.nixosSystem {
|
||||||
|
modules = [
|
||||||
|
{_module.args = {inherit inputs;};}
|
||||||
|
inputs.home-manager.nixosModules.home-manager
|
||||||
|
inputs.stylix.nixosModules.stylix
|
||||||
|
inputs.sops-nix.nixosModules.sops
|
||||||
|
inputs.nixarr.nixosModules.default
|
||||||
|
# inputs.eleakxir.nixosModules.eleakxir
|
||||||
|
inputs.nix-index-database.nixosModules.default
|
||||||
|
inputs.default-creds.nixosModules.default
|
||||||
|
./configuration.nix
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -9,7 +9,14 @@
|
|||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
|
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
|
||||||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
|
boot.initrd.availableKernelModules = [
|
||||||
|
"xhci_pci"
|
||||||
|
"ahci"
|
||||||
|
"nvme"
|
||||||
|
"usbhid"
|
||||||
|
"usb_storage"
|
||||||
|
"sd_mod"
|
||||||
|
];
|
||||||
boot.initrd.kernelModules = ["dm-snapshot"];
|
boot.initrd.kernelModules = ["dm-snapshot"];
|
||||||
boot.kernelModules = ["kvm-amd"];
|
boot.kernelModules = ["kvm-amd"];
|
||||||
boot.extraModulePackages = [];
|
boot.extraModulePackages = [];
|
||||||
@@ -20,12 +27,18 @@
|
|||||||
fileSystems."/boot" = {
|
fileSystems."/boot" = {
|
||||||
device = "/dev/disk/by-uuid/DD15-1125";
|
device = "/dev/disk/by-uuid/DD15-1125";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = ["fmask=0077" "dmask=0077"];
|
options = [
|
||||||
|
"fmask=0077"
|
||||||
|
"dmask=0077"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
fileSystems."/mnt/data" = {
|
fileSystems."/mnt/data" = {
|
||||||
device = "/dev/disk/by-uuid/0b055155-0134-448c-b1ca-e81030ff064e";
|
device = "/dev/disk/by-uuid/0b055155-0134-448c-b1ca-e81030ff064e";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = ["subvol=/" "compress=zstd"]; # adapte selon si t'as des subvolumes
|
options = [
|
||||||
|
"subvol=/"
|
||||||
|
"compress=zstd"
|
||||||
|
]; # adapte selon si t'as des subvolumes
|
||||||
};
|
};
|
||||||
swapDevices = [];
|
swapDevices = [];
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
@@ -35,6 +48,5 @@
|
|||||||
networking.useDHCP = lib.mkDefault true;
|
networking.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.amd.updateMicrocode =
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,4 +23,9 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
|
|
||||||
|
programs.nixy = {
|
||||||
|
enable = true;
|
||||||
|
configDirectory = config.var.configDirectory;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,5 +26,8 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [sops age];
|
environment.systemPackages = with pkgs; [
|
||||||
|
sops
|
||||||
|
age
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,10 +11,7 @@
|
|||||||
config.var = {
|
config.var = {
|
||||||
hostname = "jack";
|
hostname = "jack";
|
||||||
username = "hadi";
|
username = "hadi";
|
||||||
configDirectory =
|
configDirectory = "/home/" + config.var.username + "/.config/nixos"; # The path of the nixos configuration directory
|
||||||
"/home/"
|
|
||||||
+ config.var.username
|
|
||||||
+ "/.config/nixos"; # The path of the nixos configuration directory
|
|
||||||
|
|
||||||
keyboardLayout = "fr";
|
keyboardLayout = "fr";
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
{config, ...}: {
|
||||||
|
imports = [
|
||||||
|
# Mostly system related configuration
|
||||||
|
../../nixos/audio.nix
|
||||||
|
../../nixos/bluetooth.nix
|
||||||
|
../../nixos/fonts.nix
|
||||||
|
../../nixos/home-manager.nix
|
||||||
|
../../nixos/nix.nix
|
||||||
|
../../nixos/systemd-boot.nix
|
||||||
|
../../nixos/sddm.nix
|
||||||
|
../../nixos/users.nix
|
||||||
|
../../nixos/utils.nix
|
||||||
|
../../nixos/hyprland.nix
|
||||||
|
|
||||||
|
# You should let those lines as is
|
||||||
|
./hardware-configuration.nix
|
||||||
|
./variables.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
home-manager.users."${config.var.username}" = import ./home.nix;
|
||||||
|
|
||||||
|
networking.firewall.allowedTCPPorts = [9001];
|
||||||
|
|
||||||
|
# Don't touch this
|
||||||
|
system.stateVersion = "24.05";
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
inputs,
|
||||||
|
nixpkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
nixpkgs.lib.nixosSystem {
|
||||||
|
modules = [
|
||||||
|
{
|
||||||
|
nixpkgs.overlays = [];
|
||||||
|
_module.args = {inherit inputs;};
|
||||||
|
}
|
||||||
|
inputs.home-manager.nixosModules.home-manager
|
||||||
|
inputs.stylix.nixosModules.stylix
|
||||||
|
inputs.nix-index-database.nixosModules.default
|
||||||
|
./configuration.nix
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
# 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,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
imports = [
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [
|
||||||
|
"xhci_pci"
|
||||||
|
"ahci"
|
||||||
|
"nvme"
|
||||||
|
"usb_storage"
|
||||||
|
"usbhid"
|
||||||
|
"sd_mod"
|
||||||
|
];
|
||||||
|
boot.initrd.kernelModules = [];
|
||||||
|
boot.kernelModules = ["kvm-intel"];
|
||||||
|
boot.extraModulePackages = [];
|
||||||
|
|
||||||
|
fileSystems."/" = {
|
||||||
|
device = "/dev/disk/by-uuid/5dbf85d3-d236-4af8-b489-d6066bfe1eb7";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/boot" = {
|
||||||
|
device = "/dev/disk/by-uuid/043E-1755";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = [
|
||||||
|
"fmask=0077"
|
||||||
|
"dmask=0077"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [];
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
{config, ...}: {
|
||||||
|
imports = [
|
||||||
|
# Programs
|
||||||
|
../../home/programs/brave
|
||||||
|
../../home/programs/proton
|
||||||
|
../../home/programs/ghostty
|
||||||
|
../../home/programs/nvf
|
||||||
|
../../home/programs/shell
|
||||||
|
../../home/programs/git
|
||||||
|
../../home/programs/git/lazygit.nix
|
||||||
|
../../home/programs/spicetify
|
||||||
|
../../home/programs/thunar
|
||||||
|
../../home/programs/nixy
|
||||||
|
../../home/programs/nightshift
|
||||||
|
../../home/programs/qutebrowser
|
||||||
|
../../home/programs/nix-utils
|
||||||
|
|
||||||
|
../../home/programs/group/basic-apps.nix
|
||||||
|
../../home/programs/group/cybersecurity.nix
|
||||||
|
../../home/programs/group/dev.nix
|
||||||
|
../../home/programs/group/misc.nix
|
||||||
|
|
||||||
|
# System (Desktop environment like stuff)
|
||||||
|
../../home/system/hyprland
|
||||||
|
../../home/system/caelestia-shell
|
||||||
|
../../home/system/hyprpaper
|
||||||
|
../../home/system/mime
|
||||||
|
../../home/system/udiskie
|
||||||
|
|
||||||
|
./variables.nix # Mostly user-specific configuration
|
||||||
|
./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
|
||||||
|
];
|
||||||
|
|
||||||
|
home = {
|
||||||
|
inherit (config.var) username;
|
||||||
|
homeDirectory = "/home/" + config.var.username;
|
||||||
|
|
||||||
|
# Don't touch this
|
||||||
|
stateVersion = "24.05";
|
||||||
|
};
|
||||||
|
|
||||||
|
wayland.windowManager.hyprland.settings.monitor = [
|
||||||
|
"desc:Philips Consumer Electronics Company PHL 221B8L ZV02144013987,highres,0x0,1"
|
||||||
|
];
|
||||||
|
|
||||||
|
programs = {
|
||||||
|
home-manager.enable = true;
|
||||||
|
nixy = {
|
||||||
|
enable = true;
|
||||||
|
configDirectory = config.var.configDirectory;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
# Those are my secrets, encrypted with sops
|
||||||
|
# You shouldn't import this file, unless you edit it
|
||||||
|
{
|
||||||
|
inputs,
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
home = config.home.homeDirectory;
|
||||||
|
in {
|
||||||
|
imports = [inputs.sops-nix.homeManagerModules.sops];
|
||||||
|
|
||||||
|
sops = {
|
||||||
|
age.keyFile = "${home}/.config/sops/age/keys.txt";
|
||||||
|
defaultSopsFile = ./secrets.yaml;
|
||||||
|
secrets = {
|
||||||
|
ssh-config = {
|
||||||
|
path = "${home}/.ssh/config";
|
||||||
|
};
|
||||||
|
netrc = {
|
||||||
|
path = "${home}/.netrc";
|
||||||
|
};
|
||||||
|
github-key = {
|
||||||
|
path = "${home}/.ssh/github";
|
||||||
|
};
|
||||||
|
gitlab-key = {
|
||||||
|
path = "${home}/.ssh/gitlab";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
home.file.".config/nixos/.sops.yaml".text = ''
|
||||||
|
keys:
|
||||||
|
- &primary age12yvtj49pfh3fqzqflscm0ek4yzrjhr6cqhn7x89gdxnlykq0xudq5c7334
|
||||||
|
- &work age1c8pawdsxptfslgrz2c56s39mrtnjzc5mm3hfzgr2wdwu2v6vfsdsupjsq6
|
||||||
|
creation_rules:
|
||||||
|
- path_regex: hosts/laptop/secrets/secrets.yaml$
|
||||||
|
key_groups:
|
||||||
|
- age:
|
||||||
|
- *primary
|
||||||
|
- path_regex: hosts/server/secrets/secrets.yaml$
|
||||||
|
key_groups:
|
||||||
|
- age:
|
||||||
|
- *primary
|
||||||
|
- path_regex: hosts/work/secrets/secrets.yaml$
|
||||||
|
key_groups:
|
||||||
|
- age:
|
||||||
|
- *work
|
||||||
|
'';
|
||||||
|
|
||||||
|
systemd.user.services.mbsync.Unit.After = ["sops-nix.service"];
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
sops
|
||||||
|
age
|
||||||
|
];
|
||||||
|
|
||||||
|
wayland.windowManager.hyprland.settings.exec-once = ["systemctl --user start sops-nix"];
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
ssh-config: ENC[AES256_GCM,data:npBcAOSwHpApUASlZmRo4stwMrOjdrdmhfYwumjbTpcq8aQ2ybV8le7cjNdVqIyxgwxUFV4/tGfmsq4nlrWIO/85spwfC5DyPGaZ848NI3UZJj8k2GKuw5qk/xGsTveNhq+vNZQcHeL4aeXF2TRmFLDHYGTku9anFL7FWkQ75MmGW78XfPUEyZJ52ylXq3gkYeVSrl6cXuwJw/QBlu+XTgFk4MM+E5BTXBFFNJOYkIt4GwWX7wdI+QqPEof8J0ENYdxUAMKMueL4pLNclWP0fu7QC7gwwRJWjauCNElJiDhpVFa6WukJV/Ut+I30FH9cJtj0rSodeu0hq2fWaiQ0wVbQudxi0JcnxJQs+B9nb6kpF+TN0MiD,iv:c7DMZSmlgMMnNlR0/kNRKPYjCzvNQJ46mZzojHppSg8=,tag:ausjsFk0H9nOiiMebHXSUg==,type:str]
|
||||||
|
netrc: ENC[AES256_GCM,data:EOpuZhDVXe7Q4P/98C3gtEvkdawI26d4oX/wRNytyp/mAdkHytXiLpFdsuO/3DADOG8h1CCo1UTs9ex+bqoD/LdChdp7INfNDSQ+aDxTiG0rLBgjvy8TIj8=,iv:tc/RbN1Upbjv+3rU5zUR3P//a1Hj1xODInLMShg4i1Y=,tag:7E9G2g4g+eMeJrwI20R/1g==,type:str]
|
||||||
|
github-key: ENC[AES256_GCM,data:LRgJxUcKvLiqVJ3acz88oGp5qmvbo7QiyTbcft3YwZr+84CLbty9GCMrryJ8DFnP8GCGh+cCQxyvk/n/hA71qz7WZ6vIWbTN2byP0LHwDtQpugYOQi9z1Q04hQU3DYnsqKS8hu6bnUV/SzrDpAOXugyMGZL5dITitidgEsVG5PxB+bzTZGhg7EOcZISz955AEtD+bGedvxaryEcMYPTZwRHYPl2+wvKKIbeZMiup6i0BCCYktUUIb3qSBawbknZ9nfbQFODkZbNuEEhyU2MITz2ajQEx8AjE4eUutjBBQpJsesIhiAyq5H1AmJDzesC4iccFUpTVHFWf20clPX9QTH5njqbJ+aw1hIzU2ljK3vou1eZfoZ5HCdV3+tuQTJGYcfFY29/PaN4sENPhgbYm0p9Ui4UlMbte3FfmhSqdMzIc8jIB8dPMtoUM/NTjxof/dVu/TPMBTqnJplzNgvH1r2UcPToiAVfWj96tXsr2ESZfE9q9oQh9EGMcyGpXxq06Gni4tOnXDaF3oHyWAiJ6jP/wrYag5/67m4DwpFEymg+/ROKcy2ou3MYA+748ocKYFRoOVfY+SwcM4bxl6smstsRZW8SoDo6O9ikZII51LIN7X/6sQ0L+dgsBTT75zm8DOAFx2tnVgSPN8HYsd2tyHA3L6pYxAAGmY6lSGJfgmYP8hForSuZgCSxWhlwPHLLrU14A2wOFw+X5b4Zgy2ZdsTv3pHDn35a8lNwANKiWhXSc/irie0enmNjKyKTQDcVxq65mho2D+q7XANjDYtqQ8VX93HD2mLNljuA5GjJxtlTrw6V80AI9OiKjMlbEIG5BHIwOcDj5z53kZ2hPHIlSMCXVBXgBwZgPzw2GXDnIgsLFtGirVj/H+N8IWUioUgyimLjygPJwk8lcIrRCA279O7PnFAQKW3gchs4BN76vF41dR5AVJrDeWmSRonMHZEmGaHONEy+8pxFYf+u7hI6dC6YwrhNYHFgKymtKoYCGS1VTi3MXVPxzL4KxnS+StgfDqzf/FypqGD+c9Qkz3THw01J5SyQO4r7Y7cJFhpRvF09uDvT55BtUVuxexOUxANsmbzJCSKG0GLEWa6e+8owLHRbUh5fQQHN4WVMOCb2XLJkHM6YkZv+Sl3sjwUOtZS1+hRAz4I5BsxxNYK3OySwlzb5yBF2axC6z0DTpXNhyMUSEm2yI4gGroW+x0q8AK4dYelhcBC2QYYp8a2QkQu7vphg05QusuebZpjhRsFVphkjNmpEmAxAGRK/AaRr6YZtfVe/IsZgXso9xr75TBl/wee3jl5kLfBxs0q4lUCmfAcdfkT9EUWp6IOX6E+l7rgObuPLU5q64QtPzu5WDG2zM8cQWMbGt34EnKqSqwUPP3cmEVNuPSWh4bubLFKh+wcREMaMQ5j9GA9AXHDQnFsp3M9L3+0CBJIdBGnZetkjpg3l8INkqXzI35rNmJ6DkfmAE1a/SLLu9qkYK8HWi+1hsqKpNqv6bAp9iKSCb/tFc88wgNVh2n9UVZXBuWXCmtwc2BUfaN9/rw6L/+iqrTu9vrq0LTDSy8A1RuKr3aY+EyCN9gd+BVjEjpszFD8Jnrgj4qz5jihEgo8/AdGAS5/8QiMhdr18LQ5JaNC2EAsSswHx4MpOtFyyt84qJV0Ip4zegDJ0wMukjBJuRsZ6yR6ThgB0357pdmJsSXvj4XgevTwewWMmyX18kleac/i7oifv1xvp1gQrgigdp7s3tY91zH2o1LG/DqTbife7lgt9P6kR/LsHevJaVOytLv8DTO1ggTZjHDMT+A9DiUVot/gmhPcf5JwMnhV6PII5XtR4dy+lIs876JQFDm2YUgWNTPO+EJS/G63TgHxyJxBhumPCODzbYY58x+RFzykPvBuf+d6MpP2A2Pc2KPgW/SWc4XqTUVj6FIgwS58NJm06uLdh3vrEEUqO+fL6KOzmLYAa5TabqOv9oFGXYpOJ8sJtfGXIj6i+/aG4LrNZGeTzBzvz+W2jOcAH27qciC4YopLcP4NR6aXA3jYLVOLCnh54IfPVgMFFg0ZoqeaHEZN9jJIMsXNGbGsfT+f9FxN8JxAOM/iqqAVeCguXxNiKGJuCl+uQU2QdqyJVSgyq1xtXibRqGfJCDc+oGnXy5/jxjb0uDzhdYH94kfR4cj01MTDqt3kfFNjJtjl0KBR0oXj/E//PJwRgKJ3i0o5jYjRyLSqUfUJvEyiPrOmzAZrXQT8aYeOyB5MO4t0pdcMGBwcrWPkmxRiu3dERJHJttpFD03Iv5qFRZdNAsrfzu0dW59nO9x//Czxs3mcJfRyj2moAjMiyYC6vg5hPZso3lyDyJgvEySZ70GhJAfkb6peossSco7cdEw6lVisXDk9BuPArDn/kua94eUiajB1v3dwwvWNc535HQIQIbTd5478JESiFmB7mt5EXFXWVZWDhPRxkK8Px3KErl+4WBZec+glBSnrY1VqXDdBRG63etA/Ev2P4ih0MTEiv7/Bcbw9uzVsIIwhyopY3JtkJP/YqZpS9HSDzSTnkCcetO9YC6K1aqRjdxzDwfOqadu98gzXxZZOsGMFaBgptFqBwfrP5Z8+CWWebMIL2HzZCEhMZhHRFcfi5dI7t6R2AS6cqRFXQlaB75lYhOvFLmeuMtspjTUL2SQa1J17bZn9JYVNvBfL4twfZdp4zjo5DgFF5LiHC6uQa4LW3aWN8ujQ2CGRP67iRsIgedfrNZG6vdkwDMpzhyFFZXXrs507RTimTJGngX1kBWNb+j+b/RmjLsdONPPgCgE1o9fxJCfHM53zDHSlVcO8rsLideXY6HIUKgZC0khgpif5YBG+iHeqfT3ZBLwhLjK0GH6oP3TKw0xmHWq4Nb6C6OqdEIGQ7Rxt+rWOOPKhUMyzdhwz1YpeZA0zobRdR7isvmWGTMwxS56r+NuI6dOQL6xs+MlVFOPtyYNJAF2qWDHt0XOa/7Kv4XDRF7zDA19ZhqG8xDU9NtDwUDFrPBV5kO0TDSHuh7WShkzyXJYfc62WEIxIfbdMVX1m+mG20/f6Tk2r9wRxtAdxU4WqhK+YaZf8ZE6LfsNwJVyWI+o0VeK2v/2GkdUVeuDvq9aju+BipuUUHs9K09a4EyZOMNJtYUPj53W76rVP3rwAXr2jj+sWeDFCibsNTkv2KuyOzOM1cJCbONXNfqPAo5yx3cAwXp/ikz9kPMwmVqgIHGAd6QsTmaBXe4ex5C+GA1OBCMvk6ZAoSwRsAmoOZdharD+6dEEFL4HeqQx3XT+ddTRcGiQxgxuwPDAxcuCBkvqZSuVt1jb2c4WpL9id1S0TEsfzRtDj6VGM318jV3pj3pZvLXwVMJc7J4o6f0MNhjtgOZdcc302sh6HrusTn/zrRPpQVUPHkmmvmB4eP6IVT6aeKQS8Vt10PNtXbJKLYqFGnlTrrlHxBrGDMfz/j5ycai16VKeaKS1SnR1TQAReOaOksMc17xDVo9hnocOMs89tzCkDQ3e14lKngxWzmcxZAS6NGA5u/Y6x48b8OCiVbsbOxoeI5ouKd37TVPJEHo1VRPOhruVU50xv+eZtCbSkpTWPMq3r4AXZJjTKXn3aYTMQNMisR0yhto4dkdoNQw93ngm+MSduv+Sxt3VG108G6UDVEjE21ylMDueP5rDQ4G2sBPgIT/uSyFWan3tcP2eTFjps4BB0yzx4evjdUqu+Uqkvts7DOPY4MT8/g8YO41PvAW5sFItcwr6gLALyVSK8I3dzePeNELXK6daHLhkcI4EN4Yh3OO+kkT00X29A/V7wqIoV7T06FneC6Hg8rWyPHTFbAO0zqXK58Tp4E0kp0LkZHS+nLbmvuZOKSyQOMNWTvMYcagfRc+VgbAPjnZ9yRCXvWHY6N2z2CTKEioYoqt3Sgs8dgRHVZK/qGoO5lAWfdb6cTUFOZU0FnXYTS2ccQdOf8bJHOmldhavi0Oswe6wWpg3/Rp5Rvm0Y0g3r5CEF6lybkjM4K6eXc3DsFWcV43VPw/1w0sV3ErtuJHVyYxZzyS+iO0FC0Vpvru2emHoylbn0Tw3Cy31onjbnRlJfd9hzEZYiCUDj9l2P5b8Lrmw127NL25pzA+tdnRi55QS+ceUZ6omPqf7YsIO5AygG5+ZDCwFfjBX3tW5dpEFXzsdx1GWLopxT8RkPxjRjm8Z5EJpQtIYmptc3C6nBvPPCx0qVXJKo0LNbm9pZ1QPF0Vi/qS+V8PsL6dwPFH4t5jcKXJUdPNuiVLcqogKVicPSP+NviDn38UjWXixPHhkYk5Rv/2setqUXkKM+vePnOv7fNE3Px8QqJembwYkaj+T5do8st2KbJy08B2/l3gYvKoMZ5A3B3ypz3gghnEYPXb9uK1QyQIUsfV8tPFyFFWLVDQbSBSbqsWDfV1FThAJSi/FhcI4Al2JuqPvESQmjKW3qP6kk2GXQQco+R0lPszTEum1M9YQxq6YnRRy/wAPnHZgSgwNliNzx9d/FQbgo1kNg5LgdFjZh41ooPAubRyxfkHxzsVrnhjEV22wA/7dsAdllnnWRARQjBfn3tzENiG8YV/pWZF78aL8XZwapiPrWI=,iv:2Mvmz1CFO1112RxjIl6sxyNIDqa/cg00um6RcQaHNY8=,tag:+zygdwQdCBeBXVLvAj/jJQ==,type:str]
|
||||||
|
gitlab-key: ENC[AES256_GCM,data:1iAAh7CEeJGYibM1wcFn9MRK8TtgRFA2dCSVZThiCI53GKkbbf5JZ2cYJm3p/D9loP0/lU7TbNR8IjVyqqGP8MF+u4cm0gFIEL0i9+wBKIJsYXxzXV7XIQNTF1JU26/b+hpfUEcqXANQ88wdaGTrEDYAaMV0kYcBUkpMgUdIU+iCJkr3bPKZRjengA3/Sj6QkRzBTBrWo8ANEAnmi+Nn8NTFdHbwp+uLwelijCOz4iiShMTRjJYtBZ8zlGXf7qv9warXn91oh1p5aPYBRH6CuUwX1lZYDPmFGxOS5usYYippqsRmEEg9Haas0EwxU8CAZgX6cNnfjhq3le86vCapqZnzdNAwR5rvMEQ178Fl89Ri5Ka7n9GU7CFRzzXpykPErKbsG+T3KtfO20Lo2eDWO/gXuQILZcwaFDEbZuXq7qbrtyJ1TmtXQF73paG7yEITwOFLaMeJVRX/WvdXbzFo9X8V7zv7iuyyi4Y/RzkW2g7Ck0x3MIgxyUkDQZnb9XLYm5PzoKZ54uXIC6tqaC7ux7o785VOvaaNJiu1r+mtm7tN3VD3nQGBMGC4BqM4iYEt/KcTC4fn4rSwecfcYTpGQf6LfDOWgZvBz8Fw8AraWIANjHkOMrlWhIJJ8g7N+35rThEfrC1hGAptWsOSVZ0NbZk3UMCzv88KpDJA/9rekLIpAodJaZafM3VhK2ZLU4i6IYprKlsFYB/+WDwvppX+LIofMdhZfGhI+hRyiNF1egh+PBv/UzHIdanNLiITXO6/Kt5kgSujVmr2O6NWOlx+Ve1udxXWzNxp0qrMKa2JVljBS4UFw4HPM0LzQ2KMW3rZ1fWq88/dRtzoBJfouL8smeSrc+VJJACEzHevXq4e8zgjg9+QnK+ZWNwcna1bQgB+lG76hGnfVvIHF4PQM6tGSS6RLQrwsAMI8DMsiRhYUc8Bdrj2+fM8GFTC81pYyRsmha6tJmq+S8oM919iTqFFGFk4NFMy1Mj/95Ckrb0tkCIiJe+Quvu91oLVzLAbkRdDF/H6rudrndhqlAANQs0acPemuD4/rrUfv+jFEiOazjydGrHTae0jnJyS5mR3QZxWst0p7Q+yIlduU+kY9uX+ZuDwjUsOqy56K2mn9+dPVA10D0hqSiWUQQ+TQU5QGaalJRjt4RG2V3fcwCs8nla4XNrxaSty67141CBJHgh4I37qCFcu1f7YqqKJNmVJwBX2/70Rg0nb63FPDh6UWtyaheQD4GL+2ZUJmlh+ZMPzJZEO6fABOQoyyMZhOv2Pem+AQHD97sN32E2WoCiSxMFYFe4Pc9sy5rFkZb7OsdNK3VzoeWVkklhNqpis0sU50Bqt48V+2qXFU12LGUuglzo9dBTJCgaD6xqadEYlh+WH18Q6yQPefcwcWzl0Ql/Y/F0XfSEgaIyd/VZdQ6QP3ZF6q4oEtKOCg+AnkbMVUw5TA+RdW/UnhJlErIs+AQRkKZ8JwpIalTccAEk7VgQQdRiCD1PBhc+0T9gzTbQTqCB8pCqy7M6UEUbumOfyUKOtkosk0Bx8MLtyzX7va+3D0h7Cdze4CFTUT8EZquSWoX5ozwF1DdsBs3wrunIa1FYYaZQDiMiYLZ64TRzVBujeyZxFQLgKPbEBBr1BalgJglGALLZUfkmz01g5stgkZDeXvbTgA0W9PKFhZ+lLfrZ2NQzblZ6DiLeFM5ybxSbCbBSx2gzzBuMgbWOVTFDXLRuGOE0GRWVpzEtcqTncQfbJT+6AicA86e6MuXn12Zq3uyF4HoiybBFEAkYF24qLz2XZ6K9E7aNdWJAY2dcvq+LCoaHKlpekSUO+jrfykEfH5eFhnSj+hrwtSa3+3tLkuNdzjEpTcvq3l0d9dVAcMswv93RrU9PNGs66W7wRKiiOYvC+BqjOIkUvXVxr5Tl/1WDUgah1BTaQO80KEphtmEen4s1gLQEUN6lA0HsBAyDOMHGfkDgcT2pH8A6s5bc8BpXyyGZOLQ89h5vpvCPFFbxHNxffKXgRWLUfoNoXDqBG0kxDm7+CLmkD9jmH1XkRu3a0qr9KgZDUqQoVHCpUMXF8/HN7+1VHIUP5pWO9mupX0jL91ymF16HBCucJQiCWmKr2Cn+huPwtzcRblAoQAZY4da1PbIBwdys8Q77WETrTiK/XrQHiE/ZRiPFZK3B4wPFjMGyp7yhnF23ram76E3ny0xqunfjvyTLcLVmkmdDIz6FpNCa2Qd+oqpkKzFEF3hcmZgue9uqsmjJk4ymAKqTXB2PUdz0GoOe7obg6QyZS0WvgsuCuem5yePjYL43AXiFfyDp4fDRRaB5qpJzXS8HzCh0Whyg3z8UEygVnXMmL1k/84LsfME4/ubMV4cJn5Q9rDFGIwUfk4M98Y1ylPWQfcbwpAxtipBN0uQL6WX6L4dglE4wcf/0d6IGmIxF03E08BvvQvniox7fZEIYY8dP9LlitXZBfKqSDw3jQ5JuLllGI//hbXGu8IxWFnABz5i/NkNGJnSb6b4V5vWXAWSBi918ZZYMmxqH87hypen6ONq2jxPXdgN4lphyQDxL7Sx1oNAUUdm8NqTj47g6Ny0RWHUJPAnKAZNpAljmbCny0fkTzDzg/OhetkUv6+BSRZq800gaGkNz41cmJvTZBe+MOrGEvHwc5C2uFsLJuagJ+vryyN0sdpuSFVF/3Zm8Ch/aFldeS5xjwf7Yfy2Nb2H2WRJbFa01sEbMiMkrhLLpyQdwL9XoFBN/1IKoZyQE0fBLXwU8D9BnL3PCBbSeVDoswRt7hPe40SyBMTu9uhzn9n7DXhWqb+hpbM1ViDlT1wE/P4xx3UcRRb+xx5ANkbuF11Yf16cAa0hwM/2BmRAVInmgeNS4Lp/gre0WBO9x21I3rZ5YaRxRsOUTBlaElYRMcxQQTkw6sc1TM3u7lK+b6Ug8iS8jYP+3m/QGHF4W/3eHVoELfBq8vwYCPa87338sQwlLAmQlf5REYBqDhV0Z075hmwGeOPW/Q+2cKpY8XdlD/eYKhgNuHV1pL1CRAbWCkZg21Lq7zVR+wYuu3tuEqmIT7+P0Yj4EjNiODe523wBNPH2gxLzupPZmT/fR1YoI/ij51qj6QPCQgy1eJB4TTlmNJHDNBKEakVr26wFg4Pd6y+99W1sEPNn6weoezXLk5DWSXln0AdAmYcxa5I8ZWGwDrTMASf6QUNlg0lTXbqw9khZgdk069zrfYzBhtcSyHAqg6DzyHeLzUbPNXmvBS2WGbbJUZX73tqB+cRAD4UUDv02ZQ2YrUT0AQpvc9+dekzWuv/UGnQ1Y085NMSP6s+sGL0WfcOamb39Y7Ov4y6hCikq5M1TiHogndk7Apkm1hQLOiUM3Tb0IXmrBtmX6RxvUgXBLQ+XuZjJ3884soM0swwdt9f2vKljG2lnOnCdHPVSQUO3XQ90itLXQhq21B8SOiFA0DvRWJMEhr4d3LdNOAbj6Iu1yQ0PvdEaD0X+1ND/3Tot6yAlAqzA6+47tnU1Gq0s6Y6uqkW5u2oSSwMoeIoRInBIKLO4tSW/rKICWJznuDivRIm5BHPFajEnahJdzclA7sPsbbKNwXEj7jzJELl+oUympJ/L1dpPfxcM3tSmErgwfwdNWNkf97kml9MZ03F2bUm71Azm1tq26aFUUOGxbsGI2T8NNFJsf25m5CfC06YK3F5Yb8pG08IhKRrkihM356uJcjC0m5V+OUETF2fTQLytWbq1gthXfaG+gE4Gk/MUX1vHfGUprTf3JYgiIZzgIIZeaX5j4XJ7hykwb6ahhIMX/ndB5XYGCER2vkDrDPwspsAL/pXiIOMDFSwJVsvf/9fbLDttYNJCR2B9/Enbjh87abaYlQsgUjsPFPAGH2nw7hX6iuEihrPyLZdUp0xJb2PIq8R4xpiStzomDdVkC018YPRWank9mKXHYf4+1QdQ3AftOs5iDMgf50XASNl/6F4V+NGX2vRiPJ2gxWBvpoPu5csSgKetHiJCqNLbHLggFQEjYJyW3Cepsm87LC1/eEa7AEPdR+eQYsIp4Xr1LMD9cEogHpz+/VOgdtcQmPMrNHsRolTaO5lT1vbrRJE+SM6byoi/ACDKI2pRObI+FPzflmm5X0/Kh+b6InGzCXR+k1CXyUauI6wro82J8T+vHdxPEy59kdXlAicy7q0/+UZ8zF4ApNT7XXV9sgmyhzD3/v1kWwDPnowptr/JJT01TTHTUPtDDqy5X497h56jqwjWex3Lc7cTusrkVrcHg26fIMw/zyTW3pgmrwpGayVC8kg3pNJQw+MX6xYO5Cq/EQv72rOKVw5YY83IWqkh6GHn3bTghvMETiWoCDUPB0JNsPY1i7hrFCYzGJib+p6M53ngNCfjI786qZ78CQVhmIyl8VGGwYrvtHY3UFArXUDK/Y9rc2lvMoCIBCwhq5w/eaJiTN1BhMgFVvgbdI+Y9cj/UgtE3yFjsQp/kI+oEyCDQntuzO1UhZiP2/9nXm4Lyf/ZhUcdEI9I0=,iv:aG4nqGJ/TRiAtiWoPwqej6We+IWEWFibCqL7bGwXbkA=,tag:c5ckW2o4+2rm/5mrGF1tzg==,type:str]
|
||||||
|
sops:
|
||||||
|
age:
|
||||||
|
- recipient: age1c8pawdsxptfslgrz2c56s39mrtnjzc5mm3hfzgr2wdwu2v6vfsdsupjsq6
|
||||||
|
enc: |
|
||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVby9Wa1NUUkpyeDMwU3dM
|
||||||
|
R0EyeFVtT0tJU0pKaWtXQzRkTDBPY3JjcTFrClNIQnl2WVorS0FZZjhicTQ5V2kx
|
||||||
|
MUZTZWZtaUk2a1ZhUTBCUnhkWHFIMFUKLS0tIElLcjJLZWNLOUJYN0NNVGFNUEFN
|
||||||
|
RkMrdTYwNkY1Tlc3M3dxTFdkRXJJZUEKUlYU45jXpS9hJO9Z/uAQ6XMj9QWgMMRI
|
||||||
|
LbJxvt48+yC+Y0XKOtDE0lHAuGNzUG8R/7FB1tTD8NCamBe46KGCIg==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
lastmodified: "2026-04-23T07:50:07Z"
|
||||||
|
mac: ENC[AES256_GCM,data:V3us1oxkQxIg5hn8TMiSHWa0RhNbio2mP8j59lSCKDLjnpTUHUAUZZOan+fkBwPxxtIdZFVZQl/kZuEHcnNwXk8J0DLeT8jrs8pvlDCHMAc+C9uzThNjQ9CrZ2C/dNtoI6uop3a6qo8UMhKhvAus08yR8rLsY7Gqt/In28HKqxU=,iv:g8wmq1thPfkSSfG+mtJS0431wbon/uylDTfH0P31dlw=,tag:5Z6CJMWeGN6frTLJQMxGGw==,type:str]
|
||||||
|
unencrypted_suffix: _unencrypted
|
||||||
|
version: 3.12.2
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
imports = [
|
||||||
|
# Choose your theme here:
|
||||||
|
../../themes/darkviolet.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
config.var = {
|
||||||
|
hostname = "h-work";
|
||||||
|
username = "hadrien";
|
||||||
|
configDirectory = "/home/" + config.var.username + "/.config/nixos"; # The path of the nixos configuration directory
|
||||||
|
|
||||||
|
keyboardLayout = "fr";
|
||||||
|
|
||||||
|
location = "Paris";
|
||||||
|
timeZone = "Europe/Paris";
|
||||||
|
defaultLocale = "en_US.UTF-8";
|
||||||
|
extraLocale = "fr_FR.UTF-8";
|
||||||
|
|
||||||
|
git = {
|
||||||
|
username = "Hadi";
|
||||||
|
email = "hadi@example.com";
|
||||||
|
};
|
||||||
|
|
||||||
|
autoUpgrade = false;
|
||||||
|
autoGarbageCollector = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# DON'T TOUCH THIS
|
||||||
|
options = {
|
||||||
|
var = lib.mkOption {
|
||||||
|
type = lib.types.attrs;
|
||||||
|
default = {};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
+3
-1
@@ -13,7 +13,9 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
"10-disable-camera" = {
|
"10-disable-camera" = {
|
||||||
"wireplumber.profiles" = {main."monitor.libcamera" = "disabled";};
|
"wireplumber.profiles" = {
|
||||||
|
main."monitor.libcamera" = "disabled";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
# Home-manager configuration for NixOS
|
# Home-manager configuration for NixOS
|
||||||
{inputs, pkgs, ...}: {
|
{
|
||||||
|
inputs,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
|
|||||||
+4
-1
@@ -35,7 +35,10 @@ in {
|
|||||||
settings = {
|
settings = {
|
||||||
download-buffer-size = 262144000; # 250 MB (250 * 1024 * 1024)
|
download-buffer-size = 262144000; # 250 MB (250 * 1024 * 1024)
|
||||||
auto-optimise-store = true;
|
auto-optimise-store = true;
|
||||||
experimental-features = ["nix-command" "flakes"];
|
experimental-features = [
|
||||||
|
"nix-command"
|
||||||
|
"flakes"
|
||||||
|
];
|
||||||
substituters = [
|
substituters = [
|
||||||
# high priority since it's almost always used
|
# high priority since it's almost always used
|
||||||
"https://cache.nixos.org?priority=10"
|
"https://cache.nixos.org?priority=10"
|
||||||
|
|||||||
+1
-2
@@ -55,8 +55,7 @@ in {
|
|||||||
# Optimized configuration for switchable graphics laptops
|
# Optimized configuration for switchable graphics laptops
|
||||||
offload = {
|
offload = {
|
||||||
enable = true; # Mode optimized for power saving
|
enable = true; # Mode optimized for power saving
|
||||||
enableOffloadCmd =
|
enableOffloadCmd = true; # Allows running applications with dedicated GPU
|
||||||
true; # Allows running applications with dedicated GPU
|
|
||||||
};
|
};
|
||||||
# sync.enable disabled as offload is generally better for laptops
|
# sync.enable disabled as offload is generally better for laptops
|
||||||
sync.enable = false;
|
sync.enable = false;
|
||||||
|
|||||||
+4
-4
@@ -5,9 +5,8 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
hp-omen-linux-module =
|
hp-omen-linux-module = pkgs.callPackage (
|
||||||
pkgs.callPackage
|
{
|
||||||
({
|
|
||||||
kernel ? config.boot.kernelPackages.kernel,
|
kernel ? config.boot.kernelPackages.kernel,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
@@ -33,7 +32,8 @@
|
|||||||
install hp-wmi.ko -Dm444 -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/platform/x86/hp/
|
install hp-wmi.ko -Dm444 -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/platform/x86/hp/
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
})) {kernel = config.boot.kernelPackages.kernel;};
|
})
|
||||||
|
) {kernel = config.boot.kernelPackages.kernel;};
|
||||||
in {
|
in {
|
||||||
boot.extraModulePackages = [hp-omen-linux-module];
|
boot.extraModulePackages = [hp-omen-linux-module];
|
||||||
boot.kernelModules = ["hp-wmi"];
|
boot.kernelModules = ["hp-wmi"];
|
||||||
|
|||||||
@@ -11,8 +11,7 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
tmp.cleanOnBoot = true;
|
tmp.cleanOnBoot = true;
|
||||||
kernelPackages =
|
kernelPackages = pkgs.linuxPackages_latest; # _zen, _hardened, _rt, _rt_latest, etc.
|
||||||
pkgs.linuxPackages_latest; # _zen, _hardened, _rt, _rt_latest, etc.
|
|
||||||
|
|
||||||
# Silent boot
|
# Silent boot
|
||||||
kernelParams = [
|
kernelParams = [
|
||||||
@@ -38,5 +37,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
# To avoid systemd services hanging on shutdown
|
# To avoid systemd services hanging on shutdown
|
||||||
systemd.settings.Manager = { DefaultTimeoutStopSec = "10s"; };
|
systemd.settings.Manager = {
|
||||||
|
DefaultTimeoutStopSec = "10s";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{config, ...}: {
|
||||||
|
services.usbguard = {
|
||||||
|
enable = true;
|
||||||
|
implicitPolicyTarget = "block";
|
||||||
|
IPCAllowedUsers = [
|
||||||
|
"root"
|
||||||
|
config.var.username
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
+4
-1
@@ -13,7 +13,10 @@ in {
|
|||||||
users.${username} = {
|
users.${username} = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "${username} account";
|
description = "${username} account";
|
||||||
extraGroups = ["networkmanager" "wheel"];
|
extraGroups = [
|
||||||
|
"networkmanager"
|
||||||
|
"wheel"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
+16
-4
@@ -21,11 +21,17 @@ in {
|
|||||||
enable = autoUpgrade;
|
enable = autoUpgrade;
|
||||||
dates = "04:00";
|
dates = "04:00";
|
||||||
flake = "${configDir}";
|
flake = "${configDir}";
|
||||||
flags = ["--update-input" "nixpkgs" "--commit-lock-file"];
|
flags = [
|
||||||
|
"--update-input"
|
||||||
|
"nixpkgs"
|
||||||
|
"--commit-lock-file"
|
||||||
|
];
|
||||||
allowReboot = false;
|
allowReboot = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
time = {timeZone = timeZone;};
|
time = {
|
||||||
|
timeZone = timeZone;
|
||||||
|
};
|
||||||
i18n.defaultLocale = defaultLocale;
|
i18n.defaultLocale = defaultLocale;
|
||||||
i18n.extraLocaleSettings = {
|
i18n.extraLocaleSettings = {
|
||||||
LC_ADDRESS = extraLocale;
|
LC_ADDRESS = extraLocale;
|
||||||
@@ -65,7 +71,10 @@ in {
|
|||||||
dbus = {
|
dbus = {
|
||||||
enable = true;
|
enable = true;
|
||||||
implementation = "broker";
|
implementation = "broker";
|
||||||
packages = with pkgs; [gcr gnome-settings-daemon];
|
packages = with pkgs; [
|
||||||
|
gcr
|
||||||
|
gnome-settings-daemon
|
||||||
|
];
|
||||||
};
|
};
|
||||||
gvfs.enable = true;
|
gvfs.enable = true;
|
||||||
upower.enable = true;
|
upower.enable = true;
|
||||||
@@ -115,7 +124,10 @@ in {
|
|||||||
xdgOpenUsePortal = true;
|
xdgOpenUsePortal = true;
|
||||||
config = {
|
config = {
|
||||||
common.default = ["gtk"];
|
common.default = ["gtk"];
|
||||||
hyprland.default = ["gtk" "hyprland"];
|
hyprland.default = [
|
||||||
|
"gtk"
|
||||||
|
"hyprland"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
extraPortals = [pkgs.xdg-desktop-portal-gtk];
|
extraPortals = [pkgs.xdg-desktop-portal-gtk];
|
||||||
|
|||||||
@@ -49,7 +49,10 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
users.users.jellyfin.extraGroups = ["video" "render"];
|
users.users.jellyfin.extraGroups = [
|
||||||
|
"video"
|
||||||
|
"render"
|
||||||
|
];
|
||||||
|
|
||||||
services.cloudflared.tunnels."${config.var.tunnelId}".ingress = {
|
services.cloudflared.tunnels."${config.var.tunnelId}".ingress = {
|
||||||
"media.${config.var.domain}" = "http://localhost:8096";
|
"media.${config.var.domain}" = "http://localhost:8096";
|
||||||
|
|||||||
@@ -1,19 +1,27 @@
|
|||||||
{ config, inputs, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (import ./mk-container.nix { inherit lib config; }) mkContainer;
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
inputs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (import ./mk-container.nix {inherit lib config;}) mkContainer;
|
||||||
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
(mkContainer {
|
(mkContainer {
|
||||||
name = "wallpapers";
|
name = "wallpapers";
|
||||||
hostIp = "10.233.4.1";
|
hostIp = "10.233.4.1";
|
||||||
containerIp = "10.233.4.2";
|
containerIp = "10.233.4.2";
|
||||||
nixosConfig = { pkgs, ... }: {
|
nixosConfig = {pkgs, ...}: {
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
virtualHosts."wallpapers" = {
|
virtualHosts."wallpapers" = {
|
||||||
root = "${inputs.awesome-wallpapers.packages.${pkgs.system}.default}/share/awesome-wallpapers";
|
root = "${inputs.awesome-wallpapers.packages.${pkgs.system}.default}/share/awesome-wallpapers";
|
||||||
listen = [{ addr = "0.0.0.0"; port = 8080; }];
|
listen = [
|
||||||
|
{
|
||||||
|
addr = "0.0.0.0";
|
||||||
|
port = 8080;
|
||||||
|
}
|
||||||
|
];
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
tryFiles = "$uri $uri/ /index.html";
|
tryFiles = "$uri $uri/ /index.html";
|
||||||
};
|
};
|
||||||
@@ -23,7 +31,7 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
networking.firewall.allowedTCPPorts = [ 8080 ];
|
networking.firewall.allowedTCPPorts = [8080];
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.05";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
+12
-2
@@ -25,12 +25,19 @@ in {
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
tryFiles = "$uri $uri/ /index.html";
|
tryFiles = "$uri $uri/ =404";
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
port_in_redirect off;
|
port_in_redirect off;
|
||||||
absolute_redirect off;
|
absolute_redirect off;
|
||||||
|
error_page 403 /403.html;
|
||||||
|
error_page 404 /404.html;
|
||||||
|
error_page 500 /500.html;
|
||||||
|
error_page 503 /503.html;
|
||||||
add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' data: https://umami.${domain}; style-src 'self' 'unsafe-inline'; img-src 'self' data: https://git.${domain}; connect-src 'self' https://umami.${domain};" always;
|
add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' data: https://umami.${domain}; style-src 'self' 'unsafe-inline'; img-src 'self' data: https://git.${domain}; connect-src 'self' https://umami.${domain};" always;
|
||||||
|
add_header X-Frame-Options "SAMEORIGIN" always;
|
||||||
|
add_header X-Content-Type-Options "nosniff" always;
|
||||||
|
add_header Permissions-Policy "camera=(), microphone=(), geolocation=()" always;
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
"www-redirect" = {
|
"www-redirect" = {
|
||||||
@@ -44,7 +51,10 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
networking.firewall.allowedTCPPorts = [8080 8081];
|
networking.firewall.allowedTCPPorts = [
|
||||||
|
8080
|
||||||
|
8081
|
||||||
|
];
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.05";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,22 +1,29 @@
|
|||||||
{ config, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (import ./mk-container.nix { inherit lib config; }) mkContainer;
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (import ./mk-container.nix {inherit lib config;}) mkContainer;
|
||||||
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
(mkContainer {
|
(mkContainer {
|
||||||
name = "cyberchef";
|
name = "cyberchef";
|
||||||
hostIp = "10.233.5.1";
|
hostIp = "10.233.5.1";
|
||||||
containerIp = "10.233.5.2";
|
containerIp = "10.233.5.2";
|
||||||
nixosConfig = { pkgs, ... }: {
|
nixosConfig = {pkgs, ...}: {
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
virtualHosts."cyberchef" = {
|
virtualHosts."cyberchef" = {
|
||||||
root = "${pkgs.cyberchef}/share/cyberchef";
|
root = "${pkgs.cyberchef}/share/cyberchef";
|
||||||
listen = [{ addr = "0.0.0.0"; port = 8080; }];
|
listen = [
|
||||||
|
{
|
||||||
|
addr = "0.0.0.0";
|
||||||
|
port = 8080;
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
networking.firewall.allowedTCPPorts = [ 8080 ];
|
networking.firewall.allowedTCPPorts = [8080];
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.05";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,21 +1,24 @@
|
|||||||
{ config, inputs, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (import ./mk-container.nix { inherit lib config; }) mkContainer;
|
|
||||||
domain = config.var.domain;
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
inputs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (import ./mk-container.nix {inherit lib config;}) mkContainer;
|
||||||
|
domain = config.var.domain;
|
||||||
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
(mkContainer {
|
(mkContainer {
|
||||||
name = "def-creds";
|
name = "def-creds";
|
||||||
hostIp = "10.233.6.1";
|
hostIp = "10.233.6.1";
|
||||||
containerIp = "10.233.6.2";
|
containerIp = "10.233.6.2";
|
||||||
nixosConfig = { ... }: {
|
nixosConfig = {...}: {
|
||||||
imports = [ inputs.default-creds.nixosModules.default ];
|
imports = [inputs.default-creds.nixosModules.default];
|
||||||
services.default-creds = {
|
services.default-creds = {
|
||||||
enable = true;
|
enable = true;
|
||||||
port = 8087;
|
port = 8087;
|
||||||
};
|
};
|
||||||
networking.firewall.allowedTCPPorts = [ 8087 ];
|
networking.firewall.allowedTCPPorts = [8087];
|
||||||
systemd.services.default-creds.environment = {
|
systemd.services.default-creds.environment = {
|
||||||
HOST = lib.mkForce "0.0.0.0";
|
HOST = lib.mkForce "0.0.0.0";
|
||||||
PUBLIC_UMAMI_URL = "https://umami.${domain}";
|
PUBLIC_UMAMI_URL = "https://umami.${domain}";
|
||||||
|
|||||||
+15
-10
@@ -1,14 +1,17 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{
|
||||||
let
|
config,
|
||||||
inherit (import ./mk-container.nix { inherit lib config; }) mkContainer;
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (import ./mk-container.nix {inherit lib config;}) mkContainer;
|
||||||
domain = config.var.domain;
|
domain = config.var.domain;
|
||||||
catppuccin-gitea = pkgs.fetchzip {
|
catppuccin-gitea = pkgs.fetchzip {
|
||||||
url = "https://github.com/catppuccin/gitea/releases/download/v1.0.2/catppuccin-gitea.tar.gz";
|
url = "https://github.com/catppuccin/gitea/releases/download/v1.0.2/catppuccin-gitea.tar.gz";
|
||||||
sha256 = "sha256-rZHLORwLUfIFcB6K9yhrzr+UwdPNQVSadsw6rg8Q7gs=";
|
sha256 = "sha256-rZHLORwLUfIFcB6K9yhrzr+UwdPNQVSadsw6rg8Q7gs=";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
imports = [
|
imports = [
|
||||||
(mkContainer {
|
(mkContainer {
|
||||||
name = "gitea";
|
name = "gitea";
|
||||||
@@ -19,17 +22,19 @@ in
|
|||||||
hostPath = "/var/lib/gitea";
|
hostPath = "/var/lib/gitea";
|
||||||
isReadOnly = false;
|
isReadOnly = false;
|
||||||
};
|
};
|
||||||
nixosConfig = { lib, ... }: {
|
nixosConfig = {lib, ...}: {
|
||||||
users.users.gitea.uid = lib.mkForce 978;
|
users.users.gitea.uid = lib.mkForce 978;
|
||||||
users.groups.gitea.gid = lib.mkForce 968;
|
users.groups.gitea.gid = lib.mkForce 968;
|
||||||
|
|
||||||
services.postgresql = {
|
services.postgresql = {
|
||||||
enable = true;
|
enable = true;
|
||||||
ensureDatabases = [ "gitea" ];
|
ensureDatabases = ["gitea"];
|
||||||
ensureUsers = [{
|
ensureUsers = [
|
||||||
|
{
|
||||||
name = "gitea";
|
name = "gitea";
|
||||||
ensureDBOwnership = true;
|
ensureDBOwnership = true;
|
||||||
}];
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
services.gitea = {
|
services.gitea = {
|
||||||
@@ -69,7 +74,7 @@ in
|
|||||||
ln -sfn ${catppuccin-gitea} /var/lib/gitea/custom/public/assets/css
|
ln -sfn ${catppuccin-gitea} /var/lib/gitea/custom/public/assets/css
|
||||||
'';
|
'';
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 3002 ];
|
networking.firewall.allowedTCPPorts = [3002];
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.05";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,41 +1,87 @@
|
|||||||
{ config, lib, ... }:
|
{
|
||||||
let
|
config,
|
||||||
inherit (import ../mk-container.nix { inherit lib config; }) mkContainer;
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (import ../mk-container.nix {inherit lib config;}) mkContainer;
|
||||||
domain = config.var.domain;
|
domain = config.var.domain;
|
||||||
hostIp = "10.233.12.1";
|
hostIp = "10.233.12.1";
|
||||||
|
|
||||||
# Convert 6-char hex color to "H S L" string for glance (integers, no % sign)
|
# Convert 6-char hex color to "H S L" string for glance (integers, no % sign)
|
||||||
hexToGlanceHsl = hex:
|
hexToGlanceHsl = hex: let
|
||||||
let
|
|
||||||
h = lib.toLower hex;
|
h = lib.toLower hex;
|
||||||
d = c:
|
d = c:
|
||||||
if c == "a" then 10 else if c == "b" then 11 else if c == "c" then 12
|
if c == "a"
|
||||||
else if c == "d" then 13 else if c == "e" then 14 else if c == "f" then 15
|
then 10
|
||||||
|
else if c == "b"
|
||||||
|
then 11
|
||||||
|
else if c == "c"
|
||||||
|
then 12
|
||||||
|
else if c == "d"
|
||||||
|
then 13
|
||||||
|
else if c == "e"
|
||||||
|
then 14
|
||||||
|
else if c == "f"
|
||||||
|
then 15
|
||||||
else lib.toInt c;
|
else lib.toInt c;
|
||||||
byte = pos: d (builtins.substring pos 1 h) * 16 + d (builtins.substring (pos + 1) 1 h);
|
byte = pos: d (builtins.substring pos 1 h) * 16 + d (builtins.substring (pos + 1) 1 h);
|
||||||
ri = byte 0; gi = byte 2; bi = byte 4;
|
ri = byte 0;
|
||||||
|
gi = byte 2;
|
||||||
|
bi = byte 4;
|
||||||
r = ri * 1.0 / 255.0;
|
r = ri * 1.0 / 255.0;
|
||||||
g = gi * 1.0 / 255.0;
|
g = gi * 1.0 / 255.0;
|
||||||
b = bi * 1.0 / 255.0;
|
b = bi * 1.0 / 255.0;
|
||||||
mx = if r >= g && r >= b then "r" else if g >= b then "g" else "b";
|
mx =
|
||||||
mn = if r <= g && r <= b then "r" else if g <= b then "g" else "b";
|
if r >= g && r >= b
|
||||||
cmax = if mx == "r" then r else if mx == "g" then g else b;
|
then "r"
|
||||||
cmin = if mn == "r" then r else if mn == "g" then g else b;
|
else if g >= b
|
||||||
|
then "g"
|
||||||
|
else "b";
|
||||||
|
mn =
|
||||||
|
if r <= g && r <= b
|
||||||
|
then "r"
|
||||||
|
else if g <= b
|
||||||
|
then "g"
|
||||||
|
else "b";
|
||||||
|
cmax =
|
||||||
|
if mx == "r"
|
||||||
|
then r
|
||||||
|
else if mx == "g"
|
||||||
|
then g
|
||||||
|
else b;
|
||||||
|
cmin =
|
||||||
|
if mn == "r"
|
||||||
|
then r
|
||||||
|
else if mn == "g"
|
||||||
|
then g
|
||||||
|
else b;
|
||||||
delta = cmax - cmin;
|
delta = cmax - cmin;
|
||||||
l = (cmax + cmin) / 2.0;
|
l = (cmax + cmin) / 2.0;
|
||||||
s = if delta < 0.0001 then 0.0
|
s =
|
||||||
else if l <= 0.5 then delta / (cmax + cmin)
|
if delta < 0.0001
|
||||||
|
then 0.0
|
||||||
|
else if l <= 0.5
|
||||||
|
then delta / (cmax + cmin)
|
||||||
else delta / (2.0 - cmax - cmin);
|
else delta / (2.0 - cmax - cmin);
|
||||||
hue =
|
hue =
|
||||||
if delta < 0.0001 then 0.0
|
if delta < 0.0001
|
||||||
else if mx == "r" then let raw = 60.0 * (g - b) / delta; in if raw < 0.0 then raw + 360.0 else raw
|
then 0.0
|
||||||
else if mx == "g" then 60.0 * ((b - r) / delta + 2.0)
|
else if mx == "r"
|
||||||
|
then let
|
||||||
|
raw = 60.0 * (g - b) / delta;
|
||||||
|
in
|
||||||
|
if raw < 0.0
|
||||||
|
then raw + 360.0
|
||||||
|
else raw
|
||||||
|
else if mx == "g"
|
||||||
|
then 60.0 * ((b - r) / delta + 2.0)
|
||||||
else 60.0 * ((r - g) / delta + 4.0);
|
else 60.0 * ((r - g) / delta + 4.0);
|
||||||
in "${toString (builtins.floor (hue + 0.5))} ${toString (builtins.floor (s * 100.0 + 0.5))} ${toString (builtins.floor (l * 100.0 + 0.5))}";
|
in "${toString (builtins.floor (hue + 0.5))} ${toString (builtins.floor (s * 100.0 + 0.5))} ${
|
||||||
|
toString (builtins.floor (l * 100.0 + 0.5))
|
||||||
|
}";
|
||||||
|
|
||||||
c = config.stylix.base16Scheme;
|
c = config.stylix.base16Scheme;
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
# 0444 so the glance user inside the container can read the bind-mounted file
|
# 0444 so the glance user inside the container can read the bind-mounted file
|
||||||
sops.secrets.adguard-pwd.mode = "0444";
|
sops.secrets.adguard-pwd.mode = "0444";
|
||||||
|
|
||||||
@@ -49,10 +95,13 @@ in
|
|||||||
hostPath = config.sops.secrets.adguard-pwd.path;
|
hostPath = config.sops.secrets.adguard-pwd.path;
|
||||||
isReadOnly = true;
|
isReadOnly = true;
|
||||||
};
|
};
|
||||||
nixosConfig = { lib, ... }: {
|
nixosConfig = {lib, ...}: {
|
||||||
_module.args.domain = domain;
|
_module.args.domain = domain;
|
||||||
_module.args.adguardUrl = "http://${hostIp}:3000";
|
_module.args.adguardUrl = "http://${hostIp}:3000";
|
||||||
imports = [ ./home.nix ./server.nix ];
|
imports = [
|
||||||
|
./home.nix
|
||||||
|
./server.nix
|
||||||
|
];
|
||||||
|
|
||||||
services.glance = {
|
services.glance = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -77,7 +126,12 @@ in
|
|||||||
proxy_cache_path /var/cache/nginx/glance levels=1:2 keys_zone=glance:1m inactive=30m max_size=100m;
|
proxy_cache_path /var/cache/nginx/glance levels=1:2 keys_zone=glance:1m inactive=30m max_size=100m;
|
||||||
'';
|
'';
|
||||||
virtualHosts."glance" = {
|
virtualHosts."glance" = {
|
||||||
listen = [{ addr = "0.0.0.0"; port = 8080; }];
|
listen = [
|
||||||
|
{
|
||||||
|
addr = "0.0.0.0";
|
||||||
|
port = 8080;
|
||||||
|
}
|
||||||
|
];
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://127.0.0.1:5678";
|
proxyPass = "http://127.0.0.1:5678";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
@@ -90,7 +144,7 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 8080 ];
|
networking.firewall.allowedTCPPorts = [8080];
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.05";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ domain, ... }: {
|
{domain, ...}: {
|
||||||
services.glance.settings.pages = [
|
services.glance.settings.pages = [
|
||||||
{
|
{
|
||||||
name = "Home";
|
name = "Home";
|
||||||
|
|||||||
+18
-11
@@ -1,15 +1,16 @@
|
|||||||
{ config, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (import ./mk-container.nix { inherit lib config; }) mkContainer;
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (import ./mk-container.nix {inherit lib config;}) mkContainer;
|
||||||
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
(mkContainer {
|
(mkContainer {
|
||||||
name = "mazanoke";
|
name = "mazanoke";
|
||||||
hostIp = "10.233.7.1";
|
hostIp = "10.233.7.1";
|
||||||
containerIp = "10.233.7.2";
|
containerIp = "10.233.7.2";
|
||||||
nixosConfig = { pkgs, ... }:
|
nixosConfig = {pkgs, ...}: let
|
||||||
let
|
|
||||||
version = "1.1.5";
|
version = "1.1.5";
|
||||||
mazanoke-pkg = pkgs.stdenv.mkDerivation {
|
mazanoke-pkg = pkgs.stdenv.mkDerivation {
|
||||||
inherit version;
|
inherit version;
|
||||||
@@ -25,17 +26,23 @@ in
|
|||||||
cp -r ./index.html ./favicon.ico ./manifest.json ./service-worker.js ./assets $out/share/mazanoke/
|
cp -r ./index.html ./favicon.ico ./manifest.json ./service-worker.js ./assets $out/share/mazanoke/
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
virtualHosts."mazanoke" = {
|
virtualHosts."mazanoke" = {
|
||||||
root = "${mazanoke-pkg}/share/mazanoke";
|
root = "${mazanoke-pkg}/share/mazanoke";
|
||||||
listen = [{ addr = "0.0.0.0"; port = 8080; }];
|
listen = [
|
||||||
locations."/" = { index = "index.html"; };
|
{
|
||||||
|
addr = "0.0.0.0";
|
||||||
|
port = 8080;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
locations."/" = {
|
||||||
|
index = "index.html";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
networking.firewall.allowedTCPPorts = [ 8080 ];
|
};
|
||||||
|
networking.firewall.allowedTCPPorts = [8080];
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.05";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,20 +1,22 @@
|
|||||||
{ config, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (import ./mk-container.nix { inherit lib config; }) mkContainer;
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (import ./mk-container.nix {inherit lib config;}) mkContainer;
|
||||||
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
(mkContainer {
|
(mkContainer {
|
||||||
name = "mealie";
|
name = "mealie";
|
||||||
hostIp = "10.233.8.1";
|
hostIp = "10.233.8.1";
|
||||||
containerIp = "10.233.8.2";
|
containerIp = "10.233.8.2";
|
||||||
internet = true;
|
internet = true;
|
||||||
nixosConfig = { ... }: {
|
nixosConfig = {...}: {
|
||||||
services.mealie = {
|
services.mealie = {
|
||||||
enable = true;
|
enable = true;
|
||||||
port = 8080;
|
port = 8080;
|
||||||
};
|
};
|
||||||
networking.firewall.allowedTCPPorts = [ 8080 ];
|
networking.firewall.allowedTCPPorts = [8080];
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.05";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
{ lib, config }:
|
{
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
}:
|
||||||
# Returns a NixOS module (attrset), to be used in `imports`.
|
# Returns a NixOS module (attrset), to be used in `imports`.
|
||||||
#
|
#
|
||||||
# Options:
|
# Options:
|
||||||
@@ -7,16 +9,13 @@
|
|||||||
# externalInterface - WAN interface for NAT, required when internet = true
|
# externalInterface - WAN interface for NAT, required when internet = true
|
||||||
# bindMounts - host paths to mount into the container (see containers.<name>.bindMounts)
|
# bindMounts - host paths to mount into the container (see containers.<name>.bindMounts)
|
||||||
# config - NixOS module for the container
|
# config - NixOS module for the container
|
||||||
|
|
||||||
let
|
let
|
||||||
nginxHardening = { config, ... }: lib.mkIf config.services.nginx.enable {
|
nginxHardening = {config, ...}:
|
||||||
|
lib.mkIf config.services.nginx.enable {
|
||||||
services.nginx.serverTokens = false;
|
services.nginx.serverTokens = false;
|
||||||
};
|
};
|
||||||
in
|
in {
|
||||||
|
mkContainer = {
|
||||||
{
|
|
||||||
mkContainer =
|
|
||||||
{
|
|
||||||
name,
|
name,
|
||||||
hostIp,
|
hostIp,
|
||||||
containerIp,
|
containerIp,
|
||||||
@@ -25,8 +24,7 @@ in
|
|||||||
bindMounts ? {},
|
bindMounts ? {},
|
||||||
nixosConfig,
|
nixosConfig,
|
||||||
}:
|
}:
|
||||||
assert lib.assertMsg
|
assert lib.assertMsg (lib.stringLength "ve-${name}" <= 15)
|
||||||
(lib.stringLength "ve-${name}" <= 15)
|
|
||||||
"mkContainer: interface name 've-${name}' is ${toString (lib.stringLength "ve-${name}")} chars, max is 15";
|
"mkContainer: interface name 've-${name}' is ${toString (lib.stringLength "ve-${name}")} chars, max is 15";
|
||||||
{
|
{
|
||||||
containers.${name} = {
|
containers.${name} = {
|
||||||
@@ -35,9 +33,15 @@ in
|
|||||||
hostAddress = hostIp;
|
hostAddress = hostIp;
|
||||||
localAddress = containerIp;
|
localAddress = containerIp;
|
||||||
inherit bindMounts;
|
inherit bindMounts;
|
||||||
config = { ... }: {
|
config = {...}: {
|
||||||
imports = [ nixosConfig nginxHardening ];
|
imports = [
|
||||||
networking.nameservers = lib.mkIf internet [ "1.1.1.1" "1.0.0.1" ];
|
nixosConfig
|
||||||
|
nginxHardening
|
||||||
|
];
|
||||||
|
networking.nameservers = lib.mkIf internet [
|
||||||
|
"1.1.1.1"
|
||||||
|
"1.0.0.1"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -46,7 +50,7 @@ in
|
|||||||
networking.nat = {
|
networking.nat = {
|
||||||
enable = true;
|
enable = true;
|
||||||
externalInterface = externalInterface;
|
externalInterface = externalInterface;
|
||||||
internalInterfaces = [ "ve-${name}" ];
|
internalInterfaces = ["ve-${name}"];
|
||||||
};
|
};
|
||||||
# CONTAINER-FWD (defined by another module) blocks all forwarding by default.
|
# CONTAINER-FWD (defined by another module) blocks all forwarding by default.
|
||||||
# Insert rules in FORWARD before it: allow return traffic, block LAN, allow internet.
|
# Insert rules in FORWARD before it: allow return traffic, block LAN, allow internet.
|
||||||
|
|||||||
@@ -17,8 +17,14 @@ in {
|
|||||||
AllowTcpForwarding = false;
|
AllowTcpForwarding = false;
|
||||||
ClientAliveInterval = 300;
|
ClientAliveInterval = 300;
|
||||||
ClientAliveCountMax = 2;
|
ClientAliveCountMax = 2;
|
||||||
KexAlgorithms = ["curve25519-sha256" "curve25519-sha256@libssh.org"];
|
KexAlgorithms = [
|
||||||
Ciphers = ["chacha20-poly1305@openssh.com" "aes256-gcm@openssh.com"];
|
"curve25519-sha256"
|
||||||
|
"curve25519-sha256@libssh.org"
|
||||||
|
];
|
||||||
|
Ciphers = [
|
||||||
|
"chacha20-poly1305@openssh.com"
|
||||||
|
"aes256-gcm@openssh.com"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,19 +1,21 @@
|
|||||||
{ config, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (import ./mk-container.nix { inherit lib config; }) mkContainer;
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (import ./mk-container.nix {inherit lib config;}) mkContainer;
|
||||||
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
(mkContainer {
|
(mkContainer {
|
||||||
name = "stirling-pdf";
|
name = "stirling-pdf";
|
||||||
hostIp = "10.233.9.1";
|
hostIp = "10.233.9.1";
|
||||||
containerIp = "10.233.9.2";
|
containerIp = "10.233.9.2";
|
||||||
nixosConfig = { ... }: {
|
nixosConfig = {...}: {
|
||||||
services.stirling-pdf = {
|
services.stirling-pdf = {
|
||||||
enable = true;
|
enable = true;
|
||||||
environment."SERVER_PORT" = "8080";
|
environment."SERVER_PORT" = "8080";
|
||||||
};
|
};
|
||||||
networking.firewall.allowedTCPPorts = [ 8080 ];
|
networking.firewall.allowedTCPPorts = [8080];
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.05";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
{ config, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (import ./mk-container.nix { inherit lib config; }) mkContainer;
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (import ./mk-container.nix {inherit lib config;}) mkContainer;
|
||||||
|
in {
|
||||||
sops.secrets.umami-secret.mode = "0400";
|
sops.secrets.umami-secret.mode = "0400";
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
@@ -14,7 +16,7 @@ in
|
|||||||
hostPath = config.sops.secrets.umami-secret.path;
|
hostPath = config.sops.secrets.umami-secret.path;
|
||||||
isReadOnly = true;
|
isReadOnly = true;
|
||||||
};
|
};
|
||||||
nixosConfig = { ... }: {
|
nixosConfig = {...}: {
|
||||||
services.umami = {
|
services.umami = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
@@ -27,7 +29,7 @@ in
|
|||||||
};
|
};
|
||||||
# PrivateUsers breaks systemd-creds inside nspawn containers (nested user namespaces)
|
# PrivateUsers breaks systemd-creds inside nspawn containers (nested user namespaces)
|
||||||
systemd.services.umami.serviceConfig.PrivateUsers = lib.mkForce false;
|
systemd.services.umami.serviceConfig.PrivateUsers = lib.mkForce false;
|
||||||
networking.firewall.allowedTCPPorts = [ 8080 ];
|
networking.firewall.allowedTCPPorts = [8080];
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.05";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -16,8 +16,7 @@
|
|||||||
border-size = 2;
|
border-size = 2;
|
||||||
animation-speed = "medium"; # "fast" | "medium" | "slow"
|
animation-speed = "medium"; # "fast" | "medium" | "slow"
|
||||||
fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
|
fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
|
||||||
textColorOnWallpaper =
|
textColorOnWallpaper = config.lib.stylix.colors.base00; # Color of the text displayed on the wallpaper (Lockscreen, display manager, ...)
|
||||||
config.lib.stylix.colors.base00; # Color of the text displayed on the wallpaper (Lockscreen, display manager, ...)
|
|
||||||
};
|
};
|
||||||
description = "Theme configuration options";
|
description = "Theme configuration options";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -16,8 +16,7 @@
|
|||||||
border-size = 4;
|
border-size = 4;
|
||||||
animation-speed = "fast"; # "fast" | "medium" | "slow"
|
animation-speed = "fast"; # "fast" | "medium" | "slow"
|
||||||
fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
|
fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
|
||||||
textColorOnWallpaper =
|
textColorOnWallpaper = config.lib.stylix.colors.base00; # Color of the text displayed on the wallpaper (Lockscreen, display manager, ...)
|
||||||
config.lib.stylix.colors.base00; # Color of the text displayed on the wallpaper (Lockscreen, display manager, ...)
|
|
||||||
};
|
};
|
||||||
description = "Theme configuration options";
|
description = "Theme configuration options";
|
||||||
};
|
};
|
||||||
|
|||||||
+1
-2
@@ -16,8 +16,7 @@
|
|||||||
border-size = 4;
|
border-size = 4;
|
||||||
animation-speed = "medium"; # "fast" | "medium" | "slow"
|
animation-speed = "medium"; # "fast" | "medium" | "slow"
|
||||||
fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
|
fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
|
||||||
textColorOnWallpaper =
|
textColorOnWallpaper = config.lib.stylix.colors.base00; # Color of the text displayed on the wallpaper (Lockscreen, display manager, ...)
|
||||||
config.lib.stylix.colors.base00; # Color of the text displayed on the wallpaper (Lockscreen, display manager, ...)
|
|
||||||
};
|
};
|
||||||
description = "Theme configuration options";
|
description = "Theme configuration options";
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user