mirror of
https://github.com/anotherhadi/nixy.git
synced 2026-07-06 16:12:33 +02:00
Compare commits
105 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a393b84c92 | |||
| ccdf0c289a | |||
| cdffe66d72 | |||
| 082de49ca4 | |||
| 11391ae56c | |||
| a8f39b1729 | |||
| a704d3a7d2 | |||
| f72d6ab55c | |||
| 2890b49b82 | |||
| b8f30fbe4e | |||
| cc7f352ced | |||
| 24081abaf0 | |||
| 4addb1bd33 | |||
| c27c0550fb | |||
| 1333132eef | |||
| 1e83efd78a | |||
| 2f89759ca7 | |||
| 79351e46a1 | |||
| 3f37a26162 | |||
| e9fbdcb870 | |||
| e5d494607f | |||
| d4e4a8f9f7 | |||
| 7f54f94974 | |||
| 148b093eb4 | |||
| dd3ad203fa | |||
| 76f2982167 | |||
| 868c215895 | |||
| ceecbb858d | |||
| 9e45e35b7e | |||
| 6c2a7563d3 | |||
| 783e8fb9ff | |||
| 2878142360 | |||
| 93c36aa3ef | |||
| a195e1d2e9 | |||
| 3c13b64fec | |||
| 1e4b0f610c | |||
| c06762d636 | |||
| 1ba64e3731 | |||
| afc1928f5a | |||
| 87c258312c | |||
| 03f6cd7fe8 | |||
| 57db0eaaf6 | |||
| e14c569193 | |||
| a5e4dcddac | |||
| fd7c23055f | |||
| 4322ca33db | |||
| 9ebdaa1505 | |||
| 6a9752b74e | |||
| 48bb118da4 | |||
| ab92a39a28 | |||
| ec6abc4aba | |||
| fe781a0eed | |||
| 19609ad781 | |||
| 922e916a7a | |||
| 7c8a552730 | |||
| a15bc11625 | |||
| d233ae904f | |||
| 5f72e16819 | |||
| 2954349fee | |||
| 4b79b7689a | |||
| 5dff7ceb12 | |||
| a90a3809ce | |||
| fe1247f121 | |||
| 313f3c0b87 | |||
| 93152a5dcb | |||
| edf013bb08 | |||
| cb323223f8 | |||
| d1462de38c | |||
| 8419542ea2 | |||
| 2740475af1 | |||
| 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
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
MIT License
|
MIT License
|
||||||
|
|
||||||
Copyright (c) 2024 Hadi
|
Copyright (c) 2026 Hadi
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
|||||||
@@ -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
+254
-930
File diff suppressed because it is too large
Load Diff
@@ -7,14 +7,13 @@
|
|||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
|
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-26.05";
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||||
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
|
|
||||||
stylix.url = "github:danth/stylix";
|
|
||||||
sops-nix.url = "github:Mic92/sops-nix";
|
|
||||||
nvf.url = "github:notashelf/nvf";
|
nvf.url = "github:notashelf/nvf";
|
||||||
bun2nix.url = "github:nix-community/bun2nix";
|
nur = {
|
||||||
|
url = "github:nix-community/nur";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
nix-index-database = {
|
nix-index-database = {
|
||||||
url = "github:nix-community/nix-index-database";
|
url = "github:nix-community/nix-index-database";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@@ -23,21 +22,24 @@
|
|||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
caelestia-shell = {
|
stylix = {
|
||||||
url = "github:caelestia-dots/shell";
|
url = "github:nix-community/stylix";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
caelestia-cli = {
|
sops-nix = {
|
||||||
url = "github:caelestia-dots/cli";
|
url = "github:Mic92/sops-nix";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
spicetify-nix = {
|
notashelf-tuigreet = {
|
||||||
url = "github:Gerg-L/spicetify-nix";
|
url = "github:NotAShelf/tuigreet";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
helium-browser = {
|
||||||
|
url = "github:oxcl/nix-flake-helium-browser";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
# Server
|
# Server
|
||||||
# FIXME: Deleted repo for now
|
|
||||||
# eleakxir.url = "github:anotherhadi/eleakxir";
|
|
||||||
nixarr.url = "github:rasmus-kirk/nixarr";
|
nixarr.url = "github:rasmus-kirk/nixarr";
|
||||||
default-creds.url = "github:anotherhadi/default-creds";
|
default-creds.url = "github:anotherhadi/default-creds";
|
||||||
blog.url = "github:anotherhadi/blog";
|
blog.url = "github:anotherhadi/blog";
|
||||||
@@ -45,40 +47,35 @@
|
|||||||
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};
|
||||||
nixpkgs.overlays = [];
|
args = {
|
||||||
_module.args = {
|
inherit
|
||||||
inherit inputs;
|
inputs
|
||||||
};
|
nixpkgs
|
||||||
}
|
system
|
||||||
inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME: check https://github.com/NixOS/nixos-hardware
|
pkgs
|
||||||
inputs.home-manager.nixosModules.home-manager
|
;
|
||||||
inputs.stylix.nixosModules.stylix
|
pkgs-stable = nixpkgs-stable.legacyPackages.${system};
|
||||||
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
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
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)
|
||||||
|
{
|
||||||
|
formatter.${system} = pkgs.alejandra;
|
||||||
|
nixosConfigurations = {
|
||||||
|
h-laptop = import ./hosts/laptop/flake.nix args;
|
||||||
|
h-work = import ./hosts/work/flake.nix args;
|
||||||
|
jack = import ./hosts/server/flake.nix args;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,78 +0,0 @@
|
|||||||
{
|
|
||||||
programs.brave = {
|
|
||||||
enable = true;
|
|
||||||
commandLineArgs = [
|
|
||||||
# Wayland Native
|
|
||||||
"--enable-features=UseOzonePlatform"
|
|
||||||
"--ozone-platform=wayland"
|
|
||||||
|
|
||||||
# Hardware Acceleration (NVIDIA optimized)
|
|
||||||
"--enable-accelerated-video-decode"
|
|
||||||
"--enable-gpu-rasterization"
|
|
||||||
"--enable-zero-copy"
|
|
||||||
"--ignore-gpu-blocklist"
|
|
||||||
|
|
||||||
# Performance
|
|
||||||
"--enable-features=VaapiVideoDecoder"
|
|
||||||
"--enable-features=VaapiVideoEncoder"
|
|
||||||
"--enable-features=CanvasOopRasterization"
|
|
||||||
"--disable-features=UseChromeOSDirectVideoDecoder"
|
|
||||||
|
|
||||||
# Privacy & Security
|
|
||||||
"--disable-features=MediaRouter" # Disable Chromecast
|
|
||||||
"--disable-features=OptimizationHints" # No Google suggestions
|
|
||||||
"--disable-features=AutofillSavePaymentMethods"
|
|
||||||
"--disable-background-networking" # No telemetry
|
|
||||||
"--disable-sync" # Manual sync control
|
|
||||||
|
|
||||||
# Wayland-specific fixes
|
|
||||||
"--disable-features=WaylandWpColorManagerV1" # Color management fix
|
|
||||||
|
|
||||||
# UI/UX
|
|
||||||
"--force-dark-mode" # Match Stylix theme
|
|
||||||
"--enable-features=WebUIDarkMode"
|
|
||||||
"--no-default-browser-check"
|
|
||||||
];
|
|
||||||
extensions = let
|
|
||||||
ids = [
|
|
||||||
];
|
|
||||||
in
|
|
||||||
map (id: {inherit id;}) ids;
|
|
||||||
};
|
|
||||||
|
|
||||||
xdg.configFile."BraveSoftware/Brave-Browser/Policies/managed/policy.json".text = builtins.toJSON {
|
|
||||||
BraveShieldsAdControl = 2;
|
|
||||||
BraveShieldsTrackersBlocked = 1;
|
|
||||||
BraveShieldsHttpsEverywhere = 1;
|
|
||||||
BraveRewardsDisabled = 1;
|
|
||||||
BraveWalletDisabled = 1;
|
|
||||||
BraveVPNDisabled = 1;
|
|
||||||
BraveAIChatEnabled = 0;
|
|
||||||
PasswordManagerEnabled = 0;
|
|
||||||
BravePlaylistEnabled = 0;
|
|
||||||
BraveWebDiscoveryEnabled = 0;
|
|
||||||
BraveStatsPingEnabled = 0;
|
|
||||||
DnsOverHttpsMode = "automatic";
|
|
||||||
BraveDarkMode = 1;
|
|
||||||
};
|
|
||||||
|
|
||||||
xdg.desktopEntries = {
|
|
||||||
brave-incognito = {
|
|
||||||
name = "Brave (Private window)";
|
|
||||||
genericName = "Navigateur Web";
|
|
||||||
exec = "brave --incognito";
|
|
||||||
icon = "brave-browser";
|
|
||||||
terminal = false;
|
|
||||||
categories = ["Network" "WebBrowser"];
|
|
||||||
mimeType = ["text/html" "text/xml"];
|
|
||||||
};
|
|
||||||
brave-tor = {
|
|
||||||
name = "Brave (Private window w/Tor)";
|
|
||||||
genericName = "Navigateur Web";
|
|
||||||
exec = "brave --tor";
|
|
||||||
icon = "brave-browser";
|
|
||||||
terminal = false;
|
|
||||||
categories = ["Network" "WebBrowser"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,4 +1,16 @@
|
|||||||
{
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
cursorShaders = pkgs.fetchFromGitHub {
|
||||||
|
owner = "sahaj-b";
|
||||||
|
repo = "ghostty-cursor-shaders";
|
||||||
|
rev = "06d4e90fb5410e9c4d0b3131584060adddf89406";
|
||||||
|
hash = "sha256-G/UIr1bKnxn1AcHl/4FL/jou6b7M2VeREslYVELxdmw=";
|
||||||
|
};
|
||||||
|
c = config.lib.stylix.colors;
|
||||||
|
in {
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
TERMINAL = "ghostty";
|
TERMINAL = "ghostty";
|
||||||
TERM = "ghostty";
|
TERM = "ghostty";
|
||||||
@@ -16,17 +28,39 @@
|
|||||||
clipboard-write = "allow";
|
clipboard-write = "allow";
|
||||||
copy-on-select = "clipboard";
|
copy-on-select = "clipboard";
|
||||||
app-notifications = false;
|
app-notifications = false;
|
||||||
|
custom-shader = "${cursorShaders}/cursor_warp.glsl";
|
||||||
|
custom-shader-animation = "always";
|
||||||
keybind = [
|
keybind = [
|
||||||
"ctrl+j=goto_split:left"
|
# "ctrl+j=goto_split:left"
|
||||||
"ctrl+i=goto_split:up"
|
# "ctrl+i=goto_split:up"
|
||||||
"ctrl+k=goto_split:down"
|
# "ctrl+k=goto_split:down"
|
||||||
"ctrl+l=goto_split:right"
|
# "ctrl+l=goto_split:right"
|
||||||
"shift+ctrl+h=new_split:left"
|
# "shift+ctrl+h=new_split:left"
|
||||||
"shift+ctrl+j=new_split:down"
|
# "shift+ctrl+j=new_split:down"
|
||||||
"shift+ctrl+k=new_split:up"
|
# "shift+ctrl+k=new_split:up"
|
||||||
"shift+ctrl+l=new_split:right"
|
# "shift+ctrl+l=new_split:right"
|
||||||
"shift+ctrl+tab=new_tab"
|
"shift+ctrl+tab=new_tab"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
home.file.".config/ilovetui/config.yaml".text = ''
|
||||||
|
colors:
|
||||||
|
base00: "#${c.base00}" # Background
|
||||||
|
base01: "#${c.base01}" # Lighter Background / Status Bars
|
||||||
|
base02: "#${c.base02}" # Selection Background
|
||||||
|
base03: "#${c.base03}" # Comments / Invisibles
|
||||||
|
base04: "#${c.base04}" # Dark Foreground / Status Bars
|
||||||
|
base05: "#${c.base05}" # Default Foreground
|
||||||
|
base06: "#${c.base06}" # Light Foreground
|
||||||
|
base07: "#${c.base07}" # Light Background
|
||||||
|
base08: "#${c.base08}" # Variables / Errors / Diff Deleted
|
||||||
|
base09: "#${c.base09}" # Integers / Constants / Booleans
|
||||||
|
base0a: "#${c.base0A}" # Classes / Warnings / Search Background
|
||||||
|
base0b: "#${c.base0B}" # Strings / Success / Diff Inserted
|
||||||
|
base0c: "#${c.base0C}" # Support / Regex / Escape Characters
|
||||||
|
base0d: "#${c.base0D}" # Functions / Methods / Headings / Accent
|
||||||
|
base0e: "#${c.base0E}" # Keywords / Storage / Diff Changed
|
||||||
|
base0f: "#${c.base0F}" # Embedded / Misc
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
}: {
|
}: {
|
||||||
home.packages = with pkgs-stable; [
|
home.packages = with pkgs-stable; [
|
||||||
vlc # Video player
|
vlc # Video player
|
||||||
blanket # White-noise app
|
|
||||||
obsidian # Note taking app
|
obsidian # Note taking app
|
||||||
textpieces # Manipulate texts
|
textpieces # Manipulate texts
|
||||||
resources # Ressource monitor
|
resources # Ressource monitor
|
||||||
@@ -13,9 +12,33 @@
|
|||||||
gnome-text-editor # Basic graphic text editor
|
gnome-text-editor # Basic graphic text editor
|
||||||
ticktick # Todo app
|
ticktick # Todo app
|
||||||
pinta # Image editor
|
pinta # Image editor
|
||||||
|
switcheroo # Convert images between different formats
|
||||||
onlyoffice-desktopeditors # Office suite
|
onlyoffice-desktopeditors # Office suite
|
||||||
|
blanket # Listen to different sounds
|
||||||
signal-desktop # Messaging app
|
signal-desktop # Messaging app
|
||||||
element-desktop # Messaging app
|
|
||||||
|
# I love TUIs
|
||||||
|
caligula # User-friendly, lightweight TUI for disk imaging (ISO, USB BOOT)
|
||||||
|
dysk # A terminal-based disk usage analyzer
|
||||||
|
wikiman # Offline search engine for manual pages (arch wiki, tldr)
|
||||||
|
tealdeer # Fast tldr client
|
||||||
|
sttr # Minimalist "cyberchef" like. Cross-platform, cli app to perform various operations on string
|
||||||
|
wiremix # Simple TUI mixer for PipeWire
|
||||||
|
slides # A terminal-based presentation tool that allows you to create and deliver presentations directly from the command line
|
||||||
|
pom # Pomodoro timer in your terminal
|
||||||
|
tabiew # A terminal-based CSV viewer and manipulator
|
||||||
|
jless # A pager for JSON
|
||||||
|
pkgs.wifitui # TUI for managing wifi
|
||||||
|
pkgs.nur.repos.anotherhadi.usbguard-tui # TUI for managing USBGuard rules
|
||||||
|
pkgs.nur.repos.anotherhadi.sheets # Terminal based spreadsheet tool
|
||||||
|
|
||||||
|
# I love CLIs
|
||||||
|
httpie # Command-line HTTP client, a user-friendly cURL replacement
|
||||||
|
gh # GitHub
|
||||||
|
gh-dash # A terminal dashboard for GitHub
|
||||||
|
figlet # Transform text into ASCII art
|
||||||
|
pastel # Command-line tool to generate, analyze, convert and manipulate colors
|
||||||
|
imagemagick # Image manipulation tool
|
||||||
|
chafa # Image to ANSI/Unicode converter and more.
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
pkgs-stable,
|
||||||
|
}:
|
||||||
|
(with pkgs-stable; [
|
||||||
|
# Web
|
||||||
|
dirb
|
||||||
|
ffuf
|
||||||
|
katana
|
||||||
|
whatweb
|
||||||
|
|
||||||
|
# Hashes
|
||||||
|
hashcat
|
||||||
|
haiti
|
||||||
|
hydra
|
||||||
|
john
|
||||||
|
|
||||||
|
# Databases
|
||||||
|
mariadb
|
||||||
|
redis
|
||||||
|
sqlmap
|
||||||
|
nosqli
|
||||||
|
|
||||||
|
# Network
|
||||||
|
inetutils
|
||||||
|
termshark # wireshark in TUI
|
||||||
|
whois
|
||||||
|
dig
|
||||||
|
nmap
|
||||||
|
samba
|
||||||
|
|
||||||
|
# Misc
|
||||||
|
metasploit
|
||||||
|
nuclei
|
||||||
|
openvpn
|
||||||
|
|
||||||
|
# Secrets
|
||||||
|
trufflehog
|
||||||
|
|
||||||
|
# Forensics
|
||||||
|
binwalk
|
||||||
|
])
|
||||||
|
++ [ pkgs.dnsrecon ]
|
||||||
|
++ (with pkgs.nur.repos.anotherhadi; [
|
||||||
|
spilltea
|
||||||
|
jwt-tui
|
||||||
|
])
|
||||||
@@ -1,25 +1,44 @@
|
|||||||
{
|
{
|
||||||
|
pkgs,
|
||||||
pkgs-stable,
|
pkgs-stable,
|
||||||
inputs,
|
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
home.packages = with pkgs-stable; [
|
home.packages = import ./cybersecurity-packages.nix {
|
||||||
wireshark
|
inherit pkgs pkgs-stable;
|
||||||
nmap
|
};
|
||||||
john
|
|
||||||
hashcat
|
|
||||||
|
|
||||||
# Web
|
systemd.user.tmpfiles.rules = [
|
||||||
caido
|
"d %h/Cyber/tmp 0755 - - -"
|
||||||
nuclei
|
"d %h/Cyber/wordlists 0755 - - -"
|
||||||
gobuster
|
"d %h/Cyber/wordlists/rules 0755 - - -"
|
||||||
dirb
|
|
||||||
|
|
||||||
# Utils
|
|
||||||
inetutils
|
|
||||||
samba
|
|
||||||
openvpn
|
|
||||||
mariadb
|
|
||||||
redis
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
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=";
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
pkgs-stable,
|
||||||
|
}:
|
||||||
|
(with pkgs; [
|
||||||
|
go
|
||||||
|
claude-code
|
||||||
|
])
|
||||||
|
++ (with pkgs-stable; [
|
||||||
|
nodejs
|
||||||
|
air
|
||||||
|
duckdb
|
||||||
|
python3
|
||||||
|
jq
|
||||||
|
nix-prefetch-github
|
||||||
|
rsync
|
||||||
|
])
|
||||||
@@ -1,24 +1,7 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
pkgs-stable,
|
pkgs-stable,
|
||||||
inputs,
|
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
home.packages =
|
home.packages = import ./dev-packages.nix {inherit pkgs pkgs-stable;};
|
||||||
(with pkgs; [
|
|
||||||
# Unstable: latest toolchain versions preferred for dev
|
|
||||||
go
|
|
||||||
bun
|
|
||||||
nodejs
|
|
||||||
air
|
|
||||||
duckdb
|
|
||||||
claude-code
|
|
||||||
inputs.bun2nix.packages.${stdenv.hostPlatform.system}.default
|
|
||||||
])
|
|
||||||
++ (with pkgs-stable; [
|
|
||||||
docker
|
|
||||||
python3
|
|
||||||
jq
|
|
||||||
just
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
inputs,
|
||||||
|
pkgs,
|
||||||
|
pkgs-stable,
|
||||||
|
system,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
devPackages = import ./dev-packages.nix {inherit pkgs pkgs-stable;};
|
||||||
|
cyberPackages = import ./cybersecurity-packages.nix {inherit pkgs pkgs-stable;};
|
||||||
|
in {
|
||||||
|
packages.${system} = {
|
||||||
|
dev = pkgs.buildEnv {
|
||||||
|
name = "dev-tools";
|
||||||
|
paths = devPackages;
|
||||||
|
};
|
||||||
|
cybersecurity = pkgs.buildEnv {
|
||||||
|
name = "cybersecurity-tools";
|
||||||
|
paths = cyberPackages;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
{pkgs-stable, ...}: {
|
{pkgs-stable, ...}: {
|
||||||
home.packages = with pkgs-stable; [
|
home.packages = with pkgs-stable; [
|
||||||
|
tty-solitaire
|
||||||
|
bastet
|
||||||
peaclock
|
peaclock
|
||||||
cbonsai
|
cbonsai
|
||||||
pipes
|
pipes
|
||||||
|
|||||||
@@ -0,0 +1,459 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
bookmarkList =
|
||||||
|
(import ./general.nix)
|
||||||
|
++ (import ./tools.nix)
|
||||||
|
++ (import ./entertainment.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;
|
||||||
|
in {
|
||||||
|
home.file.".local/share/helium-startpage/index.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://duckduckgo.com/?q=' + q;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (e.key === 'Escape') {
|
||||||
|
this.value = ''';
|
||||||
|
this.dispatchEvent(new Event('input'));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
'';
|
||||||
|
|
||||||
|
systemd.user.services.helium-startpage = {
|
||||||
|
Unit = {
|
||||||
|
Description = "Helium startpage HTTP server";
|
||||||
|
After = ["network.target"];
|
||||||
|
};
|
||||||
|
Service = {
|
||||||
|
Type = "simple";
|
||||||
|
ExecStart = "${pkgs.darkhttpd}/bin/darkhttpd %h/.local/share/helium-startpage --port 8888 --addr 127.0.0.1 --no-listing";
|
||||||
|
Restart = "on-failure";
|
||||||
|
};
|
||||||
|
Install.WantedBy = ["default.target"];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -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,14 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
name = "Proton Mail";
|
||||||
|
url = "https://mail.proton.me";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Proton Drive";
|
||||||
|
url = "https://drive.proton.me";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Github";
|
||||||
|
url = "https://github.com";
|
||||||
|
}
|
||||||
|
]
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
name = "Infosec";
|
||||||
|
icon = "terminal";
|
||||||
|
bookmarks = [
|
||||||
|
{
|
||||||
|
name = "Nix 4 Cyber";
|
||||||
|
url = "https://n4c.hadi.icu";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Infosec Notes - Anotherhadi";
|
||||||
|
url = "https://hadi.icu/notes";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
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 = "Reverse Shell Generator";
|
||||||
|
url = "https://revshells.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,58 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
name = "Other";
|
||||||
|
icon = "category";
|
||||||
|
bookmarks = [
|
||||||
|
{
|
||||||
|
name = "Documentation";
|
||||||
|
icon = "menu_book";
|
||||||
|
bookmarks = [
|
||||||
|
{
|
||||||
|
name = "Hyprland Wiki";
|
||||||
|
url = "https://wiki.hypr.land";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Nerdfont Cheatsheet";
|
||||||
|
url = "https://www.nerdfonts.com/cheat-sheet";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Helium Bangs";
|
||||||
|
url = "https://helium.computer/bangs";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "NVF Options";
|
||||||
|
url = "https://nvf.notashelf.dev/";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
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,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";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
]
|
||||||
@@ -0,0 +1,138 @@
|
|||||||
|
{
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
c = config.lib.stylix.colors;
|
||||||
|
rgb = base: map lib.strings.toInt [c."${base}-rgb-r" c."${base}-rgb-g" c."${base}-rgb-b"];
|
||||||
|
|
||||||
|
themeId = "abcadngacjlikcpkhleafekcdjmddegk";
|
||||||
|
themeKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6t46VoE3mdV1QNMgybpmQLi5PtYHejnNrSj4DkBZyiTzMzs7Yyvg64f78w3QubZA5cTXSQ7FVhVHvv30I8ym/jNzsSN6reh1t4PtKsFjFRugAty8bfKJGD404HZLOFN2z3G9UPVLBBgzDH3DWbb/kcOq60Mlo/QDCIjsieZg0G3EYMl4efoThzYPWoyv0UEoiliwrE/AChxbgipQetUZ48bFhTCsmnYzCze7clssfTobzWtJJG0qFx76LauHKymRS5OTFfgsovKqHUSFJ202Q53vFdUPP/j8PjSPr1kZeg1NYc7Ba3MoA49EwtJf5ol9oYu05EEnSQ5+1AoYVmdE8QIDAQAB";
|
||||||
|
|
||||||
|
themeManifest = builtins.toJSON {
|
||||||
|
manifest_version = 2;
|
||||||
|
name = "Stylix Theme";
|
||||||
|
version = "1.0";
|
||||||
|
key = themeKey;
|
||||||
|
theme.colors = {
|
||||||
|
frame = rgb "base00";
|
||||||
|
frame_inactive = rgb "base00";
|
||||||
|
frame_incognito = rgb "base00";
|
||||||
|
frame_incognito_inactive = rgb "base00";
|
||||||
|
toolbar = rgb "base00";
|
||||||
|
toolbar_button_icon = rgb "base05";
|
||||||
|
control_background = rgb "base00";
|
||||||
|
tab_text = rgb "base0D";
|
||||||
|
background_tab = rgb "base00";
|
||||||
|
tab_background_text = rgb "base04";
|
||||||
|
tab_background_text_inactive = rgb "base04";
|
||||||
|
ntp_background = rgb "base00";
|
||||||
|
ntp_text = rgb "base05";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
heliumFlags = [
|
||||||
|
"--ozone-platform=wayland"
|
||||||
|
"--enable-features=UseOzonePlatform,VaapiVideoDecoder,VaapiVideoEncoder,CanvasOopRasterization"
|
||||||
|
"--disable-features=UseChromeOSDirectVideoDecoder,WaylandWpColorManagerV1"
|
||||||
|
"--enable-accelerated-video-decode"
|
||||||
|
"--enable-gpu-rasterization"
|
||||||
|
"--use-gl=egl"
|
||||||
|
"--no-default-browser-check"
|
||||||
|
"--show-avatar-button=never"
|
||||||
|
];
|
||||||
|
|
||||||
|
originalPkg = (inputs.helium-browser.packages.${pkgs.stdenv.hostPlatform.system}.helium).override {
|
||||||
|
flags = heliumFlags;
|
||||||
|
};
|
||||||
|
|
||||||
|
patchScript = pkgs.writeShellScript "helium-patch-prefs" ''
|
||||||
|
PROFILE="$HOME/.config/net.imput.helium/Default"
|
||||||
|
THEME_DIR="$PROFILE/Extensions/${themeId}/1.0_0"
|
||||||
|
PREFS="$PROFILE/Preferences"
|
||||||
|
|
||||||
|
mkdir -p "$THEME_DIR"
|
||||||
|
rm -f "$THEME_DIR/Cached Theme.pak"
|
||||||
|
printf '%s' '${themeManifest}' > "$THEME_DIR/manifest.json"
|
||||||
|
|
||||||
|
if [ -f "$PREFS" ]; then
|
||||||
|
tmp=$(mktemp)
|
||||||
|
${lib.getExe pkgs.jq} \
|
||||||
|
--arg id "${themeId}" \
|
||||||
|
--slurpfile manifest "$THEME_DIR/manifest.json" \
|
||||||
|
'
|
||||||
|
.helium.browser.layout = 3 |
|
||||||
|
.helium.browser.minimal_location_bar = true |
|
||||||
|
.helium.browser.show_dynamic_new_tab_button = false |
|
||||||
|
.helium.browser.rounded_frame = false |
|
||||||
|
.bookmark_bar.show_tab_groups = false |
|
||||||
|
.extensions.settings[$id] = {
|
||||||
|
"active_permissions": {"api": [], "explicit_host": [], "manifest_permissions": [], "scriptable_host": []},
|
||||||
|
"creation_flags": 0,
|
||||||
|
"from_webstore": false,
|
||||||
|
"install_time": "13300000000000000",
|
||||||
|
"location": 1,
|
||||||
|
"manifest": $manifest[0],
|
||||||
|
"path": ($id + "/1.0_0"),
|
||||||
|
"state": 1,
|
||||||
|
"was_installed_by_default": false,
|
||||||
|
"was_installed_by_oem": false
|
||||||
|
} |
|
||||||
|
.extensions.theme = {"id": $id, "use_system": false}
|
||||||
|
' "$PREFS" > "$tmp" && mv "$tmp" "$PREFS"
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
|
||||||
|
baseWrapped = pkgs.symlinkJoin {
|
||||||
|
name = "helium-wrapped";
|
||||||
|
paths = [originalPkg];
|
||||||
|
nativeBuildInputs = [pkgs.makeWrapper];
|
||||||
|
postBuild = ''
|
||||||
|
wrapProgram $out/bin/helium \
|
||||||
|
--run ${lib.escapeShellArg (toString patchScript)}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
wrappedPkg = baseWrapped // {override = _: baseWrapped;};
|
||||||
|
in {
|
||||||
|
imports = [
|
||||||
|
inputs.helium-browser.homeModules.default
|
||||||
|
./bookmarks
|
||||||
|
];
|
||||||
|
|
||||||
|
programs.helium = {
|
||||||
|
enable = true;
|
||||||
|
package = lib.mkForce wrappedPkg;
|
||||||
|
};
|
||||||
|
|
||||||
|
home.sessionVariables.BROWSER = "${config.programs.helium.package}/bin/helium";
|
||||||
|
|
||||||
|
xdg.desktopEntries.helium = {
|
||||||
|
name = "Helium";
|
||||||
|
genericName = "Navigateur Web";
|
||||||
|
exec = "${config.programs.helium.package}/bin/helium %U";
|
||||||
|
icon = "${config.programs.helium.package}/share/icons/hicolor/256x256/apps/helium.png";
|
||||||
|
terminal = false;
|
||||||
|
categories = ["Network" "WebBrowser"];
|
||||||
|
mimeType = [
|
||||||
|
"text/html"
|
||||||
|
"text/xml"
|
||||||
|
"application/xhtml+xml"
|
||||||
|
"x-scheme-handler/http"
|
||||||
|
"x-scheme-handler/https"
|
||||||
|
"x-scheme-handler/ftp"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
xdg.desktopEntries.helium-private = {
|
||||||
|
name = "Helium (Private window)";
|
||||||
|
genericName = "Navigateur Web";
|
||||||
|
exec = "${config.programs.helium.package}/bin/helium --incognito %U";
|
||||||
|
icon = "${config.programs.helium.package}/share/icons/hicolor/256x256/apps/helium.png";
|
||||||
|
terminal = false;
|
||||||
|
categories = ["Network" "WebBrowser"];
|
||||||
|
mimeType = ["text/html" "text/xml" "application/xhtml+xml"];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
{...}: let
|
||||||
|
bookmarkList =
|
||||||
|
(import ./bookmarks/general.nix)
|
||||||
|
++ (import ./bookmarks/tools.nix)
|
||||||
|
++ (import ./bookmarks/entertainment.nix)
|
||||||
|
++ (import ./bookmarks/infosec.nix)
|
||||||
|
++ (import ./bookmarks/other.nix)
|
||||||
|
++ (import ./bookmarks/jack.nix);
|
||||||
|
|
||||||
|
toChromium = items:
|
||||||
|
map (item:
|
||||||
|
if item ? url
|
||||||
|
then {inherit (item) name url;}
|
||||||
|
else {
|
||||||
|
name = item.name;
|
||||||
|
children = toChromium item.bookmarks;
|
||||||
|
})
|
||||||
|
items;
|
||||||
|
in {
|
||||||
|
stylix.targets.chromium.enable = false;
|
||||||
|
|
||||||
|
programs.helium = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
policies = {
|
||||||
|
BrowserSignin = 0;
|
||||||
|
SyncDisabled = true;
|
||||||
|
SigninAllowed = false;
|
||||||
|
|
||||||
|
PasswordManagerEnabled = false;
|
||||||
|
AutofillAddressEnabled = false;
|
||||||
|
AutofillCreditCardEnabled = false;
|
||||||
|
SafeBrowsingEnabled = false;
|
||||||
|
MetricsReportingEnabled = false;
|
||||||
|
SpellCheckServiceEnabled = false;
|
||||||
|
DefaultCookiesSetting = 1;
|
||||||
|
DefaultGeolocationSetting = 2;
|
||||||
|
DefaultNotificationsSetting = 2;
|
||||||
|
DefaultPopupsSetting = 2;
|
||||||
|
|
||||||
|
DefaultBrowserSettingEnabled = false;
|
||||||
|
DeveloperToolsAvailability = 1;
|
||||||
|
|
||||||
|
DnsOverHttpsMode = "automatic";
|
||||||
|
DnsOverHttpsTemplates = "https://dns.quad9.net/dns-query";
|
||||||
|
|
||||||
|
DefaultSearchProviderEnabled = true;
|
||||||
|
DefaultSearchProviderName = "Startpage";
|
||||||
|
DefaultSearchProviderSearchURL = "https://www.startpage.com/do/search?q={searchTerms}";
|
||||||
|
DefaultSearchProviderSuggestURL = "https://www.startpage.com/do/suggest?q={searchTerms}";
|
||||||
|
|
||||||
|
NewTabPageLocation = "http://127.0.0.1:8888";
|
||||||
|
HomepageIsNewTabPage = false;
|
||||||
|
HomepageLocation = "http://127.0.0.1:8888";
|
||||||
|
ShowHomeButton = false;
|
||||||
|
RestoreOnStartup = 4;
|
||||||
|
|
||||||
|
BookmarkBarEnabled = false;
|
||||||
|
ManagedBookmarks = toChromium bookmarkList;
|
||||||
|
|
||||||
|
ExtensionInstallForcelist = [
|
||||||
|
"dbepggeogbaibhgnhhndojpepiihcmeb" # Vimiu
|
||||||
|
"gcknhkkoolaabfmlnjonogaaifnjlfnp" # FoxyProxy
|
||||||
|
"ghmbeldphafepmbegfdlkpapadhbakde" # Proton Pass
|
||||||
|
"mdjildafknihdffpkfmmpnpoiajfjnjd" # Consent-O-Matic
|
||||||
|
"pkehgijcmpdhfbdbbnkijodmdjhbjlgp" # Privacy Badger
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
{pkgs, ...}: let
|
|
||||||
nightshift-toggle =
|
|
||||||
pkgs.writeShellScriptBin "nightshift-toggle"
|
|
||||||
# bash
|
|
||||||
''
|
|
||||||
if pidof "hyprsunset"; then
|
|
||||||
pkill hyprsunset
|
|
||||||
${pkgs.libnotify}/bin/notify-send "Night Shift Disabled" "Returning to full spectrum light. Filter disabled."
|
|
||||||
else
|
|
||||||
${pkgs.hyprsunset}/bin/hyprsunset -t 4500 &
|
|
||||||
${pkgs.libnotify}/bin/notify-send "Night Shift Activated" "Welcome to the warm side. Blue light filtering is now active."
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
in {
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
hyprsunset
|
|
||||||
nightshift-toggle
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -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,21 +1,37 @@
|
|||||||
# NVF is a Neovim configuration that provides a minimal setup with essential plugins and configurations.
|
|
||||||
{
|
{
|
||||||
inputs,
|
inputs,
|
||||||
pkgs,
|
config,
|
||||||
...
|
...
|
||||||
}: {
|
}: let
|
||||||
imports = [
|
c = config.lib.stylix.colors;
|
||||||
inputs.nvf.homeManagerModules.default
|
in {
|
||||||
./options.nix
|
imports = [inputs.nvf.homeManagerModules.default];
|
||||||
./languages.nix
|
|
||||||
./picker.nix
|
home.sessionVariables = {
|
||||||
./snacks.nix
|
EDITOR = "nvim";
|
||||||
./keymaps.nix
|
};
|
||||||
./utils.nix
|
|
||||||
./mini.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
programs.nvf = {
|
programs.nvf = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
vim.luaConfigRC.hl-overrides = ''
|
||||||
|
local function apply_hl()
|
||||||
|
vim.api.nvim_set_hl(0, "MiniStarterHeader", { fg = "#${c.base0D}", bold = true })
|
||||||
|
vim.api.nvim_set_hl(0, "SnacksPickerBorder", { fg = "#${c.base0D}" })
|
||||||
|
vim.api.nvim_set_hl(0, "SnacksPickerTitle", { fg = "#${c.base0D}", bold = true })
|
||||||
|
end
|
||||||
|
apply_hl()
|
||||||
|
vim.api.nvim_create_autocmd("ColorScheme", { pattern = "*", callback = apply_hl })
|
||||||
|
'';
|
||||||
|
imports = [
|
||||||
|
./options.nix
|
||||||
|
./languages.nix
|
||||||
|
./picker.nix
|
||||||
|
./snacks.nix
|
||||||
|
./keymaps.nix
|
||||||
|
./utils.nix
|
||||||
|
./mini.nix
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
+148
-50
@@ -1,21 +1,14 @@
|
|||||||
{
|
{
|
||||||
programs.nvf.settings.vim = {
|
vim = {
|
||||||
globals.mapleader = " ";
|
globals.mapleader = " ";
|
||||||
binds = {
|
|
||||||
whichKey = {
|
|
||||||
enable = true;
|
|
||||||
# TODO: registers
|
|
||||||
register = {};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
keymaps = [
|
keymaps = [
|
||||||
# General Mappings
|
|
||||||
{
|
{
|
||||||
key = "s";
|
key = "s";
|
||||||
mode = "n";
|
mode = "n";
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<cmd>lua require('flash').jump()<cr>";
|
action = "<cmd>lua MiniJump2d.start(MiniJump2d.builtin_opts.single_character)<cr>";
|
||||||
desc = "Flash";
|
desc = "Jump2d";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "K";
|
key = "K";
|
||||||
@@ -32,52 +25,57 @@
|
|||||||
desc = "Next Buffer";
|
desc = "Next Buffer";
|
||||||
}
|
}
|
||||||
|
|
||||||
# Disable Arrow Keys in Normal Mode and Middle click
|
# Format
|
||||||
{
|
{
|
||||||
key = "<Up>";
|
key = "<leader>lf";
|
||||||
mode = "n";
|
mode = "n";
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<Nop>";
|
action = "<cmd>lua require('conform').format({ async = true, lsp_format = 'fallback' })<cr>";
|
||||||
desc = "Disable Up Arrow";
|
desc = "Format file";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Terminal
|
||||||
{
|
{
|
||||||
key = "<Down>";
|
key = "<leader>tt";
|
||||||
mode = "n";
|
mode = "n";
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<Nop>";
|
action = "<cmd>lua Snacks.terminal.toggle()<cr>";
|
||||||
desc = "Disable Down Arrow";
|
desc = "Toggle terminal";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<Left>";
|
key = "<leader>tf";
|
||||||
mode = "n";
|
mode = "n";
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<Nop>";
|
action = "<cmd>lua Snacks.terminal.toggle(nil, { style = 'float' })<cr>";
|
||||||
desc = "Disable Left Arrow";
|
desc = "Toggle terminal (float)";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<Right>";
|
key = "<leader>tg";
|
||||||
mode = "n";
|
mode = "n";
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<Nop>";
|
action = "<cmd>lua Snacks.lazygit()<cr>";
|
||||||
desc = "Disable Right Arrow";
|
desc = "Lazygit";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<MiddleMouse>";
|
key = "<leader>ts";
|
||||||
mode = ["n" "i" "v"]; # Normal, Insert, Visual
|
mode = "v";
|
||||||
action = "<nop>"; # No Operation
|
|
||||||
silent = true;
|
silent = true;
|
||||||
|
action = ":<C-u>SttrTransform<CR>";
|
||||||
|
desc = "String Transform";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<2-MiddleMouse>"; # Désactive aussi le double clic molette
|
key = "<leader>tj";
|
||||||
mode = ["n" "i" "v"];
|
mode = "n";
|
||||||
action = "<nop>";
|
|
||||||
silent = true;
|
silent = true;
|
||||||
|
action = ":JwtTui<CR>";
|
||||||
|
desc = "JWT TUI";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<3-MiddleMouse>"; # Désactive aussi le double clic molette
|
key = "<leader>tj";
|
||||||
mode = ["n" "i" "v"];
|
mode = "v";
|
||||||
action = "<nop>";
|
|
||||||
silent = true;
|
silent = true;
|
||||||
|
action = ":<C-u>JwtTuiOpen<CR>";
|
||||||
|
desc = "JWT TUI";
|
||||||
}
|
}
|
||||||
|
|
||||||
# UI
|
# UI
|
||||||
@@ -138,27 +136,59 @@
|
|||||||
desc = "Hide tabline";
|
desc = "Hide tabline";
|
||||||
}
|
}
|
||||||
|
|
||||||
# Windows
|
# Todos
|
||||||
{
|
{
|
||||||
key = "<leader>ws";
|
key = "<leader>xt";
|
||||||
mode = "n";
|
mode = "n";
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<cmd>split<cr>";
|
action = "<cmd>TodoTrouble<cr>";
|
||||||
desc = "Split";
|
desc = "Todo (Trouble)";
|
||||||
|
}
|
||||||
|
|
||||||
|
# Shell
|
||||||
|
{
|
||||||
|
key = "<leader>!";
|
||||||
|
mode = "n";
|
||||||
|
silent = true;
|
||||||
|
lua = true;
|
||||||
|
desc = "Insert command output";
|
||||||
|
action = ''
|
||||||
|
function()
|
||||||
|
local cmd = vim.fn.input("Command: ")
|
||||||
|
if cmd == "" then return end
|
||||||
|
local lines = vim.fn.systemlist(cmd)
|
||||||
|
while #lines > 0 and lines[#lines] == "" do
|
||||||
|
table.remove(lines)
|
||||||
|
end
|
||||||
|
if #lines == 0 then return end
|
||||||
|
vim.api.nvim_put(lines, "l", true, true)
|
||||||
|
end
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<leader>wv";
|
key = "<leader>!";
|
||||||
mode = "n";
|
mode = "v";
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<cmd>vsplit<cr>";
|
lua = true;
|
||||||
desc = "VSplit";
|
desc = "Run command with selection";
|
||||||
}
|
action = ''
|
||||||
{
|
function()
|
||||||
key = "<leader>wd";
|
local start_line = vim.fn.line("'<")
|
||||||
mode = "n";
|
local end_line = vim.fn.line("'>")
|
||||||
silent = true;
|
local lines = vim.api.nvim_buf_get_lines(0, start_line - 1, end_line, false)
|
||||||
action = "<cmd>close<cr>";
|
local input_text = table.concat(lines, "\n")
|
||||||
desc = "Close";
|
|
||||||
|
local cmd = vim.fn.input("$ ")
|
||||||
|
if cmd == "" then return end
|
||||||
|
|
||||||
|
local result = vim.fn.system({"bash", "-c", cmd}, input_text)
|
||||||
|
local output = vim.split(result, "\n", { plain = true })
|
||||||
|
if output[#output] == "" then table.remove(output) end
|
||||||
|
if #output == 0 then return end
|
||||||
|
|
||||||
|
vim.api.nvim_buf_set_lines(0, start_line - 1, end_line, false, output)
|
||||||
|
end
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
|
||||||
# QOL
|
# QOL
|
||||||
@@ -210,7 +240,11 @@
|
|||||||
# 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,11 +253,75 @@
|
|||||||
# 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";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Disable Arrow Keys in Normal Mode and Middle click
|
||||||
|
{
|
||||||
|
key = "<Up>";
|
||||||
|
mode = "n";
|
||||||
|
silent = true;
|
||||||
|
action = "<Nop>";
|
||||||
|
desc = "Disable Up Arrow";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
key = "<Down>";
|
||||||
|
mode = "n";
|
||||||
|
silent = true;
|
||||||
|
action = "<Nop>";
|
||||||
|
desc = "Disable Down Arrow";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
key = "<Left>";
|
||||||
|
mode = "n";
|
||||||
|
silent = true;
|
||||||
|
action = "<Nop>";
|
||||||
|
desc = "Disable Left Arrow";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
key = "<Right>";
|
||||||
|
mode = "n";
|
||||||
|
silent = true;
|
||||||
|
action = "<Nop>";
|
||||||
|
desc = "Disable Right Arrow";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
key = "<MiddleMouse>";
|
||||||
|
mode = [
|
||||||
|
"n"
|
||||||
|
"i"
|
||||||
|
"v"
|
||||||
|
];
|
||||||
|
action = "<nop>";
|
||||||
|
silent = true;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
key = "<2-MiddleMouse>";
|
||||||
|
mode = [
|
||||||
|
"n"
|
||||||
|
"i"
|
||||||
|
"v"
|
||||||
|
];
|
||||||
|
action = "<nop>";
|
||||||
|
silent = true;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
key = "<3-MiddleMouse>";
|
||||||
|
mode = [
|
||||||
|
"n"
|
||||||
|
"i"
|
||||||
|
"v"
|
||||||
|
];
|
||||||
|
action = "<nop>";
|
||||||
|
silent = true;
|
||||||
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,5 @@
|
|||||||
{
|
{...}: {
|
||||||
lib,
|
vim = {
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
programs.nvf.settings.vim = {
|
|
||||||
diagnostics = {
|
diagnostics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
config = {
|
config = {
|
||||||
@@ -17,33 +13,18 @@
|
|||||||
};
|
};
|
||||||
underline = true;
|
underline = true;
|
||||||
update_in_insert = true;
|
update_in_insert = true;
|
||||||
virtual_text = {
|
virtual_text = true;
|
||||||
format =
|
|
||||||
lib.generators.mkLuaInline
|
|
||||||
/*
|
|
||||||
lua
|
|
||||||
*/
|
|
||||||
''
|
|
||||||
function(diagnostic)
|
|
||||||
return string.format("%s", diagnostic.message)
|
|
||||||
--return string.format("%s (%s)", diagnostic.message, diagnostic.source)
|
|
||||||
end
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
nvim-lint = {
|
nvim-lint = {
|
||||||
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; [
|
textobjects.enable = true;
|
||||||
typescript # in language settings only tsx gets enabled, not typescript
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
lsp = {
|
lsp = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -55,10 +36,10 @@
|
|||||||
trouble.enable = true;
|
trouble.enable = true;
|
||||||
lspSignature.enable = true;
|
lspSignature.enable = true;
|
||||||
lspconfig.enable = true;
|
lspconfig.enable = true;
|
||||||
formatOnSave = true;
|
formatOnSave = false;
|
||||||
|
mappings.format = null;
|
||||||
inlayHints.enable = true;
|
inlayHints.enable = true;
|
||||||
null-ls.enable = true;
|
servers.nil.settings.nix.autoArchive = true;
|
||||||
servers.nixd.settings.nil.nix.autoArchive = true;
|
|
||||||
otter-nvim = {
|
otter-nvim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
setupOpts = {
|
setupOpts = {
|
||||||
@@ -82,12 +63,11 @@
|
|||||||
sign = false;
|
sign = false;
|
||||||
virtual_text = true;
|
virtual_text = true;
|
||||||
};
|
};
|
||||||
breadcrumbs.enable = false;
|
symbol_in_winbar.enable = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
languages = {
|
languages = {
|
||||||
enableDAP = true;
|
|
||||||
enableExtraDiagnostics = true;
|
enableExtraDiagnostics = true;
|
||||||
enableFormat = true;
|
enableFormat = true;
|
||||||
enableTreesitter = true;
|
enableTreesitter = true;
|
||||||
@@ -107,23 +87,29 @@
|
|||||||
extensions = {
|
extensions = {
|
||||||
markview-nvim = {
|
markview-nvim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
setupOpts = {
|
||||||
|
preview = {
|
||||||
|
hybrid_modes = ["n"];
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
extraDiagnostics.enable = true;
|
extraDiagnostics.enable = true;
|
||||||
};
|
};
|
||||||
typescript = {
|
typescript.enable = true;
|
||||||
enable = true;
|
|
||||||
extensions.ts-error-translator.enable = true;
|
|
||||||
};
|
|
||||||
css.enable = true;
|
css.enable = true;
|
||||||
svelte.enable = true;
|
svelte.enable = true;
|
||||||
html.enable = true;
|
html.enable = true;
|
||||||
bash.enable = true;
|
bash.enable = true;
|
||||||
nix.enable = true;
|
nix.enable = true;
|
||||||
|
lua.enable = true;
|
||||||
};
|
};
|
||||||
formatter = {
|
formatter = {
|
||||||
conform-nvim = {
|
conform-nvim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
setupOpts.format_on_save = {
|
||||||
|
lsp_format = "fallback";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,13 +1,100 @@
|
|||||||
{
|
{lib, ...}: {
|
||||||
programs.nvf.settings.vim.mini = {
|
vim.luaConfigRC.mini-clue = ''
|
||||||
starter.enable = true;
|
local miniclue = require('mini.clue')
|
||||||
|
miniclue.setup({
|
||||||
|
triggers = {
|
||||||
|
{ mode = 'n', keys = '<Leader>' },
|
||||||
|
{ mode = 'x', keys = '<Leader>' },
|
||||||
|
{ mode = 'n', keys = 'g' },
|
||||||
|
{ mode = 'x', keys = 'g' },
|
||||||
|
{ mode = 'n', keys = "'" },
|
||||||
|
{ mode = 'n', keys = '`' },
|
||||||
|
{ mode = 'n', keys = '"' },
|
||||||
|
{ mode = 'i', keys = '<C-r>' },
|
||||||
|
{ mode = 'c', keys = '<C-r>' },
|
||||||
|
{ mode = 'n', keys = '<C-w>' },
|
||||||
|
{ mode = 'n', keys = 'z' },
|
||||||
|
},
|
||||||
|
clues = {
|
||||||
|
miniclue.gen_clues.g(),
|
||||||
|
miniclue.gen_clues.marks(),
|
||||||
|
miniclue.gen_clues.registers(),
|
||||||
|
miniclue.gen_clues.windows({ submode_resize = true }),
|
||||||
|
miniclue.gen_clues.z(),
|
||||||
|
{ mode = 'n', keys = '<Leader>f', desc = '+find' },
|
||||||
|
{ mode = 'n', keys = '<Leader>s', desc = '+search' },
|
||||||
|
{ mode = 'n', keys = '<Leader>t', desc = '+terminal' },
|
||||||
|
{ mode = 'n', keys = '<Leader>u', desc = '+ui' },
|
||||||
|
{ mode = 'n', keys = '<Leader>l', desc = '+lsp' },
|
||||||
|
{ mode = 'n', keys = '<Leader>x', desc = '+trouble' },
|
||||||
|
{ mode = 'n', keys = '<Leader>!', desc = 'shell' },
|
||||||
|
{ mode = 'v', keys = '<Leader>!', desc = 'shell' },
|
||||||
|
{ mode = 'n', keys = '<Leader>e', desc = 'yazi' },
|
||||||
|
},
|
||||||
|
window = { delay = 300 },
|
||||||
|
})
|
||||||
|
'';
|
||||||
|
|
||||||
|
vim.mini = {
|
||||||
|
ai.enable = true;
|
||||||
|
starter = {
|
||||||
|
enable = true;
|
||||||
|
setupOpts = {
|
||||||
|
header = ''
|
||||||
|
⣟⣯⣟⣯⡇⠀⣿⢩⣛⡼⣏⠀⠈⠋⠀⣈⡷⣙⢎⡳⣙⢮⣙⢮⣙⢎⡳⣙⢾⣿
|
||||||
|
⢿⡾⣽⡞⣷⣤⣏⡳⡜⡼⠗⠁⢀⠀⠙⢧⠳⣍⢞⡱⣭⠲⣍⠶⣩⢞⡱⡭⣾⣿
|
||||||
|
⠈⠻⠧⢿⣧⣿⠶⣵⢻⢞⡷⢲⡟⡶⢴⡭⢿⣜⣮⡱⢎⡳⣍⢞⡱⢮⡱⣳⣿⣽
|
||||||
|
⠀⣰⣶⡏⢷⣈⣿⣸⣇⣾⣸⣿⣾⣹⣆⡹⡎⡶⢇⡿⣹⢷⣾⣈⠷⣇⢷⣿⣿⣹
|
||||||
|
⣾⣻⣭⣿⣾⣿⣿⣟⣿⣿⡿⣽⡿⣿⢿⣿⣿⣿⣾⣶⣵⣾⠲⣭⢳⣞⣾⡿⣷⣿
|
||||||
|
⣿⣿⣿⣯⣷⣿⣿⠿⢝⠚⠋⠉⠉⠉⠙⠚⠛⡾⢿⣿⣻⣿⣿⣶⣏⠶⣩⠿⣿⡈
|
||||||
|
⣿⣟⣿⣻⣿⡏⠀⠀⠀⠳⡀⠀⠀⠀⠀⠰⠊⠀⠀⠈⠙⠳⣿⣿⣿⣿⣧⣻⣿⣿
|
||||||
|
⠘⢻⣿⣿⣽⡇⠈⠧⣄⠀⠀⠀⠀⠀⠀⢀⣄⡤⠴⠚⠀⠀⠀⠙⢿⣷⡿⣿⣿⣿
|
||||||
|
⠀⠠⢈⢛⣿⠀⠚⠉⠉⠱⣼⡷⠀⠀⠀⠀⠉⠉⠑⠶⠀⠀⠀⠀⠀⠻⣿⣿⣾⢿
|
||||||
|
⠀⠡⠈⠉⠹⡀⠀⠀⡄⠀⣸⡀⠀⠀⠀⠀⡀⠀⠀⠀⠀⠀⠀⠀⠀⣰⣿⣯⣿⢿
|
||||||
|
⠀⠁⢶⣶⠀⢷⠀⠀⠉⠉⠀⠈⠉⠶⠆⠈⠀⠀⠀⠀⠀⠀⠀⠀⣸⣿⣿⣿⣾⣿
|
||||||
|
⠀⠡⢸⢹⠏⡍⠓⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣺⡟⠋⠉⢹⢭⢣
|
||||||
|
⠀⠀⢸⣹⡏⠭⠭⠭⠙⣲⣦⣤⣤⣀⣀⣀⣀⣤⣤⣶⣞⠉⠙⠛⠷⢀⣀⠘⣎⠧
|
||||||
|
⢁⣈⣀⣀⢀⣀⣀⣀⣼⠟⠹⢿⣯⣟⣿⣻⡿⠿⠛⢿⣿⣦⡀⠀⠀⠀⠀⠉⠉⠘
|
||||||
|
'';
|
||||||
|
footer = "";
|
||||||
|
items = [
|
||||||
|
{
|
||||||
|
name = "files";
|
||||||
|
action = lib.mkLuaInline "function() Snacks.picker.files() end";
|
||||||
|
section = "";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "directories";
|
||||||
|
action = lib.mkLuaInline "function() Snacks.explorer() end";
|
||||||
|
section = "";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "tmp";
|
||||||
|
action = lib.mkLuaInline ''
|
||||||
|
function()
|
||||||
|
local uuid = vim.fn.system("uuidgen"):match("(%S+)")
|
||||||
|
vim.cmd("edit /tmp/" .. uuid .. ".md")
|
||||||
|
end
|
||||||
|
'';
|
||||||
|
section = "";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "recent";
|
||||||
|
action = lib.mkLuaInline "function() Snacks.picker.recent() end";
|
||||||
|
section = "";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
comment.enable = true;
|
comment.enable = true;
|
||||||
# cursorword.enable = true;
|
|
||||||
icons.enable = true;
|
icons.enable = true;
|
||||||
indentscope.enable = true;
|
indentscope.enable = true;
|
||||||
notify.enable = true;
|
|
||||||
pairs.enable = true;
|
pairs.enable = true;
|
||||||
diff.enable = true;
|
diff.enable = true;
|
||||||
git.enable = true;
|
git.enable = true;
|
||||||
|
jump2d.enable = true;
|
||||||
|
statusline.enable = true;
|
||||||
|
clue.enable = true;
|
||||||
|
surround.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;
|
||||||
@@ -18,17 +17,10 @@
|
|||||||
softtabstop = 2;
|
softtabstop = 2;
|
||||||
wrap = false;
|
wrap = false;
|
||||||
};
|
};
|
||||||
globals = {
|
globals.navic_silence = true;
|
||||||
navic_silence = true; # navic tries to attach multiple LSPs and fails
|
|
||||||
suda_smart_edit = 1; # use super user write automatically
|
|
||||||
neovide_scale_factor = 0.7;
|
|
||||||
neovide_cursor_animation_length = 0.1;
|
|
||||||
neovide_cursor_short_animation_length = 0;
|
|
||||||
};
|
|
||||||
clipboard = {
|
clipboard = {
|
||||||
enable = true;
|
enable = true;
|
||||||
registers = "unnamedplus";
|
registers = "unnamedplus";
|
||||||
providers.wl-copy.enable = true;
|
|
||||||
};
|
};
|
||||||
luaConfigRC.osc52-clipboard = ''
|
luaConfigRC.osc52-clipboard = ''
|
||||||
vim.g.clipboard = {
|
vim.g.clipboard = {
|
||||||
|
|||||||
+14
-109
@@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
programs.nvf.settings.vim = {
|
vim = {
|
||||||
utility = {
|
utility = {
|
||||||
oil-nvim.enable = true;
|
|
||||||
snacks-nvim = {
|
snacks-nvim = {
|
||||||
setupOpts = {
|
setupOpts = {
|
||||||
picker.enabled = true;
|
picker.enabled = true;
|
||||||
@@ -18,27 +17,6 @@
|
|||||||
action = "<cmd>lua Snacks.picker.smart()<cr>";
|
action = "<cmd>lua Snacks.picker.smart()<cr>";
|
||||||
desc = "Smart Find Files";
|
desc = "Smart Find Files";
|
||||||
}
|
}
|
||||||
{
|
|
||||||
key = "<leader>,";
|
|
||||||
mode = "n";
|
|
||||||
silent = true;
|
|
||||||
action = "<cmd>lua Snacks.picker.buffers()<cr>";
|
|
||||||
desc = "Buffers";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "<leader>/";
|
|
||||||
mode = "n";
|
|
||||||
silent = true;
|
|
||||||
action = "<cmd>lua Snacks.picker.grep()<cr>";
|
|
||||||
desc = "Grep";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "<leader>:";
|
|
||||||
mode = "n";
|
|
||||||
silent = true;
|
|
||||||
action = "<cmd>lua Snacks.picker.command_history()<cr>";
|
|
||||||
desc = "Command History";
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
key = "<leader>e";
|
key = "<leader>e";
|
||||||
mode = "n";
|
mode = "n";
|
||||||
@@ -47,11 +25,11 @@
|
|||||||
desc = "File Explorer";
|
desc = "File Explorer";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "-";
|
key = "<leader>/";
|
||||||
mode = "n";
|
mode = "n";
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<cmd>Oil<cr>";
|
action = "<cmd>lua Snacks.picker.lines()<cr>";
|
||||||
desc = "Oil";
|
desc = "Buffer Lines";
|
||||||
}
|
}
|
||||||
|
|
||||||
# Find
|
# Find
|
||||||
@@ -62,14 +40,6 @@
|
|||||||
action = "<cmd>lua Snacks.picker.buffers()<cr>";
|
action = "<cmd>lua Snacks.picker.buffers()<cr>";
|
||||||
desc = "Buffers";
|
desc = "Buffers";
|
||||||
}
|
}
|
||||||
{
|
|
||||||
key = "<leader>fc";
|
|
||||||
mode = "n";
|
|
||||||
silent = true;
|
|
||||||
action = ''
|
|
||||||
<cmd>lua Snacks.picker.files({ cwd = vim.fn.stdpath("config") })<cr>'';
|
|
||||||
desc = "Find Config File";
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
key = "<leader>ff";
|
key = "<leader>ff";
|
||||||
mode = "n";
|
mode = "n";
|
||||||
@@ -77,13 +47,6 @@
|
|||||||
action = "<cmd>lua Snacks.picker.files()<cr>";
|
action = "<cmd>lua Snacks.picker.files()<cr>";
|
||||||
desc = "Find Files";
|
desc = "Find Files";
|
||||||
}
|
}
|
||||||
{
|
|
||||||
key = "<leader>fg";
|
|
||||||
mode = "n";
|
|
||||||
silent = true;
|
|
||||||
action = "<cmd>lua Snacks.picker.git_files()<cr>";
|
|
||||||
desc = "Find Git Files";
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
key = "<leader>fp";
|
key = "<leader>fp";
|
||||||
mode = "n";
|
mode = "n";
|
||||||
@@ -98,6 +61,13 @@
|
|||||||
action = "<cmd>lua Snacks.picker.recent()<cr>";
|
action = "<cmd>lua Snacks.picker.recent()<cr>";
|
||||||
desc = "Recent";
|
desc = "Recent";
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
key = "<leader>f:";
|
||||||
|
mode = "n";
|
||||||
|
silent = true;
|
||||||
|
action = "<cmd>lua Snacks.picker.command_history()<cr>";
|
||||||
|
desc = "Command History";
|
||||||
|
}
|
||||||
{
|
{
|
||||||
key = "<leader>fn";
|
key = "<leader>fn";
|
||||||
mode = "n";
|
mode = "n";
|
||||||
@@ -105,65 +75,14 @@
|
|||||||
action = "<cmd>lua Snacks.picker.notifications()<cr>";
|
action = "<cmd>lua Snacks.picker.notifications()<cr>";
|
||||||
desc = "Notification History";
|
desc = "Notification History";
|
||||||
}
|
}
|
||||||
{
|
|
||||||
key = "<leader>fe";
|
|
||||||
mode = "n";
|
|
||||||
silent = true;
|
|
||||||
action = "<cmd>lua Snacks.picker.icons()<cr>";
|
|
||||||
desc = "Emoji";
|
|
||||||
}
|
|
||||||
|
|
||||||
# Git
|
|
||||||
{
|
|
||||||
key = "<leader>gb";
|
|
||||||
mode = "n";
|
|
||||||
silent = true;
|
|
||||||
action = "<cmd>lua Snacks.picker.git_branches()<cr>";
|
|
||||||
desc = "Git Branches";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "<leader>gL";
|
|
||||||
mode = "n";
|
|
||||||
silent = true;
|
|
||||||
action = "<cmd>lua Snacks.picker.git_log()<cr>";
|
|
||||||
desc = "Git Log Line";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "<leader>gs";
|
|
||||||
mode = "n";
|
|
||||||
silent = true;
|
|
||||||
action = "<cmd>lua Snacks.picker.git_status()<cr>";
|
|
||||||
desc = "Git Status";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "<leader>gS";
|
|
||||||
mode = "n";
|
|
||||||
silent = true;
|
|
||||||
action = "<cmd>lua Snacks.picker.git_stash()<cr>";
|
|
||||||
desc = "Git Stash";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "<leader>gd";
|
|
||||||
mode = "n";
|
|
||||||
silent = true;
|
|
||||||
action = "<cmd>lua Snacks.picker.git_diff()<cr>";
|
|
||||||
desc = "Git Diff (Hunks)";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "<leader>gf";
|
|
||||||
mode = "n";
|
|
||||||
silent = true;
|
|
||||||
action = "<cmd>lua Snacks.picker.git_log_file()<cr>";
|
|
||||||
desc = "Git Log File";
|
|
||||||
}
|
|
||||||
|
|
||||||
# Grep
|
# Grep
|
||||||
{
|
{
|
||||||
key = "<leader>sb";
|
key = "<leader>sg";
|
||||||
mode = "n";
|
mode = "n";
|
||||||
silent = true;
|
silent = true;
|
||||||
action = "<cmd>lua Snacks.picker.lines()<cr>";
|
action = "<cmd>lua Snacks.picker.grep()<cr>";
|
||||||
desc = "Buffer Lines";
|
desc = "Grep";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<leader>st";
|
key = "<leader>st";
|
||||||
@@ -172,20 +91,6 @@
|
|||||||
action = "<cmd>lua Snacks.picker.todo_comments()<cr>";
|
action = "<cmd>lua Snacks.picker.todo_comments()<cr>";
|
||||||
desc = "Todos";
|
desc = "Todos";
|
||||||
}
|
}
|
||||||
{
|
|
||||||
key = "<leader>sB";
|
|
||||||
mode = "n";
|
|
||||||
silent = true;
|
|
||||||
action = "<cmd>lua Snacks.picker.grep_buffers()<cr>";
|
|
||||||
desc = "Grep Open Buffers";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "<leader>sg";
|
|
||||||
mode = "n";
|
|
||||||
silent = true;
|
|
||||||
action = "<cmd>lua Snacks.picker.grep()<cr>";
|
|
||||||
desc = "Grep";
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
key = "<leader>sw";
|
key = "<leader>sw";
|
||||||
mode = "n";
|
mode = "n";
|
||||||
|
|||||||
@@ -1,26 +1,18 @@
|
|||||||
{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 = {
|
|
||||||
enabled = true;
|
|
||||||
doc = {
|
|
||||||
inline = false;
|
|
||||||
float = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
quickfile.enabled = true;
|
quickfile.enabled = true;
|
||||||
statuscolumn.enabled = true;
|
statuscolumn.enabled = true;
|
||||||
zen.enabled = true;
|
zen.enabled = true;
|
||||||
bufdelete.enabled = true;
|
bufdelete.enabled = true;
|
||||||
gitsigns.enabled = true;
|
gitsigns.enabled = true;
|
||||||
|
animate.enabled = true;
|
||||||
|
lazygit = {
|
||||||
|
enabled = true;
|
||||||
|
configure = false;
|
||||||
|
};
|
||||||
|
terminal.enabled = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
+36
-24
@@ -1,17 +1,11 @@
|
|||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
programs.nvf.settings.vim = {
|
vim = {
|
||||||
|
luaConfigRC.remove-todo-keymaps = ''
|
||||||
|
vim.keymap.del("n", "<leader>tdq")
|
||||||
|
vim.keymap.del("n", "<leader>tdt")
|
||||||
|
'';
|
||||||
undoFile.enable = true;
|
undoFile.enable = true;
|
||||||
utility = {
|
|
||||||
motion.flash-nvim.enable = true;
|
|
||||||
outline.aerial-nvim.enable = true;
|
|
||||||
};
|
|
||||||
tabline.nvimBufferline.enable = true;
|
|
||||||
notes.todo-comments.enable = true;
|
notes.todo-comments.enable = true;
|
||||||
assistant.copilot = {
|
|
||||||
enable = true;
|
|
||||||
cmp.enable = true;
|
|
||||||
};
|
|
||||||
statusline.lualine.enable = true;
|
|
||||||
|
|
||||||
autocomplete = {
|
autocomplete = {
|
||||||
nvim-cmp = {
|
nvim-cmp = {
|
||||||
@@ -31,21 +25,39 @@
|
|||||||
noice.enable = true;
|
noice.enable = true;
|
||||||
colorizer.enable = true;
|
colorizer.enable = true;
|
||||||
};
|
};
|
||||||
git = {
|
|
||||||
enable = true;
|
|
||||||
gitsigns.enable = true;
|
|
||||||
};
|
|
||||||
terminal.toggleterm = {
|
|
||||||
enable = true;
|
|
||||||
lazygit = {
|
|
||||||
enable = true;
|
|
||||||
mappings.open = "<leader>gl";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
visuals = {
|
visuals = {
|
||||||
rainbow-delimiters.enable = true;
|
rainbow-delimiters.enable = true;
|
||||||
nvim-scrollbar = {
|
};
|
||||||
enable = false;
|
|
||||||
|
extraPlugins = {
|
||||||
|
sttr-nvim = {
|
||||||
|
package = pkgs.vimUtils.buildVimPlugin {
|
||||||
|
name = "sttr-nvim";
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "anotherhadi";
|
||||||
|
repo = "sttr.nvim";
|
||||||
|
rev = "b41f2f51372222e23efbe5df9d72391cd933d4d1";
|
||||||
|
hash = "sha256-JPv0NNNUUNPNJM5LHYjcmTvilbOKB3OxI2Q6wxVbTks=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
setup = ''
|
||||||
|
require("sttr").setup()
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
jwt-tui-nvim = {
|
||||||
|
package = pkgs.vimUtils.buildVimPlugin {
|
||||||
|
name = "jwt-tui-nvim";
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "anotherhadi";
|
||||||
|
repo = "jwt-tui.nvim";
|
||||||
|
rev = "c5100cb2cdfaf333014076a1a5c4c6a778bf3983";
|
||||||
|
hash = "sha256-qnQYZuQwyWkezhuyOorM67KBtatUboubofuT9A6McJI=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
setup = ''
|
||||||
|
require("jwt-tui").setup()
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
wayland.windowManager.hyprland.settings.exec-once = [
|
wayland.windowManager.hyprland.settings.exec-once = [
|
||||||
"protonvpn-app --start-minimized &"
|
"protonvpn-app --start-minimized"
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
{pkgs, ...}: {
|
{
|
||||||
home.packages = with pkgs; [
|
pkgs-stable,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
home.packages = with pkgs-stable; [
|
||||||
proton-vpn
|
proton-vpn
|
||||||
proton-pass
|
proton-pass
|
||||||
proton-authenticator
|
proton-authenticator
|
||||||
@@ -9,7 +13,7 @@
|
|||||||
xdg.desktopEntries = {
|
xdg.desktopEntries = {
|
||||||
"Proton Authenticator" = {
|
"Proton Authenticator" = {
|
||||||
name = "Proton Authenticator";
|
name = "Proton Authenticator";
|
||||||
exec = "env WEBKIT_DISABLE_COMPOSITING_MODE=1 ${pkgs.proton-authenticator}/bin/proton-authenticator";
|
exec = "env WEBKIT_DISABLE_COMPOSITING_MODE=1 ${pkgs-stable.proton-authenticator}/bin/proton-authenticator";
|
||||||
icon = "proton-authenticator";
|
icon = "proton-authenticator";
|
||||||
type = "Application";
|
type = "Application";
|
||||||
categories = ["Utility"];
|
categories = ["Utility"];
|
||||||
@@ -17,7 +21,7 @@
|
|||||||
};
|
};
|
||||||
"Proton Calendar" = {
|
"Proton Calendar" = {
|
||||||
name = "Proton Calendar";
|
name = "Proton Calendar";
|
||||||
exec = "${pkgs.qutebrowser}/bin/qutebrowser \"https://calendar.proton.me\"";
|
exec = ''${config.programs.helium.package}/bin/helium "https://calendar.proton.me"'';
|
||||||
icon = "proton-calendar";
|
icon = "proton-calendar";
|
||||||
type = "Application";
|
type = "Application";
|
||||||
categories = ["Utility"];
|
categories = ["Utility"];
|
||||||
@@ -25,7 +29,7 @@
|
|||||||
};
|
};
|
||||||
"Proton Mail" = {
|
"Proton Mail" = {
|
||||||
name = "Proton Mail";
|
name = "Proton Mail";
|
||||||
exec = "${pkgs.qutebrowser}/bin/qutebrowser \"https://mail.proton.me/\"";
|
exec = ''${config.programs.helium.package}/bin/helium "https://mail.proton.me/"'';
|
||||||
icon = "proton-mail";
|
icon = "proton-mail";
|
||||||
type = "Application";
|
type = "Application";
|
||||||
categories = ["Utility"];
|
categories = ["Utility"];
|
||||||
|
|||||||
@@ -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
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
{...}: {
|
|
||||||
imports = [
|
|
||||||
./bookmarks.nix
|
|
||||||
./search.nix
|
|
||||||
./keybindings.nix
|
|
||||||
./settings.nix
|
|
||||||
./userscripts.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
home.sessionVariables = {
|
|
||||||
DEFAULT_BROWSER = "qutebrowser";
|
|
||||||
BROWSER = "qutebrowser";
|
|
||||||
};
|
|
||||||
|
|
||||||
xdg.mimeApps.defaultApplications = {
|
|
||||||
"text/html" = ["org.qutebrowser.qutebrowser.desktop"];
|
|
||||||
"text/xml" = ["org.qutebrowser.qutebrowser.desktop"];
|
|
||||||
"x-scheme-handler/http" = ["org.qutebrowser.qutebrowser.desktop"];
|
|
||||||
"x-scheme-handler/https" = ["org.qutebrowser.qutebrowser.desktop"];
|
|
||||||
"x-scheme-handler/unknown" = ["org.qutebrowser.qutebrowser.desktop"];
|
|
||||||
"x-scheme-handler/about" = ["org.qutebrowser.qutebrowser.desktop"];
|
|
||||||
"x-scheme-handler/qute" = ["org.qutebrowser.qutebrowser.desktop"];
|
|
||||||
};
|
|
||||||
|
|
||||||
xdg.desktopEntries.qutebrowser-private = {
|
|
||||||
name = "Qutebrowser (Temp session)";
|
|
||||||
genericName = "Web Browser";
|
|
||||||
exec = "qutebrowser --temp-basedir %U";
|
|
||||||
icon = "qutebrowser";
|
|
||||||
categories = ["Network" "WebBrowser"];
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.qutebrowser = {
|
|
||||||
enable = true;
|
|
||||||
loadAutoconfig = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
})();
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
{config, ...}: {
|
|
||||||
programs.qutebrowser.keyBindings = {
|
|
||||||
normal."<Ctrl-w>" = "tab-close";
|
|
||||||
normal."<Ctrl-Tab>" = "tab-next";
|
|
||||||
normal."<Ctrl-Shift-Tab>" = "tab-prev";
|
|
||||||
normal."<Ctrl-b>" = "open file://${config.xdg.dataHome}/qutebrowser/bookmarks.html";
|
|
||||||
|
|
||||||
# Ctrl+c is used to leave the current mode and return to normal mode.
|
|
||||||
insert."<Ctrl-c>" = "mode-leave";
|
|
||||||
hint."<Ctrl-c>" = "mode-leave";
|
|
||||||
caret."<Ctrl-c>" = "mode-leave";
|
|
||||||
command."<Ctrl-c>" = "mode-leave";
|
|
||||||
prompt."<Ctrl-c>" = "mode-leave";
|
|
||||||
yesno."<Ctrl-c>" = "mode-leave";
|
|
||||||
register."<Ctrl-c>" = "mode-leave";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
{
|
|
||||||
programs.qutebrowser.searchEngines = rec {
|
|
||||||
startpage = "https://www.startpage.com/sp/search?q={}";
|
|
||||||
|
|
||||||
mynixos = "https://mynixos.com/search?q={}";
|
|
||||||
duckduckgo = "https://duckduckgo.com/?q={}";
|
|
||||||
google = "https://google.com/search?hl=en&q={}";
|
|
||||||
yandex = "https://yandex.com/search/?text={}";
|
|
||||||
bing = "https://bing.com/search?q={}";
|
|
||||||
youtube = "https://youtube.com/results?search_query={}";
|
|
||||||
google-images = "https://google.com/search?hl=en&tbm=isch&q={}";
|
|
||||||
|
|
||||||
# AI
|
|
||||||
chatgpt = "https://chatgpt.com/?q={}";
|
|
||||||
claude = "https://claude.ai/new?q={}";
|
|
||||||
gemini = "https://gemini.google.com/app?q={}";
|
|
||||||
|
|
||||||
# Maps
|
|
||||||
amap = "https://maps.apple.com/?q={}";
|
|
||||||
gmap = "https://www.google.com/maps/search/{}";
|
|
||||||
|
|
||||||
# shortcuts
|
|
||||||
g = google;
|
|
||||||
n = mynixos;
|
|
||||||
gpt = chatgpt;
|
|
||||||
gem = gemini;
|
|
||||||
cla = claude;
|
|
||||||
DEFAULT = startpage;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
{config, ...}: {
|
|
||||||
programs.qutebrowser = {
|
|
||||||
settings = {
|
|
||||||
url = rec {
|
|
||||||
default_page = "file://${config.xdg.dataHome}/qutebrowser/bookmarks.html";
|
|
||||||
start_pages = [default_page];
|
|
||||||
};
|
|
||||||
new_instance_open_target = "window";
|
|
||||||
"tabs.last_close" = "close";
|
|
||||||
"statusbar.widgets" = ["keypress" "url" "progress"];
|
|
||||||
|
|
||||||
# Adblock
|
|
||||||
"content.blocking.enabled" = true;
|
|
||||||
"content.blocking.method" = "adblock";
|
|
||||||
"content.blocking.adblock.lists" = [
|
|
||||||
"https://easylist.to/easylist/easylist.txt"
|
|
||||||
"https://easylist.to/easylist/easyprivacy.txt"
|
|
||||||
"https://secure.fanboy.co.nz/fanboy-cookiemonster.txt"
|
|
||||||
];
|
|
||||||
|
|
||||||
# Clipboard access (needed for Excalidraw, Cyberchef, etc.)
|
|
||||||
"content.javascript.clipboard" = "access";
|
|
||||||
|
|
||||||
# Downloads
|
|
||||||
"downloads.location.directory" = "~/Downloads";
|
|
||||||
"downloads.location.prompt" = false;
|
|
||||||
|
|
||||||
# Editor (Ctrl+e in text fields)
|
|
||||||
"editor.command" = ["ghostty" "-e" "nvim" "{}"];
|
|
||||||
|
|
||||||
# Tabs
|
|
||||||
# "tabs.show" = "switching";
|
|
||||||
# "tabs.show_switching_delay" = 3000;
|
|
||||||
|
|
||||||
# Scrollbar
|
|
||||||
"scrolling.bar" = "never";
|
|
||||||
|
|
||||||
# Statusbar
|
|
||||||
"statusbar.show" = "in-mode";
|
|
||||||
|
|
||||||
# Privacy
|
|
||||||
"content.geolocation" = false;
|
|
||||||
"content.cookies.accept" = "no-3rdparty";
|
|
||||||
};
|
|
||||||
|
|
||||||
extraConfig = ''
|
|
||||||
c.statusbar.padding = {'top': 6, 'bottom': 6, 'left': 8, 'right': 8}
|
|
||||||
c.tabs.padding = {'top': 6, 'bottom': 6, 'left': 8, 'right': 8}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
{
|
|
||||||
xdg.dataFile = {
|
|
||||||
# Startpage - hide sponsored results
|
|
||||||
"qutebrowser/greasemonkey/startpage-no-ads.user.js".source =
|
|
||||||
./greasemonkey/startpage-no-ads.user.js;
|
|
||||||
|
|
||||||
# Return YouTube Dislike
|
|
||||||
"qutebrowser/greasemonkey/return-youtube-dislike.user.js".source =
|
|
||||||
./greasemonkey/return-youtube-dislike.user.js;
|
|
||||||
|
|
||||||
# SponsorBlock Lite - auto-skip sponsors on YouTube
|
|
||||||
"qutebrowser/greasemonkey/sponsorblock-lite.user.js".source =
|
|
||||||
./greasemonkey/sponsorblock-lite.user.js;
|
|
||||||
|
|
||||||
# Don't Track Me Google - remove Google tracking redirects
|
|
||||||
"qutebrowser/greasemonkey/dont-track-me-google.user.js".source =
|
|
||||||
./greasemonkey/dont-track-me-google.user.js;
|
|
||||||
|
|
||||||
# I don't care about cookies - auto-dismiss cookie banners
|
|
||||||
"qutebrowser/greasemonkey/i-dont-care-about-cookies.user.js".source =
|
|
||||||
./greasemonkey/i-dont-care-about-cookies.user.js;
|
|
||||||
|
|
||||||
# TrackingTokenStripper - remove tracking params from URLs (utm_*, fbclid, etc.)
|
|
||||||
"qutebrowser/greasemonkey/tracking-token-stripper.user.js".source =
|
|
||||||
./greasemonkey/tracking-token-stripper.user.js;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,4 +1,11 @@
|
|||||||
# 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
|
||||||
|
./direnv.nix
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{pkgs-stable, ...}: {
|
||||||
|
programs.direnv = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs-stable.direnv;
|
||||||
|
nix-direnv = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs-stable.nix-direnv;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
# Eza is a ls replacement
|
# Eza is a ls replacement
|
||||||
{
|
{pkgs-stable, ...}: {
|
||||||
programs.eza = {
|
programs.eza = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = pkgs-stable.eza;
|
||||||
icons = "auto";
|
icons = "auto";
|
||||||
|
|
||||||
extraOptions = [
|
extraOptions = [
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
# Fzf is a general-purpose command-line fuzzy finder.
|
# Fzf is a general-purpose command-line fuzzy finder.
|
||||||
{
|
{
|
||||||
|
pkgs-stable,
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
@@ -10,6 +11,7 @@
|
|||||||
in {
|
in {
|
||||||
programs.fzf = {
|
programs.fzf = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = pkgs-stable.fzf;
|
||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
colors = lib.mkForce {
|
colors = lib.mkForce {
|
||||||
"fg+" = accent;
|
"fg+" = accent;
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
# starship is a minimal, fast, and extremely customizable prompt for any shell!
|
# starship is a minimal, fast, and extremely customizable prompt for any shell!
|
||||||
{
|
{
|
||||||
|
pkgs-stable,
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
@@ -9,6 +10,7 @@
|
|||||||
in {
|
in {
|
||||||
programs.starship = {
|
programs.starship = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = pkgs-stable.starship;
|
||||||
settings = {
|
settings = {
|
||||||
add_newline = true;
|
add_newline = true;
|
||||||
format = lib.concatStrings [
|
format = lib.concatStrings [
|
||||||
@@ -20,7 +22,9 @@ in {
|
|||||||
"$git_status"
|
"$git_status"
|
||||||
"$character"
|
"$character"
|
||||||
];
|
];
|
||||||
directory = {style = accent;};
|
directory = {
|
||||||
|
style = accent;
|
||||||
|
};
|
||||||
|
|
||||||
character = {
|
character = {
|
||||||
success_symbol = "[❯](${accent})";
|
success_symbol = "[❯](${accent})";
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
# Zoxide is a cd replacement
|
# Zoxide is a cd replacement
|
||||||
{
|
{pkgs-stable, ...}: {
|
||||||
programs.zoxide = {
|
programs.zoxide = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = pkgs-stable.zoxide;
|
||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
+61
-69
@@ -1,19 +1,20 @@
|
|||||||
# My shell configuration
|
# My shell configuration
|
||||||
{
|
{
|
||||||
pkgs,
|
pkgs-stable,
|
||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: let
|
}: {
|
||||||
fetch = config.theme.fetch; # neofetch, nerdfetch, pfetch
|
home.packages = with pkgs-stable; [
|
||||||
in {
|
bat
|
||||||
home.packages = with pkgs; [bat ripgrep tldr witr];
|
ripgrep
|
||||||
|
];
|
||||||
|
|
||||||
# Add go binaries to the PATH
|
home = {
|
||||||
home.sessionPath = ["$HOME/go/bin"];
|
sessionPath = ["$HOME/go/bin"];
|
||||||
|
sessionVariables = {
|
||||||
home.sessionVariables = {
|
COLORTERM = "truecolor";
|
||||||
COLORTERM = "truecolor";
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
@@ -22,7 +23,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,34 +41,27 @@ 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 = {
|
||||||
|
# Change default
|
||||||
vim = "nvim";
|
vim = "nvim";
|
||||||
vi = "nvim";
|
vi = "nvim";
|
||||||
v = "nvim";
|
|
||||||
c = "clear";
|
|
||||||
clera = "clear";
|
|
||||||
celar = "clear";
|
|
||||||
e = "exit";
|
|
||||||
cd = "z";
|
cd = "z";
|
||||||
ls = "eza --icons=always --no-quotes";
|
ls = "eza --icons=always --no-quotes";
|
||||||
tree = "eza --icons=always --tree --no-quotes";
|
tree = "eza --icons=always --tree --no-quotes";
|
||||||
sl = "ls";
|
|
||||||
open = "${pkgs.xdg-utils}/bin/xdg-open";
|
|
||||||
cat = "bat --theme=base16 --color=always --paging=never --tabs=2 --wrap=never --plain";
|
cat = "bat --theme=base16 --color=always --paging=never --tabs=2 --wrap=never --plain";
|
||||||
mkdir = "mkdir -p";
|
mkdir = "mkdir -p";
|
||||||
|
|
||||||
obsidian-no-gpu = "env ELECTRON_OZONE_PLATFORM_HINT=auto obsidian --ozone-platform=x11";
|
# Shortcuts
|
||||||
wireguard-import = "nmcli connection import type wireguard file";
|
spt = "spotatui";
|
||||||
|
v = "nvim";
|
||||||
|
c = "clear";
|
||||||
|
e = "exit";
|
||||||
|
open = "${pkgs-stable.xdg-utils}/bin/xdg-open";
|
||||||
|
|
||||||
notes = "nvim ~/notes/index.md --cmd 'cd ~/notes' -c ':lua Snacks.picker.smart()'";
|
notes = "nvim ~/notes/index.md --cmd 'cd ~/notes' -c ':lua Snacks.picker.smart()'";
|
||||||
note = "notes";
|
|
||||||
tmp = "nvim /tmp/$(date | sed 's/ //g;s/\\.//g').md";
|
|
||||||
|
|
||||||
nix-shell = "nix-shell --command zsh";
|
nix-shell = "nix-shell --command zsh";
|
||||||
|
|
||||||
# git
|
# git
|
||||||
@@ -77,59 +78,43 @@ in {
|
|||||||
gbr = "git branch";
|
gbr = "git branch";
|
||||||
grs = "git reset HEAD~1";
|
grs = "git reset HEAD~1";
|
||||||
grh = "git reset --hard HEAD~1";
|
grh = "git reset --hard HEAD~1";
|
||||||
|
|
||||||
gaa = "git add .";
|
gaa = "git add .";
|
||||||
gcm = "git commit -m";
|
gcm = "git commit -m";
|
||||||
|
|
||||||
|
# Typo
|
||||||
|
clera = "clear";
|
||||||
|
celar = "clear";
|
||||||
|
claer = "clear";
|
||||||
|
sl = "ls";
|
||||||
};
|
};
|
||||||
|
|
||||||
initContent =
|
initContent =
|
||||||
# bash
|
# bash
|
||||||
''
|
''
|
||||||
bindkey -e
|
bindkey -e
|
||||||
${
|
|
||||||
if fetch == "neofetch"
|
|
||||||
then pkgs.neofetch + "/bin/neofetch"
|
|
||||||
else if fetch == "nerdfetch"
|
|
||||||
then "nerdfetch"
|
|
||||||
else if fetch == "pfetch"
|
|
||||||
then "echo; ${pkgs.pfetch}/bin/pfetch"
|
|
||||||
else ""
|
|
||||||
}
|
|
||||||
|
|
||||||
function sesh-sessions() {
|
# Open command in VIM
|
||||||
session=$(sesh list -t -c | fzf --height 70% --reverse)
|
autoload -Uz edit-command-line
|
||||||
[[ -z "$session" ]] && return
|
zle -N edit-command-line
|
||||||
sesh connect $session
|
bindkey '^X' edit-command-line
|
||||||
}
|
|
||||||
|
|
||||||
function chatgptfolder(){
|
# Suffix Aliases
|
||||||
echo "################################"
|
alias -s {nix,md,txt,yml,yaml,go}=nvim
|
||||||
echo "### TREE ###"
|
alias -s {json,jsonl}=jless
|
||||||
echo "################################"
|
alias -s {csv,tsv,parquet,pqt,arrow,db,sqlite,xls,xlsx,xlsm,xlsb,fwf}=tw
|
||||||
${pkgs.eza}/bin/eza --tree -aF --icons never
|
alias -s {png,jpg,jpeg,gif,pdf}=xdg-open
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
|
# 3. Global Aliases (Remplacés n'importe où dans la commande, pas seulement au début)
|
||||||
function n4c() {
|
alias -g G="| grep"
|
||||||
category=''${1:-all}
|
alias -g L="| less"
|
||||||
shift
|
alias -g V="| nvim"
|
||||||
args=''${*}
|
alias -g H="| head"
|
||||||
nix develop "github:nix4cyber/n4c#''${category}" ''${args} -c zsh
|
alias -g T="| tail"
|
||||||
}
|
alias -g JQ="| jq"
|
||||||
|
alias -g C="| wl-copy"
|
||||||
zle -N sesh-sessions
|
alias -g NE="2>/dev/null"
|
||||||
bindkey -M emacs '\es' sesh-sessions
|
alias -g ND=">/dev/null"
|
||||||
bindkey -M vicmd '\es' sesh-sessions
|
alias -g NUL=">/dev/null 2>1"
|
||||||
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
|
||||||
@@ -170,7 +155,7 @@ in {
|
|||||||
# Colors
|
# Colors
|
||||||
zstyle ':completion:*' list-colors ''${(s.:.)LS_COLORS}
|
zstyle ':completion:*' list-colors ''${(s.:.)LS_COLORS}
|
||||||
|
|
||||||
# case insensitive tab completion
|
# Case insensitive tab completion
|
||||||
zstyle ':completion:*:*:cd:*' tag-order local-directories directory-stack path-directories
|
zstyle ':completion:*:*:cd:*' tag-order local-directories directory-stack path-directories
|
||||||
zstyle ':completion:*:*:cd:*:directory-stack' menu yes select
|
zstyle ':completion:*:*:cd:*:directory-stack' menu yes select
|
||||||
zstyle ':completion:*:-tilde-:*' group-order 'named-directories' 'path-directories' 'users' 'expand'
|
zstyle ':completion:*:-tilde-:*' group-order 'named-directories' 'path-directories' 'users' 'expand'
|
||||||
@@ -186,6 +171,13 @@ in {
|
|||||||
zstyle ':completion:complete:*:options' sort false
|
zstyle ':completion:complete:*:options' sort false
|
||||||
zstyle ':completion:files' sort false
|
zstyle ':completion:files' sort false
|
||||||
|
|
||||||
|
autoload zmv
|
||||||
|
|
||||||
|
hash -d dl=~/Downloads
|
||||||
|
hash -d ni=~/.config/nixos
|
||||||
|
hash -d de=~/dev
|
||||||
|
hash -d cy=~/Cyber
|
||||||
|
|
||||||
${lib.optionalString config.services.gpg-agent.enable ''
|
${lib.optionalString config.services.gpg-agent.enable ''
|
||||||
gnupg_path=$(ls $XDG_RUNTIME_DIR/gnupg)
|
gnupg_path=$(ls $XDG_RUNTIME_DIR/gnupg)
|
||||||
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gnupg/$gnupg_path/S.gpg-agent.ssh"
|
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gnupg/$gnupg_path/S.gpg-agent.ssh"
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
# Spicetify is a spotify client customizer
|
|
||||||
{
|
|
||||||
pkgs,
|
|
||||||
pkgs-stable,
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
|
||||||
accent = "${config.lib.stylix.colors.base0D}";
|
|
||||||
background = "${config.lib.stylix.colors.base00}";
|
|
||||||
in {
|
|
||||||
imports = [inputs.spicetify-nix.homeManagerModules.default];
|
|
||||||
|
|
||||||
stylix.targets.spicetify.enable = false;
|
|
||||||
|
|
||||||
programs.spicetify = {
|
|
||||||
enable = true;
|
|
||||||
spotifyPackage = pkgs-stable.spotify;
|
|
||||||
theme = lib.mkForce spicePkgs.themes.dribbblish;
|
|
||||||
|
|
||||||
colorScheme = "custom";
|
|
||||||
|
|
||||||
customColorScheme = {
|
|
||||||
button = accent;
|
|
||||||
button-active = accent;
|
|
||||||
tab-active = accent;
|
|
||||||
player = background;
|
|
||||||
main = background;
|
|
||||||
sidebar = background;
|
|
||||||
};
|
|
||||||
|
|
||||||
enabledExtensions = with spicePkgs.extensions; [
|
|
||||||
playlistIcons
|
|
||||||
historyShortcut
|
|
||||||
hidePodcasts
|
|
||||||
adblock
|
|
||||||
fullAppDisplay
|
|
||||||
keyboardShortcut
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
# Spotatui is a terminal user interface for Spotify, written in Rust. It allows you to control your Spotify playback and manage your playlists directly from the terminal.
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs-stable,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
c = config.lib.stylix.colors;
|
||||||
|
rgb = base: "${c."${base}-rgb-r"}, ${c."${base}-rgb-g"}, ${c."${base}-rgb-b"}";
|
||||||
|
in {
|
||||||
|
home.packages = with pkgs-stable; [
|
||||||
|
spotatui
|
||||||
|
];
|
||||||
|
|
||||||
|
home.file.".config/spotatui/config.yml".text = ''
|
||||||
|
keybindings:
|
||||||
|
back: q
|
||||||
|
next_page: ctrl-d
|
||||||
|
previous_page: ctrl-u
|
||||||
|
jump_to_start: ctrl-a
|
||||||
|
jump_to_end: ctrl-e
|
||||||
|
jump_to_album: a
|
||||||
|
jump_to_artist_album: A
|
||||||
|
jump_to_context: o
|
||||||
|
manage_devices: d
|
||||||
|
decrease_volume: '-'
|
||||||
|
increase_volume: +
|
||||||
|
toggle_playback: space
|
||||||
|
seek_backwards: <
|
||||||
|
seek_forwards: '>'
|
||||||
|
next_track: n
|
||||||
|
previous_track: p
|
||||||
|
force_previous_track: P
|
||||||
|
help: '?'
|
||||||
|
shuffle: ctrl-s
|
||||||
|
repeat: ctrl-r
|
||||||
|
search: /
|
||||||
|
submit: enter
|
||||||
|
copy_song_url: c
|
||||||
|
copy_album_url: C
|
||||||
|
audio_analysis: v
|
||||||
|
lyrics_view: B
|
||||||
|
cover_art_view: G
|
||||||
|
add_item_to_queue: z
|
||||||
|
show_queue: Q
|
||||||
|
open_settings: alt-,
|
||||||
|
save_settings: alt-s
|
||||||
|
listening_party: ctrl-p
|
||||||
|
like_track: F
|
||||||
|
behavior:
|
||||||
|
seek_milliseconds: 5000
|
||||||
|
volume_increment: 10
|
||||||
|
volume_percent: 100
|
||||||
|
tick_rate_milliseconds: 16
|
||||||
|
enable_text_emphasis: true
|
||||||
|
show_loading_indicator: true
|
||||||
|
enforce_wide_search_bar: true
|
||||||
|
enable_global_song_count: false
|
||||||
|
disable_mouse_inputs: false
|
||||||
|
enable_discord_rpc: false
|
||||||
|
discord_rpc_client_id: null
|
||||||
|
enable_announcements: false
|
||||||
|
announcement_feed_url: null
|
||||||
|
seen_announcement_ids:
|
||||||
|
- 2026-05-19-sonos-help-wanted
|
||||||
|
- 2026-02-27-major-refactor-complete
|
||||||
|
shuffle_enabled: false
|
||||||
|
liked_icon: ♥
|
||||||
|
shuffle_icon: 🔀
|
||||||
|
repeat_track_icon: 🔂
|
||||||
|
repeat_context_icon: 🔁
|
||||||
|
playing_icon: ▶
|
||||||
|
paused_icon: ⏸
|
||||||
|
set_window_title: true
|
||||||
|
visualizer_style: Equalizer
|
||||||
|
dismissed_announcements: []
|
||||||
|
relay_server_url: wss://spotatui-party.spotatui.workers.dev/ws
|
||||||
|
stop_after_current_track: false
|
||||||
|
sidebar_width_percent: 20
|
||||||
|
playbar_height_rows: 6
|
||||||
|
library_height_percent: 30
|
||||||
|
startup_behavior: continue
|
||||||
|
disable_auto_update: true
|
||||||
|
auto_update_delay: '0'
|
||||||
|
keepawake_enabled: true
|
||||||
|
theme:
|
||||||
|
preset: Custom
|
||||||
|
active: ${rgb "base0D"}
|
||||||
|
banner: ${rgb "base0C"}
|
||||||
|
error_border: ${rgb "base08"}
|
||||||
|
error_text: ${rgb "base08"}
|
||||||
|
hint: ${rgb "base0A"}
|
||||||
|
hovered: ${rgb "base0E"}
|
||||||
|
inactive: ${rgb "base03"}
|
||||||
|
playbar_background: Reset
|
||||||
|
playbar_progress: ${rgb "base0D"}
|
||||||
|
playbar_progress_text: ${rgb "base05"}
|
||||||
|
playbar_text: Reset
|
||||||
|
selected: ${rgb "base0D"}
|
||||||
|
text: Reset
|
||||||
|
background: Reset
|
||||||
|
header: Reset
|
||||||
|
highlighted_lyrics: ${rgb "base0B"}
|
||||||
|
'';
|
||||||
|
}
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
# Thunar is a file explorer
|
# Thunar is a file explorer
|
||||||
{
|
{
|
||||||
pkgs,
|
|
||||||
pkgs-stable,
|
pkgs-stable,
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
@@ -11,17 +10,16 @@ in {
|
|||||||
# ctrl + m to toggle the menubar
|
# ctrl + m to toggle the menubar
|
||||||
home.packages =
|
home.packages =
|
||||||
(with pkgs-stable; [
|
(with pkgs-stable; [
|
||||||
xfce.thunar
|
thunar
|
||||||
xfce.xfconf
|
xfconf
|
||||||
xfce.tumbler
|
tumbler
|
||||||
xfce.thunar-archive-plugin
|
thunar-archive-plugin
|
||||||
xfce.thunar-volman
|
thunar-volman
|
||||||
xfce.thunar-media-tags-plugin
|
thunar-media-tags-plugin
|
||||||
p7zip
|
p7zip
|
||||||
xarchiver
|
xarchiver
|
||||||
])
|
])
|
||||||
++ (with pkgs; [
|
++ (with pkgs-stable; [
|
||||||
# Icon themes: keep on global pkgs to avoid conflicts with other modules
|
|
||||||
papirus-icon-theme
|
papirus-icon-theme
|
||||||
material-icons
|
material-icons
|
||||||
material-design-icons
|
material-design-icons
|
||||||
@@ -32,11 +30,9 @@ in {
|
|||||||
enable = true;
|
enable = true;
|
||||||
iconTheme = {
|
iconTheme = {
|
||||||
name = "Papirus-Dark";
|
name = "Papirus-Dark";
|
||||||
package = pkgs.papirus-icon-theme;
|
package = pkgs-stable.papirus-icon-theme;
|
||||||
};
|
};
|
||||||
|
|
||||||
gtk4.theme = null;
|
|
||||||
|
|
||||||
# bookmarks for the side pane
|
# bookmarks for the side pane
|
||||||
gtk3.bookmarks = [
|
gtk3.bookmarks = [
|
||||||
"file:///home/${user}/Downloads Downloads"
|
"file:///home/${user}/Downloads Downloads"
|
||||||
@@ -49,7 +45,7 @@ in {
|
|||||||
qt.enable = true;
|
qt.enable = true;
|
||||||
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
XDG_ICON_DIR = "${pkgs.papirus-icon-theme}/share/icons/Papirus";
|
XDG_ICON_DIR = "${pkgs-stable.papirus-icon-theme}/share/icons/Papirus";
|
||||||
QS_ICON_THEME = "Papirus";
|
QS_ICON_THEME = "Papirus";
|
||||||
QT_STYLE_OVERRIDE = lib.mkForce "Fusion";
|
QT_STYLE_OVERRIDE = lib.mkForce "Fusion";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,129 @@
|
|||||||
|
{pkgs, pkgs-stable, ...}: {
|
||||||
|
programs.yazi = {
|
||||||
|
enable = true;
|
||||||
|
shellWrapperName = "y";
|
||||||
|
|
||||||
|
plugins = {
|
||||||
|
git = {
|
||||||
|
package = pkgs.yaziPlugins.git;
|
||||||
|
setup = true;
|
||||||
|
};
|
||||||
|
ouch = pkgs.yaziPlugins.ouch;
|
||||||
|
piper = pkgs.yaziPlugins.piper;
|
||||||
|
convert = pkgs.yaziPlugins.convert;
|
||||||
|
"jump-to-char" = pkgs.yaziPlugins."jump-to-char";
|
||||||
|
"wl-clipboard" = pkgs.yaziPlugins."wl-clipboard";
|
||||||
|
"batch-rename-gui" = pkgs.yaziPlugins.mkYaziPlugin {
|
||||||
|
pname = "batch-rename-gui.yazi";
|
||||||
|
version = "0-unstable-2025-07-08";
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "pakhromov";
|
||||||
|
repo = "batch-rename-gui.yazi";
|
||||||
|
rev = "5c2d5aa349948b6ab405a171541faab44751f6a5";
|
||||||
|
hash = "sha256-3RviPY3WOyYi5GWXWRYMWp6VLxCe5cuJX7Kb7AyWxLE=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
settings.mgr.ratio = [0 4 3];
|
||||||
|
|
||||||
|
settings.plugin = {
|
||||||
|
prepend_fetchers = [
|
||||||
|
{
|
||||||
|
url = "*";
|
||||||
|
run = "git";
|
||||||
|
group = "git";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
url = "*/";
|
||||||
|
run = "git";
|
||||||
|
group = "git";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
prepend_previewers = [
|
||||||
|
{
|
||||||
|
url = "*.md";
|
||||||
|
run = ''piper -- CLICOLOR_FORCE=1 glow -w=$w -s=dark "$1"'';
|
||||||
|
}
|
||||||
|
];
|
||||||
|
prepend_openers = [
|
||||||
|
{
|
||||||
|
url = "*.{zip,tar,gz,bz2,xz,7z,rar}";
|
||||||
|
run = "ouch";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
keymap.mgr.prepend_keymap = [
|
||||||
|
{
|
||||||
|
on = ["C"];
|
||||||
|
run = "plugin ouch";
|
||||||
|
desc = "Compress";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
on = ["X"];
|
||||||
|
run = "plugin ouch --args=extract";
|
||||||
|
desc = "Extract";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
on = ["c" "p"];
|
||||||
|
run = "plugin convert -- --extension='png'";
|
||||||
|
desc = "Convert to PNG";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
on = ["c" "j"];
|
||||||
|
run = "plugin convert -- --extension='jpg'";
|
||||||
|
desc = "Convert to JPG";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
on = ["c" "w"];
|
||||||
|
run = "plugin convert -- --extension='webp'";
|
||||||
|
desc = "Convert to WebP";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
on = ["M"];
|
||||||
|
run = ''shell 'exiftool "$@" | less' --block'';
|
||||||
|
desc = "Show metadata";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
on = ["T"];
|
||||||
|
run = "plugin toggle-parent";
|
||||||
|
desc = "Toggle parent pane";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
on = ["F"];
|
||||||
|
run = "plugin jump-to-char";
|
||||||
|
desc = "Jump to char";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
on = ["Y"];
|
||||||
|
run = "plugin wl-clipboard";
|
||||||
|
desc = "Copy to clipboard (Wayland)";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
on = ["B"];
|
||||||
|
run = "plugin batch-rename-gui";
|
||||||
|
desc = "Batch rename";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
home.packages = with pkgs-stable; [glow ouch hexyl exiftool wl-clipboard];
|
||||||
|
|
||||||
|
xdg.configFile."yazi/plugins/toggle-parent.yazi/main.lua".text = ''
|
||||||
|
--- @sync entry
|
||||||
|
local RESTORE_WIDTH = 1
|
||||||
|
return {
|
||||||
|
entry = function(st, job)
|
||||||
|
local r = rt.mgr.ratio
|
||||||
|
if r.parent == 0 then
|
||||||
|
rt.mgr.ratio = { st.width or RESTORE_WIDTH, r.current, r.preview }
|
||||||
|
else
|
||||||
|
st.width = r.parent
|
||||||
|
rt.mgr.ratio = { 0, r.current, r.preview }
|
||||||
|
end
|
||||||
|
ya.emit("app:resize", {})
|
||||||
|
end
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
}
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
rounding = config.theme.rounding + config.theme.gaps-out;
|
|
||||||
inherit (config.stylix) fonts;
|
|
||||||
in {
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
papirus-icon-theme
|
|
||||||
];
|
|
||||||
|
|
||||||
programs.caelestia.settings = {
|
|
||||||
paths.sessionGif = ./session-gif-hacker-cat.gif;
|
|
||||||
background.enabled = false;
|
|
||||||
appearance = {
|
|
||||||
transparency = {
|
|
||||||
enable = true;
|
|
||||||
base = 0.85;
|
|
||||||
layers = 0.4;
|
|
||||||
};
|
|
||||||
font.family = {
|
|
||||||
material = "Material Symbols Rounded";
|
|
||||||
mono = fonts.monospace.name;
|
|
||||||
sans = fonts.sansSerif.name;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
utilities = {
|
|
||||||
enabled = true;
|
|
||||||
maxToasts = 4;
|
|
||||||
toasts = {
|
|
||||||
audioInputChanged = false;
|
|
||||||
audioOutputChanged = false;
|
|
||||||
capsLockChanged = false;
|
|
||||||
chargingChanged = true;
|
|
||||||
configLoaded = false;
|
|
||||||
dndChanged = true;
|
|
||||||
gameModeChanged = true;
|
|
||||||
numLockChanged = false;
|
|
||||||
nowPlaying = false;
|
|
||||||
kbLayoutChanged = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
dashboard.showOnHover = false;
|
|
||||||
border = {
|
|
||||||
inherit rounding;
|
|
||||||
thickness = 8;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
{
|
|
||||||
programs.caelestia.settings.bar = {
|
|
||||||
clock.showIcon = false;
|
|
||||||
popouts.activeWindow = false;
|
|
||||||
persistent = true;
|
|
||||||
status = {
|
|
||||||
showBattery = true;
|
|
||||||
showMicrophone = false;
|
|
||||||
showLockStatus = false;
|
|
||||||
showBluetooth = true;
|
|
||||||
showAudio = true;
|
|
||||||
showKbLayout = false;
|
|
||||||
showNetwork = true;
|
|
||||||
};
|
|
||||||
workspaces = {
|
|
||||||
activeIndicator = true;
|
|
||||||
activeLabel = " ";
|
|
||||||
activeTrail = false;
|
|
||||||
label = " ";
|
|
||||||
occupiedBg = true;
|
|
||||||
occupiedLabel = " ";
|
|
||||||
rounded = true;
|
|
||||||
showWindows = false;
|
|
||||||
shown = 5;
|
|
||||||
};
|
|
||||||
entries = [
|
|
||||||
{
|
|
||||||
id = "logo";
|
|
||||||
enabled = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
id = "workspaces";
|
|
||||||
enabled = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
id = "spacer";
|
|
||||||
enabled = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
id = "activeWindow";
|
|
||||||
enabled = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
id = "spacer";
|
|
||||||
enabled = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
id = "tray";
|
|
||||||
enabled = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
id = "clock";
|
|
||||||
enabled = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
id = "statusIcons";
|
|
||||||
enabled = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
id = "power";
|
|
||||||
enabled = true;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
tray = {
|
|
||||||
background = false;
|
|
||||||
recolour = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
# Caelestia Shell Home Manager Configuration
|
|
||||||
# See https://github.com/caelestia-dots/shell
|
|
||||||
{
|
|
||||||
pkgs,
|
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
imports = [
|
|
||||||
inputs.caelestia-shell.homeManagerModules.default
|
|
||||||
./bar.nix
|
|
||||||
./launcher.nix
|
|
||||||
./appearance.nix
|
|
||||||
./scheme.nix
|
|
||||||
./swappy.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
programs.caelestia = {
|
|
||||||
enable = true;
|
|
||||||
systemd.enable = false;
|
|
||||||
settings = {
|
|
||||||
services.weatherLocation = "Paris";
|
|
||||||
general = {
|
|
||||||
apps = {
|
|
||||||
terminal = ["ghostty"];
|
|
||||||
audio = ["pavucontrol"];
|
|
||||||
explorer = ["thunar"];
|
|
||||||
};
|
|
||||||
idle = {
|
|
||||||
timeouts = [];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
cli = {
|
|
||||||
enable = true;
|
|
||||||
settings.theme = {
|
|
||||||
enableTerm = false;
|
|
||||||
enableDiscord = false;
|
|
||||||
enableSpicetify = false;
|
|
||||||
enableBtop = false;
|
|
||||||
enableCava = false;
|
|
||||||
enableHypr = false;
|
|
||||||
enableGtk = false;
|
|
||||||
enableQt = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
gpu-screen-recorder
|
|
||||||
];
|
|
||||||
|
|
||||||
wayland.windowManager.hyprland.settings.exec-once = [
|
|
||||||
"uwsm app -- caelestia resizer -d"
|
|
||||||
"uwsm app -- caelestia shell -d"
|
|
||||||
"caelestia scheme set -n onedark"
|
|
||||||
"caelestia scheme set -n custom"
|
|
||||||
];
|
|
||||||
|
|
||||||
services.cliphist = {
|
|
||||||
enable = true;
|
|
||||||
allowImages = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,124 +0,0 @@
|
|||||||
{
|
|
||||||
programs.caelestia.settings = {
|
|
||||||
session.commands = {
|
|
||||||
shutdown = ["systemctl" "poweroff"];
|
|
||||||
logout = ["loginctl" "lock-session"];
|
|
||||||
hibernate = ["systemctl" "hibernate"];
|
|
||||||
reboot = ["systemctl" "reboot"];
|
|
||||||
};
|
|
||||||
launcher = {
|
|
||||||
actionPrefix = "/";
|
|
||||||
actions = [
|
|
||||||
{
|
|
||||||
name = "Calculator";
|
|
||||||
icon = "calculate";
|
|
||||||
description = "Do simple math equations (powered by Qalc)";
|
|
||||||
command = ["autocomplete" "calc"];
|
|
||||||
enabled = true;
|
|
||||||
dangerous = false;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Shutdown";
|
|
||||||
icon = "power_settings_new";
|
|
||||||
description = "Shutdown the system";
|
|
||||||
command = ["systemctl" "poweroff"];
|
|
||||||
enabled = true;
|
|
||||||
dangerous = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Reboot";
|
|
||||||
icon = "cached";
|
|
||||||
description = "Reboot the system";
|
|
||||||
command = ["systemctl" "reboot"];
|
|
||||||
enabled = true;
|
|
||||||
dangerous = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Logout";
|
|
||||||
icon = "exit_to_app";
|
|
||||||
description = "Log out of the current session";
|
|
||||||
command = ["loginctl" "terminate-user" ""];
|
|
||||||
enabled = true;
|
|
||||||
dangerous = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Lock";
|
|
||||||
icon = "lock";
|
|
||||||
description = "Lock the current session";
|
|
||||||
command = ["loginctl" "lock-session"];
|
|
||||||
enabled = true;
|
|
||||||
dangerous = false;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Sleep";
|
|
||||||
icon = "bedtime";
|
|
||||||
description = "Suspend then hibernate";
|
|
||||||
command = ["systemctl" "suspend-then-hibernate"];
|
|
||||||
enabled = true;
|
|
||||||
dangerous = false;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Restart caelestia";
|
|
||||||
icon = "cached";
|
|
||||||
description = "Restart caelestia";
|
|
||||||
command = ["hyprctl" "dispatch" "exec" "caelestia-shell kill | sleep 1 | caelestia-shell"];
|
|
||||||
enabled = true;
|
|
||||||
dangerous = false;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Emoji Picker";
|
|
||||||
icon = "mood";
|
|
||||||
description = "Toggle the emoji picker";
|
|
||||||
command = ["caelestia" "emoji" "-p"];
|
|
||||||
enabled = true;
|
|
||||||
dangerous = false;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Clipboard History";
|
|
||||||
icon = "content_paste";
|
|
||||||
description = "Toggle the clipboard history";
|
|
||||||
command = ["caelestia" "clipboard"];
|
|
||||||
enabled = true;
|
|
||||||
dangerous = false;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Delete from Clipboard History";
|
|
||||||
icon = "content_paste_off";
|
|
||||||
description = "Delete a line from the clipboard history";
|
|
||||||
command = ["caelestia" "clipboard"];
|
|
||||||
enabled = true;
|
|
||||||
dangerous = false;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Night Shift";
|
|
||||||
icon = "moon_stars";
|
|
||||||
description = "Toggle Night Shift, the blue light filter";
|
|
||||||
command = ["nightshift-toggle"];
|
|
||||||
enabled = true;
|
|
||||||
dangerous = false;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Hyprpicker";
|
|
||||||
icon = "colorize";
|
|
||||||
description = "Pick an hex color";
|
|
||||||
command = ["hyprpicker" "-a"];
|
|
||||||
enabled = true;
|
|
||||||
dangerous = false;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
dragThreshold = 50;
|
|
||||||
enableDangerousActions = false;
|
|
||||||
maxShown = 7;
|
|
||||||
specialPrefix = "@";
|
|
||||||
useFuzzy = {
|
|
||||||
apps = false;
|
|
||||||
actions = false;
|
|
||||||
schemes = false;
|
|
||||||
variants = false;
|
|
||||||
wallpapers = false;
|
|
||||||
};
|
|
||||||
showOnHover = false;
|
|
||||||
hiddenApps = [];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,135 +0,0 @@
|
|||||||
# This Nix module customizes the color scheme of the Caelestia CLI application using the Stylix base16 color palette.
|
|
||||||
{
|
|
||||||
pkgs,
|
|
||||||
inputs,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
colors = config.lib.stylix.colors;
|
|
||||||
|
|
||||||
customSchemeFile = pkgs.writeText "custom-dark.txt" ''
|
|
||||||
primary_paletteKeyColor ${colors.base0D}
|
|
||||||
secondary_paletteKeyColor ${colors.base04}
|
|
||||||
tertiary_paletteKeyColor ${colors.base08}
|
|
||||||
neutral_paletteKeyColor ${colors.base03}
|
|
||||||
neutral_variant_paletteKeyColor ${colors.base03}
|
|
||||||
background ${colors.base00}
|
|
||||||
onBackground ${colors.base05}
|
|
||||||
surface ${colors.base00}
|
|
||||||
surfaceDim ${colors.base00}
|
|
||||||
surfaceBright ${colors.base02}
|
|
||||||
surfaceContainerLowest ${colors.base01}
|
|
||||||
surfaceContainerLow ${colors.base01}
|
|
||||||
surfaceContainer ${colors.base01}
|
|
||||||
surfaceContainerHigh ${colors.base02}
|
|
||||||
surfaceContainerHighest ${colors.base02}
|
|
||||||
onSurface ${colors.base05}
|
|
||||||
surfaceVariant ${colors.base02}
|
|
||||||
onSurfaceVariant ${colors.base04}
|
|
||||||
inverseSurface ${colors.base05}
|
|
||||||
inverseOnSurface ${colors.base00}
|
|
||||||
outline ${colors.base03}
|
|
||||||
outlineVariant ${colors.base02}
|
|
||||||
shadow ${colors.base00}
|
|
||||||
scrim ${colors.base00}
|
|
||||||
surfaceTint ${colors.base0D}
|
|
||||||
primary ${colors.base0D}
|
|
||||||
onPrimary ${colors.base00}
|
|
||||||
primaryContainer ${colors.base0D}
|
|
||||||
onPrimaryContainer ${colors.base05}
|
|
||||||
inversePrimary ${colors.base0D}
|
|
||||||
secondary ${colors.base0C}
|
|
||||||
onSecondary ${colors.base00}
|
|
||||||
secondaryContainer ${colors.base02}
|
|
||||||
onSecondaryContainer ${colors.base0C}
|
|
||||||
tertiary ${colors.base08}
|
|
||||||
onTertiary ${colors.base00}
|
|
||||||
tertiaryContainer ${colors.base08}
|
|
||||||
onTertiaryContainer ${colors.base00}
|
|
||||||
error ${colors.base08}
|
|
||||||
onError ${colors.base00}
|
|
||||||
errorContainer ${colors.base08}
|
|
||||||
onErrorContainer ${colors.base05}
|
|
||||||
primaryFixed ${colors.base0D}
|
|
||||||
primaryFixedDim ${colors.base0D}
|
|
||||||
onPrimaryFixed ${colors.base00}
|
|
||||||
onPrimaryFixedVariant ${colors.base00}
|
|
||||||
secondaryFixed ${colors.base0C}
|
|
||||||
secondaryFixedDim ${colors.base0C}
|
|
||||||
onSecondaryFixed ${colors.base00}
|
|
||||||
onSecondaryFixedVariant ${colors.base02}
|
|
||||||
tertiaryFixed ${colors.base08}
|
|
||||||
tertiaryFixedDim ${colors.base08}
|
|
||||||
onTertiaryFixed ${colors.base00}
|
|
||||||
onTertiaryFixedVariant ${colors.base00}
|
|
||||||
term0 ${colors.base00}
|
|
||||||
term1 ${colors.base08}
|
|
||||||
term2 ${colors.base0B}
|
|
||||||
term3 ${colors.base0A}
|
|
||||||
term4 ${colors.base0D}
|
|
||||||
term5 ${colors.base0E}
|
|
||||||
term6 ${colors.base0C}
|
|
||||||
term7 ${colors.base05}
|
|
||||||
term8 ${colors.base03}
|
|
||||||
term9 ${colors.base08}
|
|
||||||
term10 ${colors.base0B}
|
|
||||||
term11 ${colors.base0A}
|
|
||||||
term12 ${colors.base0D}
|
|
||||||
term13 ${colors.base0E}
|
|
||||||
term14 ${colors.base0C}
|
|
||||||
term15 ${colors.base07}
|
|
||||||
rosewater ${colors.base06}
|
|
||||||
flamingo ${colors.base0F}
|
|
||||||
pink ${colors.base0E}
|
|
||||||
mauve ${colors.base0D}
|
|
||||||
red ${colors.base08}
|
|
||||||
maroon ${colors.base08}
|
|
||||||
peach ${colors.base09}
|
|
||||||
yellow ${colors.base0A}
|
|
||||||
green ${colors.base0B}
|
|
||||||
teal ${colors.base0C}
|
|
||||||
sky ${colors.base0C}
|
|
||||||
sapphire ${colors.base0C}
|
|
||||||
blue ${colors.base0D}
|
|
||||||
lavender ${colors.base0D}
|
|
||||||
klink ${colors.base0D}
|
|
||||||
klinkSelection ${colors.base0D}
|
|
||||||
kvisited ${colors.base0E}
|
|
||||||
kvisitedSelection ${colors.base0E}
|
|
||||||
knegative ${colors.base08}
|
|
||||||
knegativeSelection ${colors.base08}
|
|
||||||
kneutral ${colors.base0A}
|
|
||||||
kneutralSelection ${colors.base0A}
|
|
||||||
kpositive ${colors.base0B}
|
|
||||||
kpositiveSelection ${colors.base0B}
|
|
||||||
text ${colors.base05}
|
|
||||||
subtext1 ${colors.base04}
|
|
||||||
subtext0 ${colors.base03}
|
|
||||||
overlay2 ${colors.base03}
|
|
||||||
overlay1 ${colors.base03}
|
|
||||||
overlay0 ${colors.base02}
|
|
||||||
surface2 ${colors.base02}
|
|
||||||
surface1 ${colors.base01}
|
|
||||||
surface0 ${colors.base01}
|
|
||||||
base ${colors.base00}
|
|
||||||
mantle ${colors.base00}
|
|
||||||
crust ${colors.base00}
|
|
||||||
success ${colors.base0B}
|
|
||||||
onSuccess ${colors.base00}
|
|
||||||
successContainer ${colors.base0B}
|
|
||||||
onSuccessContainer ${colors.base05}
|
|
||||||
'';
|
|
||||||
|
|
||||||
colorsHash = builtins.hashString "sha256" (builtins.toJSON colors);
|
|
||||||
|
|
||||||
customCli = inputs.caelestia-cli.packages.${pkgs.stdenv.hostPlatform.system}.default.overrideAttrs (oldAttrs: {
|
|
||||||
name = "${oldAttrs.name or "caelestia-cli"}-themed-${colorsHash}";
|
|
||||||
postUnpack = ''
|
|
||||||
mkdir -p $sourceRoot/src/caelestia/data/schemes/custom/main
|
|
||||||
cp ${customSchemeFile} $sourceRoot/src/caelestia/data/schemes/custom/main/dark.txt
|
|
||||||
echo "Custom scheme added to source"
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
in {
|
|
||||||
programs.caelestia.cli.package = customCli;
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 51 KiB |
@@ -1,11 +0,0 @@
|
|||||||
{
|
|
||||||
xdg.configFile."swappy/config".text = ''
|
|
||||||
[Default]
|
|
||||||
save_dir=~/Pictures/Screenshots
|
|
||||||
save_filename_format=screenshot-%Y%m%d-%H%M%S.png
|
|
||||||
show_panel=false
|
|
||||||
line_size=5
|
|
||||||
text_size=20
|
|
||||||
text_font=sans-serif
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
|
pkgs-stable,
|
||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
@@ -7,9 +8,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 +19,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 +33,8 @@ in {
|
|||||||
bind =
|
bind =
|
||||||
[
|
[
|
||||||
# Applications
|
# Applications
|
||||||
("$shiftMod, A, exec, "
|
(
|
||||||
|
"$shiftMod, A, exec, "
|
||||||
+ lib.getExe (mkMenu [
|
+ lib.getExe (mkMenu [
|
||||||
{
|
{
|
||||||
key = "a";
|
key = "a";
|
||||||
@@ -52,51 +54,51 @@ in {
|
|||||||
{
|
{
|
||||||
key = "c";
|
key = "c";
|
||||||
desc = "Proton Calendar";
|
desc = "Proton Calendar";
|
||||||
cmd = "${pkgs.qutebrowser}/bin/qutebrowser 'https://calendar.proton.me/'";
|
cmd = "${config.programs.helium.package}/bin/helium 'https://calendar.proton.me/'";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "m";
|
key = "m";
|
||||||
desc = "Proton Mail";
|
desc = "Proton Mail";
|
||||||
cmd = "${pkgs.qutebrowser}/bin/qutebrowser 'https://mail.proton.me/'";
|
cmd = "${config.programs.helium.package}/bin/helium 'https://mail.proton.me/'";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "o";
|
key = "o";
|
||||||
desc = "Obsidian";
|
desc = "Obsidian";
|
||||||
cmd = "${pkgs.obsidian}/bin/obsidian";
|
cmd = "${pkgs-stable.obsidian}/bin/obsidian";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "s";
|
key = "s";
|
||||||
desc = "Signal";
|
desc = "Signal";
|
||||||
cmd = "${pkgs.signal-desktop}/bin/signal-desktop";
|
cmd = "${pkgs-stable.signal-desktop}/bin/signal-desktop";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "t";
|
key = "t";
|
||||||
desc = "TickTick";
|
desc = "TickTick";
|
||||||
cmd = "${pkgs.ticktick}/bin/ticktick";
|
cmd = "${pkgs-stable.ticktick}/bin/ticktick";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "b";
|
key = "b";
|
||||||
desc = "Qutebrowser";
|
desc = "Helium";
|
||||||
cmd = "${pkgs.qutebrowser}/bin/qutebrowser";
|
cmd = "${config.programs.helium.package}/bin/helium";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "i";
|
key = "i";
|
||||||
desc = "Qutebrowser (Temp session)";
|
desc = "Helium (Incognito)";
|
||||||
cmd = "${pkgs.qutebrowser}/bin/qutebrowser --temp-basedir";
|
cmd = "${config.programs.helium.package}/bin/helium --incognito";
|
||||||
}
|
}
|
||||||
]))
|
])
|
||||||
|
)
|
||||||
|
|
||||||
# Web links
|
"$mod,B, exec, uwsm app -- ${config.programs.helium.package}/bin/helium" # Browser
|
||||||
"$mod,B, exec, uwsm app -- ${pkgs.qutebrowser}/bin/qutebrowser" # Browser (Qutebrowser)
|
|
||||||
|
|
||||||
# Power
|
# Power
|
||||||
"$mod, X, global, caelestia:session" # Powermenu
|
(
|
||||||
("$shiftMod, X, exec, "
|
"$mod, X, exec, "
|
||||||
+ lib.getExe (mkMenu [
|
+ lib.getExe (mkMenu [
|
||||||
{
|
{
|
||||||
key = "l";
|
key = "l";
|
||||||
desc = "Lock";
|
desc = "Lock";
|
||||||
cmd = "hyprctl dispatch global caelestia:lock";
|
cmd = "hyprlock";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "s";
|
key = "s";
|
||||||
@@ -118,25 +120,20 @@ in {
|
|||||||
desc = "Nightshift";
|
desc = "Nightshift";
|
||||||
cmd = "nightshift-toggle";
|
cmd = "nightshift-toggle";
|
||||||
}
|
}
|
||||||
{
|
])
|
||||||
key = "c";
|
)
|
||||||
desc = "Restart caelestia";
|
|
||||||
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)
|
||||||
"$mod,E, exec, uwsm app -- ${pkgs.thunar}/bin/thunar" # Thunar
|
"$mod,E, exec, uwsm app -- ${pkgs-stable.thunar}/bin/thunar" # Thunar
|
||||||
"$shiftMod, E, exec, pkill fuzzel || caelestia emoji -p" # Emoji picker
|
"$mod, SPACE, exec, tofi-drun" # Launcher
|
||||||
"$mod, SPACE, global, caelestia:launcher" # Launcher
|
"$mod, N, exec, swaync-client -t" # Notification center
|
||||||
"$mod, N, exec, caelestia shell drawers toggle sidebar" # Sidebar (Notifications, quick actions)
|
|
||||||
"$mod, D, exec, caelestia shell drawers toggle dashboard" # Dashboard
|
|
||||||
|
|
||||||
# Windows
|
# Windows
|
||||||
"$mod,Q, killactive," # Close window
|
"$mod,Q, killactive," # Close window
|
||||||
"$mod,F, fullscreen" # Toggle Fullscreen
|
"$mod,F, fullscreen" # Toggle Fullscreen
|
||||||
"$shiftMod,F, togglefloating," # Toggle Floating
|
"$shiftMod,F, togglefloating," # Toggle Floating
|
||||||
|
"$shiftMod, SPACE, exec, focus-toggle" # Toggle focus mode
|
||||||
|
|
||||||
# Focus Windows
|
# Focus Windows
|
||||||
"$mod,H, movefocus, l" # Move focus left
|
"$mod,H, movefocus, l" # Move focus left
|
||||||
@@ -149,18 +146,21 @@ in {
|
|||||||
"$shiftMod,L, focusmonitor, 1" # Focus next monitor
|
"$shiftMod,L, focusmonitor, 1" # Focus next monitor
|
||||||
|
|
||||||
# Utilities
|
# Utilities
|
||||||
"$shiftMod, SPACE, exec, caelestia shell gameMode toggle" # Toggle Focus/Game mode
|
"$shiftMod, S, exec, hyprshot -m region" # Capture region
|
||||||
"$shiftMod, S, global, caelestia:screenshotFreeze" # Capture region (freeze)
|
", Print, exec, hyprshot -m region" # Capture region
|
||||||
", Print, global, caelestia:screenshotFreeze" # Capture region (freeze)
|
"$shiftMod+Alt, S, exec, hyprshot -m output" # Capture screen
|
||||||
"$shiftMod+Alt, S, global, caelestia:screenshot" # Capture region
|
|
||||||
]
|
]
|
||||||
++ (builtins.concatLists (builtins.genList (i: let
|
++ (builtins.concatLists (
|
||||||
ws = i + 1;
|
builtins.genList (
|
||||||
in [
|
i: let
|
||||||
"$mod,code:1${toString i}, workspace, ${toString ws}"
|
ws = i + 1;
|
||||||
"$mod SHIFT,code:1${toString i}, movetoworkspace, ${toString ws}"
|
in [
|
||||||
])
|
"$mod,code:1${toString i}, workspace, ${toString ws}"
|
||||||
9));
|
"$mod SHIFT,code:1${toString i}, movetoworkspace, ${toString ws}"
|
||||||
|
]
|
||||||
|
)
|
||||||
|
9
|
||||||
|
));
|
||||||
|
|
||||||
bindm = [
|
bindm = [
|
||||||
"$mod,mouse:272, movewindow" # Move Window (mouse)
|
"$mod,mouse:272, movewindow" # Move Window (mouse)
|
||||||
@@ -169,32 +169,21 @@ in {
|
|||||||
|
|
||||||
bindl = [
|
bindl = [
|
||||||
# Brightness
|
# Brightness
|
||||||
", XF86MonBrightnessUp, global, caelestia:brightnessUp"
|
", XF86MonBrightnessUp, exec, bright-up"
|
||||||
", XF86MonBrightnessDown, global, caelestia:brightnessDown"
|
", XF86MonBrightnessDown, exec, bright-down"
|
||||||
|
|
||||||
# Media
|
# Media
|
||||||
", XF86AudioPlay, global, caelestia:mediaToggle"
|
", XF86AudioPlay, exec, playerctl play-pause"
|
||||||
", XF86AudioPause, global, caelestia:mediaToggle"
|
", XF86AudioPause, exec, playerctl play-pause"
|
||||||
", XF86AudioNext, global, caelestia:mediaNext"
|
", XF86AudioNext, exec, playerctl next"
|
||||||
", XF86AudioPrev, global, caelestia:mediaPrev"
|
", XF86AudioPrev, exec, playerctl previous"
|
||||||
", XF86AudioStop, global, caelestia:mediaStop"
|
", XF86AudioStop, exec, playerctl stop"
|
||||||
|
|
||||||
# Sound
|
# Sound
|
||||||
", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
", XF86AudioMute, exec, vol-mute"
|
||||||
", XF86AudioRaiseVolume, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"
|
", XF86AudioRaiseVolume, exec, vol-up"
|
||||||
", XF86AudioLowerVolume, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
", XF86AudioLowerVolume, exec, vol-down"
|
||||||
];
|
", XF86AudioMicMute, exec, mic-mute"
|
||||||
|
|
||||||
bindin = [
|
|
||||||
# Launcher
|
|
||||||
"$mod, mouse:272, global, caelestia:launcherInterrupt"
|
|
||||||
"$mod, mouse:273, global, caelestia:launcherInterrupt"
|
|
||||||
"$mod, mouse:274, global, caelestia:launcherInterrupt"
|
|
||||||
"$mod, mouse:275, global, caelestia:launcherInterrupt"
|
|
||||||
"$mod, mouse:276, global, caelestia:launcherInterrupt"
|
|
||||||
"$mod, mouse:277, global, caelestia:launcherInterrupt"
|
|
||||||
"$mod, mouse_up, global, caelestia:launcherInterrupt"
|
|
||||||
"$mod, mouse_down, global, caelestia:launcherInterrupt"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
# Hyprland is a dynamic tiling Wayland compositor that is highly customizable and performant.
|
# Hyprland is a dynamic tiling Wayland compositor that is highly customizable and performant.
|
||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
|
pkgs-stable,
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
@@ -19,52 +20,44 @@ in {
|
|||||||
./animations.nix
|
./animations.nix
|
||||||
./bindings.nix
|
./bindings.nix
|
||||||
./polkitagent.nix
|
./polkitagent.nix
|
||||||
./keyboard-backlight.nix # CHANGEME: This is for omen laptop only
|
./hyprpaper.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages =
|
||||||
qt5.qtwayland
|
(with pkgs; [
|
||||||
qt6.qtwayland
|
qt5.qtwayland
|
||||||
libsForQt5.qt5ct
|
qt6.qtwayland
|
||||||
qt6Packages.qt6ct
|
libsForQt5.qt5ct
|
||||||
xcb-util-cursor
|
qt6Packages.qt6ct
|
||||||
libxcb
|
hyprland-qtutils
|
||||||
hyprland-qtutils
|
])
|
||||||
adw-gtk3
|
++ (with pkgs-stable; [
|
||||||
hyprshot
|
xcb-util-cursor
|
||||||
hyprpicker
|
libxcb
|
||||||
swappy
|
adw-gtk3
|
||||||
imv
|
hyprshot
|
||||||
wf-recorder
|
hyprpicker
|
||||||
wlr-randr
|
swappy
|
||||||
brightnessctl
|
imv
|
||||||
gnome-themes-extra
|
wf-recorder
|
||||||
dconf
|
wlr-randr
|
||||||
wayland-utils
|
brightnessctl
|
||||||
wayland-protocols
|
gnome-themes-extra
|
||||||
];
|
dconf
|
||||||
|
wayland-utils
|
||||||
|
wayland-protocols
|
||||||
|
]);
|
||||||
|
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
configType = "hyprlang";
|
||||||
xwayland.enable = true;
|
xwayland.enable = true;
|
||||||
systemd = {
|
systemd.enable = false;
|
||||||
enable = false;
|
|
||||||
variables = [
|
|
||||||
"--all"
|
|
||||||
]; # https://wiki.hyprland.org/Nix/Hyprland-on-Home-Manager/#programs-dont-work-in-systemd-services-but-do-on-the-terminal
|
|
||||||
};
|
|
||||||
package = null;
|
package = null;
|
||||||
portalPackage = null;
|
portalPackage = null;
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
exec-once = [
|
|
||||||
"dbus-update-activation-environment --systemd --all &"
|
|
||||||
];
|
|
||||||
|
|
||||||
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
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -86,7 +79,6 @@ in {
|
|||||||
|
|
||||||
cursor = {
|
cursor = {
|
||||||
no_hardware_cursors = true;
|
no_hardware_cursors = true;
|
||||||
default_monitor = "eDP-2";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
general = {
|
general = {
|
||||||
@@ -124,8 +116,14 @@ in {
|
|||||||
|
|
||||||
gesture = "3, horizontal, workspace";
|
gesture = "3, horizontal, workspace";
|
||||||
|
|
||||||
|
layerrule = [
|
||||||
|
"match:namespace launcher, animation popin 70%"
|
||||||
|
];
|
||||||
|
|
||||||
windowrule = [
|
windowrule = [
|
||||||
"match:class .*, suppress_event maximize"
|
"match:class .*, suppress_event maximize"
|
||||||
|
"match:class helium, suppress_event fullscreen"
|
||||||
|
"match:class helium, sync_fullscreen false"
|
||||||
|
|
||||||
"match:class proton-authenticator, float on"
|
"match:class proton-authenticator, float on"
|
||||||
"match:class proton-authenticator, center on"
|
"match:class proton-authenticator, center on"
|
||||||
@@ -134,6 +132,10 @@ in {
|
|||||||
"match:class protonvpn-app, float on"
|
"match:class protonvpn-app, float on"
|
||||||
"match:class protonvpn-app, center on"
|
"match:class protonvpn-app, center on"
|
||||||
"match:class protonvpn-app, size 500 400"
|
"match:class protonvpn-app, size 500 400"
|
||||||
|
|
||||||
|
"match:title run-bg, float on"
|
||||||
|
"match:title run-bg, center on"
|
||||||
|
"match:title run-bg, size 700 80"
|
||||||
];
|
];
|
||||||
|
|
||||||
misc = {
|
misc = {
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
# Hyprpaper is used to set the wallpaper on the system
|
# Hyprpaper is used to set the wallpaper on the system
|
||||||
{lib, ...}: {
|
{pkgs-stable, lib, ...}: {
|
||||||
# The wallpaper is set by stylix
|
# The wallpaper is set by stylix
|
||||||
services.hyprpaper = {
|
services.hyprpaper = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = pkgs-stable.hyprpaper;
|
||||||
settings = {
|
settings = {
|
||||||
ipc = "on";
|
ipc = "on";
|
||||||
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"
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
# Turn the keyboard red/off when the battery is low
|
|
||||||
# Include this one only if you have a omen laptop with RGB keyboard
|
|
||||||
{
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
alert-when-low-battery = false;
|
|
||||||
keyboard-backlight = pkgs.writeShellScriptBin "keyboard-backlight" ''
|
|
||||||
function set_keyboard_backlight {
|
|
||||||
local color=$1
|
|
||||||
echo $color > /sys/devices/platform/hp-wmi/rgb_zones/zone00
|
|
||||||
echo $color > /sys/devices/platform/hp-wmi/rgb_zones/zone01
|
|
||||||
echo $color > /sys/devices/platform/hp-wmi/rgb_zones/zone02
|
|
||||||
echo $color > /sys/devices/platform/hp-wmi/rgb_zones/zone03
|
|
||||||
}
|
|
||||||
state="white"
|
|
||||||
set_keyboard_backlight ${config.lib.stylix.colors.base0D}
|
|
||||||
if [ "${toString alert-when-low-battery}" = "false" ]; then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
while true; do
|
|
||||||
BATTERY_LEVEL=$(cat /sys/class/power_supply/BAT*/capacity)
|
|
||||||
IS_CHARGING=$(cat /sys/class/power_supply/BAT*/status)
|
|
||||||
if [[ $BATTERY_LEVEL -le 10 && $IS_CHARGING != "Charging" ]]; then
|
|
||||||
if [[ $state == "red" ]];then
|
|
||||||
state="white"
|
|
||||||
set_keyboard_backlight "000000"
|
|
||||||
else
|
|
||||||
state="red"
|
|
||||||
set_keyboard_backlight "FF0000"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
state="white"
|
|
||||||
set_keyboard_backlight ${config.lib.stylix.colors.base0D}
|
|
||||||
fi
|
|
||||||
sleep 2
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
command = "bash ${keyboard-backlight}/bin/keyboard-backlight &";
|
|
||||||
in {wayland.windowManager.hyprland.settings.exec-once = [command];}
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
# HyprPolkitAgent is a simple polkit agent for wayland compositors
|
# HyprPolkitAgent is a simple polkit agent for wayland compositors
|
||||||
{pkgs, ...}: {
|
{pkgs-stable, ...}: {
|
||||||
home.packages = with pkgs; [hyprpolkitagent];
|
home.packages = with pkgs-stable; [hyprpolkitagent];
|
||||||
|
|
||||||
wayland.windowManager.hyprland.settings.exec-once = ["systemctl --user start hyprpolkitagent"];
|
wayland.windowManager.hyprland.settings.exec-once = ["systemctl --user start hyprpolkitagent"];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,85 @@
|
|||||||
|
{config, ...}: let
|
||||||
|
c = config.lib.stylix.colors;
|
||||||
|
in {
|
||||||
|
stylix.targets.hyprlock.enable = false;
|
||||||
|
|
||||||
|
programs.hyprlock = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
background = [
|
||||||
|
{
|
||||||
|
monitor = "";
|
||||||
|
color = "rgba(${c.base00}FF)";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
label = [
|
||||||
|
{
|
||||||
|
monitor = "";
|
||||||
|
text = ''cmd[update:0] echo "[$USER@$(hostname) ~]"'';
|
||||||
|
color = "rgb(${c.base0D})";
|
||||||
|
font_size = 13;
|
||||||
|
font_family = "Maple Mono NF";
|
||||||
|
position = "48, -48";
|
||||||
|
halign = "left";
|
||||||
|
valign = "top";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
monitor = "";
|
||||||
|
text = ''cmd[update:1000] echo "$(date +'%H:%M:%S')"'';
|
||||||
|
color = "rgb(${c.base05})";
|
||||||
|
font_size = 13;
|
||||||
|
font_family = "Maple Mono NF";
|
||||||
|
position = "48, -70";
|
||||||
|
halign = "left";
|
||||||
|
valign = "top";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
monitor = "";
|
||||||
|
text = ''cmd[update:60000] echo "$(date +'%A %d %B %Y')"'';
|
||||||
|
color = "rgb(${c.base04})";
|
||||||
|
font_size = 13;
|
||||||
|
font_family = "Maple Mono NF";
|
||||||
|
position = "48, -92";
|
||||||
|
halign = "left";
|
||||||
|
valign = "top";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
monitor = "";
|
||||||
|
text = "passwd:";
|
||||||
|
color = "rgb(${c.base0D})";
|
||||||
|
font_size = 13;
|
||||||
|
font_family = "Maple Mono NF";
|
||||||
|
position = "48, -141";
|
||||||
|
halign = "left";
|
||||||
|
valign = "top";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
"input-field" = [
|
||||||
|
{
|
||||||
|
monitor = "";
|
||||||
|
size = "200, 20";
|
||||||
|
outline_thickness = 0;
|
||||||
|
dots_size = 0.3;
|
||||||
|
dots_spacing = 0.2;
|
||||||
|
dots_center = false;
|
||||||
|
outer_color = "rgba(00000000)";
|
||||||
|
inner_color = "rgba(00000000)";
|
||||||
|
font_color = "rgb(${c.base05})";
|
||||||
|
fade_on_empty = false;
|
||||||
|
placeholder_text = "";
|
||||||
|
hide_input = true;
|
||||||
|
rounding = 0;
|
||||||
|
check_color = "rgb(${c.base0B})";
|
||||||
|
fail_color = "rgb(${c.base08})";
|
||||||
|
fail_text = ''<span font_desc="Maple Mono NF 13">auth failed</span>'';
|
||||||
|
capslock_color = "rgb(${c.base0A})";
|
||||||
|
position = "116, -138";
|
||||||
|
halign = "left";
|
||||||
|
valign = "top";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,25 +1,19 @@
|
|||||||
# Mime type associations for the system.
|
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
with lib; let
|
|
||||||
defaultApps = {
|
defaultApps = {
|
||||||
# check desktop files here: `ls $(echo $XDG_DATA_DIRS| sed "s/:/ /g")`
|
text = ["nvim-ghostty.desktop"];
|
||||||
text = [
|
|
||||||
# "org.gnome.TextEditor.desktop"
|
|
||||||
"nvim-ghostty.desktop"
|
|
||||||
];
|
|
||||||
code = ["nvim-ghostty.desktop"];
|
code = ["nvim-ghostty.desktop"];
|
||||||
image = ["imv-dir.desktop"];
|
image = ["imv-dir.desktop"];
|
||||||
audio = ["mpv.desktop"];
|
audio = ["vlc.desktop"];
|
||||||
video = ["mpv.desktop"];
|
video = ["vlc.desktop"];
|
||||||
directory = ["thunar.desktop"];
|
directory = ["thunar.desktop"];
|
||||||
office = ["libreoffice.desktop"];
|
office = ["onlyoffice-desktopeditors.desktop"];
|
||||||
pdf = ["zathura.desktop"];
|
pdf = ["onlyoffice-desktopeditors.desktop"];
|
||||||
terminal = ["ghostty.desktop"];
|
|
||||||
archive = ["xarchiver.desktop"];
|
archive = ["xarchiver.desktop"];
|
||||||
|
browser = ["helium.desktop"];
|
||||||
};
|
};
|
||||||
|
|
||||||
mimeMap = {
|
mimeMap = {
|
||||||
@@ -33,7 +27,6 @@ with lib; let
|
|||||||
"text/x-go"
|
"text/x-go"
|
||||||
"text/x-java"
|
"text/x-java"
|
||||||
"text/x-csharp"
|
"text/x-csharp"
|
||||||
|
|
||||||
"text/x-python"
|
"text/x-python"
|
||||||
"application/x-shellscript"
|
"application/x-shellscript"
|
||||||
"text/javascript"
|
"text/javascript"
|
||||||
@@ -41,7 +34,6 @@ with lib; let
|
|||||||
"text/css"
|
"text/css"
|
||||||
"text/x-php"
|
"text/x-php"
|
||||||
"text/x-ruby"
|
"text/x-ruby"
|
||||||
|
|
||||||
"application/json"
|
"application/json"
|
||||||
"application/xml"
|
"application/xml"
|
||||||
"text/xml"
|
"text/xml"
|
||||||
@@ -50,11 +42,8 @@ with lib; let
|
|||||||
"application/toml"
|
"application/toml"
|
||||||
"text/x-nix"
|
"text/x-nix"
|
||||||
"text/markdown"
|
"text/markdown"
|
||||||
|
|
||||||
"text/x-dockerfile"
|
"text/x-dockerfile"
|
||||||
"application/x-yaml"
|
|
||||||
"text/x-terraform"
|
"text/x-terraform"
|
||||||
|
|
||||||
"application/x-perl"
|
"application/x-perl"
|
||||||
"text/x-lua"
|
"text/x-lua"
|
||||||
"text/x-haskell"
|
"text/x-haskell"
|
||||||
@@ -103,12 +92,24 @@ with lib; let
|
|||||||
"application/rtf"
|
"application/rtf"
|
||||||
];
|
];
|
||||||
pdf = ["application/pdf"];
|
pdf = ["application/pdf"];
|
||||||
terminal = ["terminal"];
|
|
||||||
archive = [
|
archive = [
|
||||||
"application/zip"
|
"application/zip"
|
||||||
"application/rar"
|
"application/x-rar-compressed"
|
||||||
"application/7z"
|
"application/vnd.rar"
|
||||||
"application/*tar"
|
"application/x-7z-compressed"
|
||||||
|
"application/x-tar"
|
||||||
|
"application/gzip"
|
||||||
|
"application/x-bzip2"
|
||||||
|
"application/x-xz"
|
||||||
|
"application/x-zstd"
|
||||||
|
"application/x-compressed-tar"
|
||||||
|
];
|
||||||
|
browser = [
|
||||||
|
"text/html"
|
||||||
|
"application/xhtml+xml"
|
||||||
|
"x-scheme-handler/http"
|
||||||
|
"x-scheme-handler/https"
|
||||||
|
"x-scheme-handler/ftp"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -121,10 +122,13 @@ with lib; let
|
|||||||
mimeTypes = mimeMap.code ++ mimeMap.text;
|
mimeTypes = mimeMap.code ++ mimeMap.text;
|
||||||
};
|
};
|
||||||
|
|
||||||
associations = with lists;
|
associations = lib.listToAttrs (
|
||||||
listToAttrs (flatten (mapAttrsToList
|
lib.flatten (
|
||||||
(key: map (type: attrsets.nameValuePair type defaultApps."${key}"))
|
lib.mapAttrsToList
|
||||||
mimeMap));
|
(key: map (type: lib.nameValuePair type defaultApps.${key}))
|
||||||
|
mimeMap
|
||||||
|
)
|
||||||
|
);
|
||||||
in {
|
in {
|
||||||
home.packages = [nvim-ghostty];
|
home.packages = [nvim-ghostty];
|
||||||
|
|
||||||
@@ -133,7 +137,7 @@ in {
|
|||||||
mimeApps = {
|
mimeApps = {
|
||||||
enable = true;
|
enable = true;
|
||||||
associations.added = associations;
|
associations.added = associations;
|
||||||
defaultApplications = associations;
|
defaultApplications = lib.mapAttrs (_: lib.mkForce) associations;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,412 @@
|
|||||||
|
{config, ...}: let
|
||||||
|
c = config.lib.stylix.colors;
|
||||||
|
font = config.stylix.fonts.sansSerif.name;
|
||||||
|
monofont = config.stylix.fonts.monospace.name;
|
||||||
|
rounding = config.theme.rounding;
|
||||||
|
border-size = config.theme.border-size;
|
||||||
|
gaps-in = config.theme.gaps-in;
|
||||||
|
opacityToHex = opacity: let
|
||||||
|
val = builtins.floor (opacity * 255);
|
||||||
|
high = val / 16;
|
||||||
|
low = val - high * 16;
|
||||||
|
digits = "0123456789abcdef";
|
||||||
|
in "${builtins.substring high 1 digits}${builtins.substring low 1 digits}";
|
||||||
|
alphaHex = opacityToHex config.theme.inactive-opacity;
|
||||||
|
in {
|
||||||
|
services.swaync = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
settings = {
|
||||||
|
positionX = "right";
|
||||||
|
positionY = "top";
|
||||||
|
layer = "overlay";
|
||||||
|
"control-center-layer" = "overlay";
|
||||||
|
cssPriority = "user";
|
||||||
|
"control-center-width" = 450;
|
||||||
|
"control-center-margin-top" = config.theme.gaps-out * 2;
|
||||||
|
"control-center-margin-bottom" = config.theme.gaps-out * 2;
|
||||||
|
"control-center-margin-right" = 0;
|
||||||
|
"fit-to-screen" = true;
|
||||||
|
"notification-window-width" = 400;
|
||||||
|
"notification-icon-size" = 40;
|
||||||
|
"notification-body-image-height" = 500;
|
||||||
|
"notification-body-image-width" = 500;
|
||||||
|
"notification-inline-replies" = true;
|
||||||
|
"notification-2fa-action" = false;
|
||||||
|
timeout = 3;
|
||||||
|
"timeout-low" = 2;
|
||||||
|
"timeout-critical" = 6;
|
||||||
|
"keyboard-shortcuts" = true;
|
||||||
|
"image-visibility" = "when-available";
|
||||||
|
"transition-time" = 200;
|
||||||
|
"hide-on-clear" = false;
|
||||||
|
"hide-on-action" = false;
|
||||||
|
"script-fail-notify" = true;
|
||||||
|
widgets = ["mpris" "volume" "backlight" "dnd" "buttons-grid" "notifications"];
|
||||||
|
"widget-config" = {
|
||||||
|
dnd.text = "Do not disturb";
|
||||||
|
volume = {
|
||||||
|
label = "";
|
||||||
|
"show-per-app" = false;
|
||||||
|
};
|
||||||
|
backlight = {
|
||||||
|
label = "";
|
||||||
|
"min" = 0;
|
||||||
|
};
|
||||||
|
mpris = {
|
||||||
|
"image-size" = 100;
|
||||||
|
"image-radius" = 10;
|
||||||
|
autohide = false;
|
||||||
|
blacklist = ["org.mpris.MediaPlayer2.playerctld"];
|
||||||
|
};
|
||||||
|
"buttons-grid" = {
|
||||||
|
actions = [
|
||||||
|
{
|
||||||
|
label = "";
|
||||||
|
type = "toggle";
|
||||||
|
command = "nightshift-toggle";
|
||||||
|
"update-command" = "pidof hyprsunset > /dev/null && echo true || echo false";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
label = "";
|
||||||
|
type = "toggle";
|
||||||
|
command = "focus-toggle";
|
||||||
|
"update-command" = "test -f /tmp/hypr-focus-mode && echo true || echo false";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
label = "";
|
||||||
|
type = "toggle";
|
||||||
|
command = "swayosd-client --input-volume mute-toggle";
|
||||||
|
"update-command" = "wpctl get-volume @DEFAULT_SOURCE@ | grep -q MUTED && echo true || echo false";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
label = "";
|
||||||
|
command = "swaync-client -cp ; hyprlock";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
label = "";
|
||||||
|
command = "swaync-client -cp ; systemctl poweroff";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
style = ''
|
||||||
|
@define-color center-bg #${c.base01}${alphaHex};
|
||||||
|
@define-color notification-bg #${c.base00}${alphaHex};
|
||||||
|
@define-color center-notification-bg #${c.base01};
|
||||||
|
@define-color background #${c.base00}${alphaHex};
|
||||||
|
@define-color background-alt #${c.base01};
|
||||||
|
@define-color text #${c.base05};
|
||||||
|
@define-color text-alt #${c.base03};
|
||||||
|
@define-color selected #${c.base03}66;
|
||||||
|
@define-color hover #${c.base03}28;
|
||||||
|
@define-color urgent #${c.base08};
|
||||||
|
|
||||||
|
* {
|
||||||
|
all: unset;
|
||||||
|
font-family: "${font}";
|
||||||
|
font-weight: 700;
|
||||||
|
--border-radius: ${toString rounding}px;
|
||||||
|
--border-radius-s: ${toString gaps-in}px;
|
||||||
|
--border-radius-xl: ${toString (rounding - 2)}px;
|
||||||
|
--shadow: 2px 4px 10px rgba(0,0,0,0.15);
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification { padding: 5px; }
|
||||||
|
|
||||||
|
.notification-row { background: transparent; border: none; box-shadow: none; }
|
||||||
|
|
||||||
|
.control-center .notification { padding: 0; }
|
||||||
|
|
||||||
|
.notification-background {
|
||||||
|
background: @notification-bg;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
border: ${toString border-size}px solid @selected;
|
||||||
|
box-shadow: none;
|
||||||
|
outline: none;
|
||||||
|
margin: ${toString gaps-in}px;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-background .close-button {
|
||||||
|
margin: 6px;
|
||||||
|
padding: 2px;
|
||||||
|
border-radius: ${toString (gaps-in - 2)}px;
|
||||||
|
background: transparent;
|
||||||
|
color: @text;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-background .close-button:hover { background: @hover; }
|
||||||
|
|
||||||
|
.notification.low,
|
||||||
|
.notification.normal { border: none; }
|
||||||
|
|
||||||
|
.notification.critical {
|
||||||
|
border: ${toString border-size}px solid @urgent;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-content {
|
||||||
|
color: @text;
|
||||||
|
margin: 10px;
|
||||||
|
font-weight: 700;
|
||||||
|
border: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-content .text-box { margin: 0 0 0 15px; }
|
||||||
|
|
||||||
|
.notification-content .time {
|
||||||
|
padding: 2px;
|
||||||
|
font-size: 0.95rem;
|
||||||
|
font-weight: 800;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-content .summary {
|
||||||
|
font-size: 1rem;
|
||||||
|
font-weight: 800;
|
||||||
|
padding: 2px 0;
|
||||||
|
margin-bottom: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-content .body {
|
||||||
|
color: @text-alt;
|
||||||
|
font-size: 0.8rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-row .inline-reply-entry,
|
||||||
|
.notification-row .inline-reply-button {
|
||||||
|
margin: 5px -5px -5px -5px;
|
||||||
|
padding: 10px 15px;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
background: @background-alt;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-row .inline-reply-entry { margin-right: 10px; }
|
||||||
|
.notification-row .inline-reply-button:hover { background: @selected; }
|
||||||
|
|
||||||
|
.notification-alt-actions { padding: 5px 0; }
|
||||||
|
|
||||||
|
.notification-action {
|
||||||
|
font-weight: 700;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
background: @hover;
|
||||||
|
color: @text;
|
||||||
|
margin: 0 5px;
|
||||||
|
padding: 10px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-action:hover,
|
||||||
|
.notification-action:active { background: @selected; }
|
||||||
|
|
||||||
|
.control-center {
|
||||||
|
background: @center-bg;
|
||||||
|
border-radius: var(--border-radius) 0 0 var(--border-radius);
|
||||||
|
border-left: ${toString border-size}px solid @selected;
|
||||||
|
margin: 0;
|
||||||
|
padding: 5px 5px 0 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.control-center .notification-background {
|
||||||
|
background: @center-notification-bg;
|
||||||
|
box-shadow: var(--shadow);
|
||||||
|
}
|
||||||
|
|
||||||
|
.control-center .notification-background .close-button,
|
||||||
|
.notification-group-close-button { opacity: 0; }
|
||||||
|
|
||||||
|
.notification-group { transition: 200ms; }
|
||||||
|
|
||||||
|
.notification-group:not(.collapsed) { margin: ${toString gaps-in}px; }
|
||||||
|
|
||||||
|
.notification-group-headers,
|
||||||
|
.notification-group-buttons {
|
||||||
|
color: @text;
|
||||||
|
font-weight: bold;
|
||||||
|
background: @background;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
padding: 4px 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-group-headers > label {
|
||||||
|
margin: 0 3px;
|
||||||
|
font-size: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-group-icon { color: @text; }
|
||||||
|
|
||||||
|
.notification-group-buttons .image-button {
|
||||||
|
background: transparent;
|
||||||
|
color: @text;
|
||||||
|
padding: 4px;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-group-buttons .image-button:hover { background: @hover; }
|
||||||
|
|
||||||
|
.widget {
|
||||||
|
margin: 5px;
|
||||||
|
color: @text;
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-mpris-album-art {
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
margin: 6px 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-mpris-title {
|
||||||
|
font-weight: 700;
|
||||||
|
font-size: 1.2rem;
|
||||||
|
margin: 0 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-mpris-subtitle {
|
||||||
|
color: @text-alt;
|
||||||
|
font-weight: 700;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
margin: 0 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mpris-background { border-radius: 14px; margin: 3px; }
|
||||||
|
|
||||||
|
.widget-mpris {
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
box-shadow: var(--shadow);
|
||||||
|
}
|
||||||
|
|
||||||
|
.mpris-overlay {
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
padding: 10px;
|
||||||
|
background: @background;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mpris-overlay > box:last-child {
|
||||||
|
border-radius: var(--border-radius-xl);
|
||||||
|
padding: 0 5px;
|
||||||
|
background: alpha(@hover, .6);
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-mpris-player button {
|
||||||
|
padding: 5px;
|
||||||
|
margin: 0 2.5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-mpris-player button:hover {
|
||||||
|
border-radius: var(--border-radius-s);
|
||||||
|
background: @hover;
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-volume,
|
||||||
|
.widget-backlight {
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
padding: 10px 15px;
|
||||||
|
background: @background-alt;
|
||||||
|
box-shadow: var(--shadow);
|
||||||
|
color: @text;
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-volume > box,
|
||||||
|
.widget-backlight > box {
|
||||||
|
color: @text;
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-volume label,
|
||||||
|
.widget-backlight label {
|
||||||
|
font-size: 1rem;
|
||||||
|
font-weight: 700;
|
||||||
|
min-width: 1.2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-volume slider,
|
||||||
|
.widget-backlight slider {
|
||||||
|
background: @text;
|
||||||
|
border-radius: var(--border-radius-s);
|
||||||
|
min-height: 12px;
|
||||||
|
min-width: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-volume trough,
|
||||||
|
.widget-backlight trough {
|
||||||
|
background: @hover;
|
||||||
|
border-radius: var(--border-radius-s);
|
||||||
|
min-height: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-volume highlight,
|
||||||
|
.widget-backlight highlight {
|
||||||
|
background: @text;
|
||||||
|
border-radius: var(--border-radius-s);
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-dnd {
|
||||||
|
padding: 10px 15px;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
background: @background-alt;
|
||||||
|
box-shadow: var(--shadow);
|
||||||
|
color: @text;
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-dnd > label {
|
||||||
|
font-size: 1rem;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-dnd switch {
|
||||||
|
background: @hover;
|
||||||
|
border-radius: var(--border-radius-s);
|
||||||
|
box-shadow: none;
|
||||||
|
padding: 2px;
|
||||||
|
transition: 200ms;
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-dnd switch slider {
|
||||||
|
background: @text;
|
||||||
|
border-radius: var(--border-radius-s);
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-dnd switch:hover,
|
||||||
|
.widget-dnd switch:checked { background-color: @selected; }
|
||||||
|
|
||||||
|
.widget-notifications { margin: 0; }
|
||||||
|
|
||||||
|
.widget-buttons-grid {
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
padding: 5px 15px;
|
||||||
|
margin-bottom: 5px;
|
||||||
|
background: @background-alt;
|
||||||
|
box-shadow: var(--shadow);
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-buttons-grid button {
|
||||||
|
padding: 10px;
|
||||||
|
margin: 3px;
|
||||||
|
min-width: 2rem;
|
||||||
|
font-family: "${monofont}";
|
||||||
|
background: @hover;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
transition: 200ms;
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-buttons-grid button > label {
|
||||||
|
font-family: "${monofont}";
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: normal;
|
||||||
|
font-style: normal;
|
||||||
|
color: @text;
|
||||||
|
}
|
||||||
|
|
||||||
|
.widget-buttons-grid button:hover { background: @selected; }
|
||||||
|
|
||||||
|
.widget-buttons-grid button:checked { background-color: @text; }
|
||||||
|
|
||||||
|
.widget-buttons-grid button:checked > label { color: @background; }
|
||||||
|
|
||||||
|
.control-center-list-placeholder { color: @text; }
|
||||||
|
|
||||||
|
.blank-window { background: transparent; }
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
stylix.targets.swaync.enable = false;
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
c = config.lib.stylix.colors;
|
||||||
|
font = config.stylix.fonts.serif.name;
|
||||||
|
gaps = config.theme.gaps-out;
|
||||||
|
barHeight = config.theme.bar-height;
|
||||||
|
rounding =
|
||||||
|
if config.theme.rounding > barHeight / 2
|
||||||
|
then barHeight / 2
|
||||||
|
else config.theme.rounding;
|
||||||
|
in {
|
||||||
|
imports = [./desktop-actions.nix];
|
||||||
|
programs.tofi = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
anchor = "top";
|
||||||
|
height = barHeight;
|
||||||
|
margin-top = gaps;
|
||||||
|
margin-left = 350;
|
||||||
|
margin-right = 350;
|
||||||
|
|
||||||
|
horizontal = true;
|
||||||
|
num-results = 8;
|
||||||
|
result-spacing = 20;
|
||||||
|
padding-top = 2;
|
||||||
|
padding-bottom = 2;
|
||||||
|
padding-left = 14;
|
||||||
|
padding-right = 14;
|
||||||
|
|
||||||
|
font = lib.mkForce font;
|
||||||
|
prompt-color = lib.mkForce "#${c.base0D}ff";
|
||||||
|
selection-color = lib.mkForce "#${c.base0D}ff";
|
||||||
|
|
||||||
|
outline-width = 0;
|
||||||
|
border-width = 0;
|
||||||
|
corner-radius = rounding;
|
||||||
|
|
||||||
|
prompt-text = " ";
|
||||||
|
placeholder-text = "Search...";
|
||||||
|
|
||||||
|
drun-launch = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,112 @@
|
|||||||
|
{...}: {
|
||||||
|
xdg.desktopEntries = {
|
||||||
|
focus-toggle = {
|
||||||
|
name = "Focus Mode";
|
||||||
|
exec = "focus-toggle";
|
||||||
|
icon = "do-not-disturb-symbolic";
|
||||||
|
comment = "Toggle focus mode";
|
||||||
|
categories = ["System"];
|
||||||
|
terminal = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
nightshift-toggle = {
|
||||||
|
name = "Night Shift";
|
||||||
|
exec = "nightshift-toggle";
|
||||||
|
icon = "night-light-symbolic";
|
||||||
|
comment = "Toggle night shift";
|
||||||
|
categories = ["System"];
|
||||||
|
terminal = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
mic-mute = {
|
||||||
|
name = "Mute Microphone";
|
||||||
|
exec = "mic-mute";
|
||||||
|
icon = "microphone-sensitivity-muted-symbolic";
|
||||||
|
comment = "Toggle microphone mute";
|
||||||
|
categories = ["System"];
|
||||||
|
terminal = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
lock = {
|
||||||
|
name = "Lock";
|
||||||
|
exec = "hyprlock";
|
||||||
|
icon = "system-lock-screen-symbolic";
|
||||||
|
comment = "Lock the screen";
|
||||||
|
categories = ["System"];
|
||||||
|
terminal = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
reboot = {
|
||||||
|
name = "Reboot";
|
||||||
|
exec = "systemctl reboot";
|
||||||
|
icon = "system-restart-symbolic";
|
||||||
|
comment = "Restart the system";
|
||||||
|
categories = ["System"];
|
||||||
|
terminal = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
shutdown = {
|
||||||
|
name = "Shutdown";
|
||||||
|
exec = "systemctl poweroff";
|
||||||
|
icon = "system-shutdown-symbolic";
|
||||||
|
comment = "Power off the system";
|
||||||
|
categories = ["System"];
|
||||||
|
terminal = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
hibernate = {
|
||||||
|
name = "Hibernate";
|
||||||
|
exec = "systemctl hibernate";
|
||||||
|
icon = "drive-harddisk-symbolic";
|
||||||
|
comment = "Hibernate the system";
|
||||||
|
categories = ["System"];
|
||||||
|
terminal = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
waybar-toggle = {
|
||||||
|
name = "Toggle Waybar";
|
||||||
|
exec = "waybar-toggle";
|
||||||
|
icon = "panel-applets-symbolic";
|
||||||
|
comment = "Show or hide the status bar";
|
||||||
|
categories = ["System"];
|
||||||
|
terminal = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
wifi-toggle = {
|
||||||
|
name = "Toggle Wi-Fi";
|
||||||
|
exec = "wifi-toggle";
|
||||||
|
icon = "network-wireless-symbolic";
|
||||||
|
comment = "Enable or disable Wi-Fi";
|
||||||
|
categories = ["System"];
|
||||||
|
terminal = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
bluetooth-toggle = {
|
||||||
|
name = "Toggle Bluetooth";
|
||||||
|
exec = "bluetooth-toggle";
|
||||||
|
icon = "bluetooth-symbolic";
|
||||||
|
comment = "Enable or disable Bluetooth";
|
||||||
|
categories = ["System"];
|
||||||
|
terminal = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
logout = {
|
||||||
|
name = "Logout";
|
||||||
|
exec = "hyprctl dispatch exit";
|
||||||
|
icon = "system-log-out-symbolic";
|
||||||
|
comment = "End the current session";
|
||||||
|
categories = ["System"];
|
||||||
|
terminal = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
spotatui = {
|
||||||
|
name = "Spotify";
|
||||||
|
exec = "ghostty -e spotatui";
|
||||||
|
icon = "spotify";
|
||||||
|
comment = "Control Spotify from the terminal";
|
||||||
|
categories = ["Audio" "Music"];
|
||||||
|
terminal = false;
|
||||||
|
settings.Keywords = "spotify;spotatui;music;";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
{pkgs, ...}: let
|
||||||
|
scripts = import ./scripts.nix {inherit pkgs;};
|
||||||
|
in {
|
||||||
|
imports = [
|
||||||
|
./settings.nix
|
||||||
|
./style.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
_module.args.networkScript = scripts.networkScript;
|
||||||
|
_module.args.bluetoothScript = scripts.bluetoothScript;
|
||||||
|
|
||||||
|
programs.waybar.enable = true;
|
||||||
|
stylix.targets.waybar.enable = false;
|
||||||
|
|
||||||
|
home.packages = with pkgs;
|
||||||
|
[
|
||||||
|
playerctl
|
||||||
|
pavucontrol
|
||||||
|
blueman
|
||||||
|
iw
|
||||||
|
hyprsunset
|
||||||
|
]
|
||||||
|
++ (with scripts; [vol-up vol-down vol-mute mic-mute bright-up bright-down nightshift-toggle focus-toggle waybar-toggle wifi-toggle bluetooth-toggle]);
|
||||||
|
|
||||||
|
wayland.windowManager.hyprland.settings.exec-once = [
|
||||||
|
"waybar"
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -0,0 +1,164 @@
|
|||||||
|
{pkgs}: let
|
||||||
|
updateOsd = ''
|
||||||
|
[ -f /tmp/waybar-osd-pid ] && kill "$(cat /tmp/waybar-osd-pid)" 2>/dev/null
|
||||||
|
printf '%s' "$OSD_TEXT" > /tmp/waybar-osd
|
||||||
|
pkill -RTMIN+8 waybar 2>/dev/null
|
||||||
|
( sleep 2.5; rm -f /tmp/waybar-osd /tmp/waybar-osd-pid; pkill -RTMIN+8 waybar 2>/dev/null ) &
|
||||||
|
printf '%s' "$!" > /tmp/waybar-osd-pid
|
||||||
|
'';
|
||||||
|
|
||||||
|
volGetText = ''
|
||||||
|
VOL_RAW=$(${pkgs.wireplumber}/bin/wpctl get-volume @DEFAULT_SINK@)
|
||||||
|
VOL=$(printf '%s' "$VOL_RAW" | awk '{printf "%d", $2*100}')
|
||||||
|
if printf '%s' "$VOL_RAW" | grep -q MUTED; then
|
||||||
|
OSD_TEXT=" $VOL%"
|
||||||
|
elif [ "$VOL" -lt 33 ]; then
|
||||||
|
OSD_TEXT=" $VOL%"
|
||||||
|
elif [ "$VOL" -lt 66 ]; then
|
||||||
|
OSD_TEXT=" $VOL%"
|
||||||
|
else
|
||||||
|
OSD_TEXT=" $VOL%"
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
|
||||||
|
brightGetText = ''
|
||||||
|
BRIGHT=$(${pkgs.brightnessctl}/bin/brightnessctl -m | awk -F, '{print int($5)}')
|
||||||
|
if [ "$BRIGHT" -lt 33 ]; then
|
||||||
|
OSD_TEXT=" $BRIGHT%"
|
||||||
|
elif [ "$BRIGHT" -lt 66 ]; then
|
||||||
|
OSD_TEXT=" $BRIGHT%"
|
||||||
|
else
|
||||||
|
OSD_TEXT=" $BRIGHT%"
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
in {
|
||||||
|
bluetoothScript = pkgs.writeShellScript "waybar-bluetooth" ''
|
||||||
|
if bluetoothctl show 2>/dev/null | grep -q "Powered: yes"; then
|
||||||
|
device=$(bluetoothctl devices Connected 2>/dev/null | head -1 | cut -d' ' -f3-)
|
||||||
|
if [ -n "$device" ]; then
|
||||||
|
printf '{"text": "%s", "class": "connected", "tooltip": "Bluetooth\\n %s"}\n' "$device" "$device"
|
||||||
|
else
|
||||||
|
printf '{"text": "", "class": "on", "tooltip": "Bluetooth on"}\n'
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
printf '{"text": "", "class": "off", "tooltip": "Bluetooth off"}\n'
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
|
||||||
|
networkScript = pkgs.writeShellScript "waybar-network" ''
|
||||||
|
for iface in $(${pkgs.iproute2}/bin/ip -br link show | awk '$2 == "UP" {print $1}' | grep -vE '^(lo|tun|proton|wg[0-9]|ppp|vpn|docker|br-|veth|virbr)'); do
|
||||||
|
ip=$(${pkgs.iproute2}/bin/ip addr show "$iface" 2>/dev/null | grep 'inet ' | awk '{print $2}' | cut -d/ -f1 | head -1)
|
||||||
|
if [ -n "$ip" ]; then
|
||||||
|
if [[ "$iface" == wl* ]]; then
|
||||||
|
ssid=$(${pkgs.iw}/bin/iw dev "$iface" link 2>/dev/null | grep SSID | sed 's/.*SSID: //')
|
||||||
|
signal=$(${pkgs.iw}/bin/iw dev "$iface" link 2>/dev/null | grep signal | awk '{print $2}')
|
||||||
|
printf '{"text": "", "class": "wifi", "tooltip": " %s\\n %s dBm"}\n' "$ssid" "$signal"
|
||||||
|
else
|
||||||
|
printf '{"text": "", "class": "ethernet", "tooltip": " %s\\n %s"}\n' "$iface" "$ip"
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
printf '{"text": "", "class": "disconnected", "tooltip": "Disconnected"}\n'
|
||||||
|
'';
|
||||||
|
|
||||||
|
vol-up = pkgs.writeShellScriptBin "vol-up" ''
|
||||||
|
${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_SINK@ 5%+ --limit 1.0
|
||||||
|
${volGetText}
|
||||||
|
${updateOsd}
|
||||||
|
'';
|
||||||
|
|
||||||
|
vol-down = pkgs.writeShellScriptBin "vol-down" ''
|
||||||
|
${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_SINK@ 5%-
|
||||||
|
${volGetText}
|
||||||
|
${updateOsd}
|
||||||
|
'';
|
||||||
|
|
||||||
|
vol-mute = pkgs.writeShellScriptBin "vol-mute" ''
|
||||||
|
${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_SINK@ toggle
|
||||||
|
${volGetText}
|
||||||
|
${updateOsd}
|
||||||
|
'';
|
||||||
|
|
||||||
|
mic-mute = pkgs.writeShellScriptBin "mic-mute" ''
|
||||||
|
${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_SOURCE@ toggle
|
||||||
|
if ${pkgs.wireplumber}/bin/wpctl get-volume @DEFAULT_SOURCE@ | grep -q MUTED; then
|
||||||
|
OSD_TEXT=" Muted"
|
||||||
|
else
|
||||||
|
OSD_TEXT=" Live"
|
||||||
|
fi
|
||||||
|
${updateOsd}
|
||||||
|
'';
|
||||||
|
|
||||||
|
bright-up = pkgs.writeShellScriptBin "bright-up" ''
|
||||||
|
${pkgs.brightnessctl}/bin/brightnessctl set 5%+
|
||||||
|
${brightGetText}
|
||||||
|
${updateOsd}
|
||||||
|
'';
|
||||||
|
|
||||||
|
bright-down = pkgs.writeShellScriptBin "bright-down" ''
|
||||||
|
${pkgs.brightnessctl}/bin/brightnessctl set 5%-
|
||||||
|
${brightGetText}
|
||||||
|
${updateOsd}
|
||||||
|
'';
|
||||||
|
|
||||||
|
wifi-toggle = pkgs.writeShellScriptBin "wifi-toggle" ''
|
||||||
|
if nmcli radio wifi | grep -q enabled; then
|
||||||
|
nmcli radio wifi off
|
||||||
|
else
|
||||||
|
nmcli radio wifi on
|
||||||
|
fi
|
||||||
|
${updateOsd}
|
||||||
|
'';
|
||||||
|
|
||||||
|
bluetooth-toggle = pkgs.writeShellScriptBin "bluetooth-toggle" ''
|
||||||
|
if bluetoothctl show | grep -q "Powered: yes"; then
|
||||||
|
bluetoothctl power off
|
||||||
|
else
|
||||||
|
bluetoothctl power on
|
||||||
|
fi
|
||||||
|
${updateOsd}
|
||||||
|
'';
|
||||||
|
|
||||||
|
waybar-toggle = pkgs.writeShellScriptBin "waybar-toggle" ''
|
||||||
|
if pidof waybar > /dev/null; then
|
||||||
|
pkill waybar
|
||||||
|
else
|
||||||
|
hyprctl dispatch exec waybar
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
|
||||||
|
nightshift-toggle = pkgs.writeShellScriptBin "nightshift-toggle" ''
|
||||||
|
if pidof "hyprsunset" > /dev/null; then
|
||||||
|
pkill hyprsunset
|
||||||
|
OSD_TEXT=" Night Shift Off"
|
||||||
|
else
|
||||||
|
${pkgs.hyprsunset}/bin/hyprsunset -t 4500 &
|
||||||
|
OSD_TEXT=" Night Shift On"
|
||||||
|
fi
|
||||||
|
${updateOsd}
|
||||||
|
'';
|
||||||
|
|
||||||
|
focus-toggle = pkgs.writeShellScriptBin "focus-toggle" ''
|
||||||
|
if test -f /tmp/hypr-focus-mode; then
|
||||||
|
rm /tmp/hypr-focus-mode
|
||||||
|
OSD_TEXT=" Focus Off"
|
||||||
|
${updateOsd}
|
||||||
|
hyprctl reload
|
||||||
|
hyprctl dispatch exec waybar
|
||||||
|
else
|
||||||
|
touch /tmp/hypr-focus-mode
|
||||||
|
OSD_TEXT=" Focus On"
|
||||||
|
${updateOsd}
|
||||||
|
pkill waybar || true
|
||||||
|
hyprctl keyword animations:enabled false
|
||||||
|
hyprctl keyword general:gaps_in 0
|
||||||
|
hyprctl keyword general:gaps_out 0
|
||||||
|
hyprctl keyword decoration:active_opacity 1
|
||||||
|
hyprctl keyword decoration:inactive_opacity 1
|
||||||
|
hyprctl keyword decoration:rounding 0
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
|
||||||
|
# TODO: Run in background
|
||||||
|
}
|
||||||
@@ -0,0 +1,146 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
networkScript,
|
||||||
|
bluetoothScript,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
gaps-out = config.theme.gaps-out;
|
||||||
|
c = config.lib.stylix.colors;
|
||||||
|
in {
|
||||||
|
programs.waybar.settings = [
|
||||||
|
{
|
||||||
|
layer = "top";
|
||||||
|
position = "top";
|
||||||
|
height = config.theme.bar-height;
|
||||||
|
margin = "${toString gaps-out} ${toString gaps-out} 0";
|
||||||
|
modules-center = ["custom/osd" "custom/osd-sep" "clock" "tray" "hyprland/workspaces" "custom/network" "custom/bluetooth" "battery"];
|
||||||
|
|
||||||
|
# ── Modules ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
"hyprland/workspaces" = {
|
||||||
|
format = "{id}";
|
||||||
|
all-outputs = true;
|
||||||
|
move-to-monitor = true;
|
||||||
|
ignore-workspaces = ["[5-9]" "[1-9][0-9]+"];
|
||||||
|
on-scroll-down = "hyprctl dispatch workspace e+1";
|
||||||
|
on-scroll-up = "hyprctl dispatch workspace e-1";
|
||||||
|
persistent-workspaces."*" = [1 2 3 4];
|
||||||
|
cursor = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
battery = {
|
||||||
|
bat = "BAT1";
|
||||||
|
interval = 20;
|
||||||
|
full-at = 100;
|
||||||
|
tooltip = true;
|
||||||
|
format-full = "";
|
||||||
|
format = "{icon} ";
|
||||||
|
format-charging = " {icon} ";
|
||||||
|
format-icons = ["" "" "" "" ""];
|
||||||
|
tooltip-format = "{capacity}% · {time}";
|
||||||
|
tooltip-format-full = "Full\n{capacity}%";
|
||||||
|
tooltip-format-charging = "Charging\n{capacity}% · {time}";
|
||||||
|
states = {
|
||||||
|
warning = 30;
|
||||||
|
critical = 15;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
"custom/bluetooth" = {
|
||||||
|
exec = "${bluetoothScript}";
|
||||||
|
exec-if = "bluetoothctl show 2>/dev/null | grep -q Controller";
|
||||||
|
return-type = "json";
|
||||||
|
interval = 5;
|
||||||
|
on-click-right = "blueman-manager &";
|
||||||
|
on-click = "bluetooth-toggle";
|
||||||
|
};
|
||||||
|
|
||||||
|
"custom/osd" = {
|
||||||
|
exec = "cat /tmp/waybar-osd";
|
||||||
|
exec-if = "test -f /tmp/waybar-osd";
|
||||||
|
signal = 8;
|
||||||
|
interval = "once";
|
||||||
|
format = "{}";
|
||||||
|
};
|
||||||
|
|
||||||
|
"custom/osd-sep" = {
|
||||||
|
exec = "echo '|'";
|
||||||
|
exec-if = "test -f /tmp/waybar-osd";
|
||||||
|
signal = 8;
|
||||||
|
interval = "once";
|
||||||
|
format = "{}";
|
||||||
|
tooltip = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
pulseaudio = {
|
||||||
|
format = "{icon}";
|
||||||
|
format-bluetooth = "{icon}";
|
||||||
|
tooltip-format = "{volume}%";
|
||||||
|
format-muted = "<span size='12pt'></span>";
|
||||||
|
scroll-step = 2;
|
||||||
|
on-click = "vol-mute";
|
||||||
|
on-click-right = "pavucontrol -t 4 &";
|
||||||
|
format-icons = {
|
||||||
|
headphone = "";
|
||||||
|
hands-free = "";
|
||||||
|
headset = "";
|
||||||
|
phone = "";
|
||||||
|
portable = "";
|
||||||
|
car = "";
|
||||||
|
default = [
|
||||||
|
""
|
||||||
|
""
|
||||||
|
""
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
"pulseaudio/slider" = {
|
||||||
|
min = 0;
|
||||||
|
max = 100;
|
||||||
|
cursor = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
"custom/network" = {
|
||||||
|
exec = "${networkScript}";
|
||||||
|
return-type = "json";
|
||||||
|
interval = 10;
|
||||||
|
on-click-right = "ghostty -e wifitui &";
|
||||||
|
};
|
||||||
|
|
||||||
|
tray = {
|
||||||
|
icon-size = 13;
|
||||||
|
spacing = 12;
|
||||||
|
cursor = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
clock = {
|
||||||
|
timezone = config.var.timeZone;
|
||||||
|
tooltip-format = "<tt><small>{calendar}</small></tt>";
|
||||||
|
format = "{:%H:%M}";
|
||||||
|
format-alt = "{:%H:%M %d %B %Y}";
|
||||||
|
calendar = {
|
||||||
|
mode = "month";
|
||||||
|
format = {
|
||||||
|
months = "<span color='#${c.base04}'><b>{}</b></span>";
|
||||||
|
weekdays = "<span color='#${c.base0A}'><b>{}</b></span>";
|
||||||
|
days = "<span color='#${c.base05}'>{}</span>";
|
||||||
|
today = "<span color='#${c.base0D}'><b><u>{}</u></b></span>";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
"custom/arrow-left" = {
|
||||||
|
format = " ";
|
||||||
|
tooltip = false;
|
||||||
|
cursor = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
"custom/arrow-right" = {
|
||||||
|
format = " ";
|
||||||
|
tooltip = false;
|
||||||
|
cursor = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -0,0 +1,155 @@
|
|||||||
|
{config, ...}: let
|
||||||
|
c = config.lib.stylix.colors;
|
||||||
|
fg = "#${c.base05}";
|
||||||
|
module-bg = "#${c.base01}";
|
||||||
|
tooltip-bg = "#${c.base01}";
|
||||||
|
red = "#${c.base08}";
|
||||||
|
yellow = "#${c.base0A}";
|
||||||
|
green = "#${c.base0B}";
|
||||||
|
blue = "#${c.base0D}";
|
||||||
|
cyan = "#${c.base0C}";
|
||||||
|
inactive = "#${c.base03}";
|
||||||
|
highlight = "#${c.base02}";
|
||||||
|
font-size = "${toString config.stylix.fonts.sizes.applications}px";
|
||||||
|
font-size-clock = "${toString (config.stylix.fonts.sizes.applications + 2)}px";
|
||||||
|
module-padding = "14px";
|
||||||
|
in {
|
||||||
|
programs.waybar.style = ''
|
||||||
|
* {
|
||||||
|
font-family: '${config.stylix.fonts.sansSerif.name}';
|
||||||
|
border: none;
|
||||||
|
border-radius: 0;
|
||||||
|
min-height: 0;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
text-shadow: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#waybar {
|
||||||
|
font-weight: 700;
|
||||||
|
background: transparent;
|
||||||
|
font-size: ${font-size};
|
||||||
|
color: ${fg};
|
||||||
|
}
|
||||||
|
|
||||||
|
.modules-center {
|
||||||
|
background: ${module-bg};
|
||||||
|
border-radius: 100px;
|
||||||
|
padding: 6px 14px;
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#clock,
|
||||||
|
#battery,
|
||||||
|
#tray,
|
||||||
|
#workspaces,
|
||||||
|
#custom-osd,
|
||||||
|
#custom-network,
|
||||||
|
#custom-bluetooth {
|
||||||
|
padding: 1px ${module-padding};
|
||||||
|
}
|
||||||
|
|
||||||
|
#custom-osd-sep {
|
||||||
|
padding: 0;
|
||||||
|
color: ${inactive};
|
||||||
|
}
|
||||||
|
|
||||||
|
#clock {
|
||||||
|
font-size: ${font-size-clock};
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button {
|
||||||
|
color: ${fg};
|
||||||
|
font-size: ${font-size};
|
||||||
|
border-radius: 100px;
|
||||||
|
padding: 0 3px;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button.empty {
|
||||||
|
color: ${inactive};
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button:hover {
|
||||||
|
background: transparent;
|
||||||
|
color: ${fg};
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button.active {
|
||||||
|
color: ${module-bg};
|
||||||
|
background: ${blue};
|
||||||
|
border-radius: 60px;
|
||||||
|
padding: 0 8px;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#battery {
|
||||||
|
color: ${green};
|
||||||
|
}
|
||||||
|
|
||||||
|
#battery.charging,
|
||||||
|
#battery.full {
|
||||||
|
color: ${green};
|
||||||
|
}
|
||||||
|
|
||||||
|
#battery.critical,
|
||||||
|
#custom-network.disconnected {
|
||||||
|
color: ${red};
|
||||||
|
}
|
||||||
|
|
||||||
|
#battery.warning {
|
||||||
|
color: ${yellow};
|
||||||
|
}
|
||||||
|
|
||||||
|
#custom-network.ethernet,
|
||||||
|
#custom-network.wifi {
|
||||||
|
color: ${cyan};
|
||||||
|
}
|
||||||
|
|
||||||
|
#custom-bluetooth {
|
||||||
|
color: ${blue};
|
||||||
|
}
|
||||||
|
|
||||||
|
#custom-bluetooth.off {
|
||||||
|
color: ${inactive};
|
||||||
|
}
|
||||||
|
|
||||||
|
#custom-osd {
|
||||||
|
font-weight: 700;
|
||||||
|
color: ${fg};
|
||||||
|
}
|
||||||
|
|
||||||
|
tooltip {
|
||||||
|
border-radius: 15px;
|
||||||
|
background: ${tooltip-bg};
|
||||||
|
}
|
||||||
|
|
||||||
|
tooltip label {
|
||||||
|
padding: 3px 10px;
|
||||||
|
color: ${fg};
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.popup * {
|
||||||
|
box-shadow: none;
|
||||||
|
outline: none;
|
||||||
|
border-radius: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
menu {
|
||||||
|
border-radius: 10px;
|
||||||
|
font-weight: 700;
|
||||||
|
color: ${fg};
|
||||||
|
background: ${tooltip-bg};
|
||||||
|
}
|
||||||
|
|
||||||
|
menu > * {
|
||||||
|
padding: 3px 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
menu > *:hover {
|
||||||
|
border-radius: 10px;
|
||||||
|
background-color: ${highlight};
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
}
|
||||||
@@ -8,10 +8,12 @@
|
|||||||
../../nixos/home-manager.nix
|
../../nixos/home-manager.nix
|
||||||
../../nixos/nix.nix
|
../../nixos/nix.nix
|
||||||
../../nixos/systemd-boot.nix
|
../../nixos/systemd-boot.nix
|
||||||
../../nixos/sddm.nix
|
../../nixos/tuigreet.nix
|
||||||
../../nixos/users.nix
|
../../nixos/users.nix
|
||||||
../../nixos/utils.nix
|
../../nixos/utils.nix
|
||||||
../../nixos/hyprland.nix
|
../../nixos/hyprland.nix
|
||||||
|
../../nixos/usbguard.nix
|
||||||
|
../../home/programs/helium/system.nix # I hate browser's configuration..
|
||||||
|
|
||||||
../../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,8 +22,37 @@
|
|||||||
./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 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 1d6b:0002 serial "0000:05:00.4" name "xHCI Host Controller" hash "icotY3rI59mWiKsGxc59BGZZeBjfbuH0b4NUByj3cbQ=" parent-hash "tHvBfznK5rpQn+oa0PEEjHa29EAEvGyCcZixsfwA6W0=" with-interface 09:00:00 with-connect-type ""
|
||||||
|
allow id 1d6b:0003 serial "0000:05:00.4" name "xHCI Host Controller" hash "UbEoCZW8HT2ldc3qDeiK+IiQlGeaBC7F63681OwmKhI=" parent-hash "tHvBfznK5rpQn+oa0PEEjHa29EAEvGyCcZixsfwA6W0=" with-interface 09:00:00 with-connect-type ""
|
||||||
|
allow id 1d6b:0002 serial "0000:07:00.3" name "xHCI Host Controller" hash "pz29Oo0RhQ+5+7LgOZR4v3OlcsVv3m9kCgGsGUnoUjI=" parent-hash "DRyV2/31MYHdzkIEfbPQeb/1w4/PjOW6GqWrXkftf2I=" with-interface 09:00:00 with-connect-type ""
|
||||||
|
allow id 1d6b:0003 serial "0000:07:00.3" name "xHCI Host Controller" hash "O6iOpcl9StImWT62SrbeXacqbG6N/mTIipTRc0ipCGM=" parent-hash "DRyV2/31MYHdzkIEfbPQeb/1w4/PjOW6GqWrXkftf2I=" with-interface 09:00:00 with-connect-type ""
|
||||||
|
allow id 1d6b:0002 serial "0000:07:00.4" name "xHCI Host Controller" hash "Hp8B0Enf+ACRT2tyy0EqXj7eNsFDAnTRZadzuh/Iqd4=" parent-hash "l2vhvC+VGVKlkBUUK/usFu8jHJ/5bWOnJG6WzRexpt4=" with-interface 09:00:00 with-connect-type ""
|
||||||
|
allow id 1d6b:0003 serial "0000:07:00.4" name "xHCI Host Controller" hash "rJ3LKdvkCK3SUrCU3lV8qVbmPjA+r9Fe5106x2HlgK4=" parent-hash "l2vhvC+VGVKlkBUUK/usFu8jHJ/5bWOnJG6WzRexpt4=" 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=" via-port "7-1" 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=" via-port "8-1" 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=" via-port "7-1.3" 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=" via-port "8-1.3" 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 1532:02a1 serial "" name "Razer Ornata V3" hash "wfuIjBhhGuge8gflyA526SKqKoy8rHJZQZ+2o6usMiE=" parent-hash "MSXcPAlZqkpTyZQylOhSIB8eMfST2AzVHV9EbrBGTWc=" via-port "7-1.3.3" with-interface { 03:01:01 03:00:01 03:00:02 } with-connect-type "unknown"
|
||||||
|
allow id 13fd:5900 serial "50026B76861EE752 " name "External" hash "l/QvVV5hzZj1z6OUwB/kWl+WnH/7awrdMBoiNVx660M=" parent-hash "MSXcPAlZqkpTyZQylOhSIB8eMfST2AzVHV9EbrBGTWc=" 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
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "26.05";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
inputs,
|
||||||
|
nixpkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
nixpkgs.lib.nixosSystem {
|
||||||
|
modules = [
|
||||||
|
{
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
inputs.nur.overlays.default
|
||||||
|
];
|
||||||
|
_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
|
||||||
|
inputs.helium-browser.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 = [];
|
||||||
|
|||||||
+25
-9
@@ -1,7 +1,7 @@
|
|||||||
{config, ...}: {
|
{config, ...}: {
|
||||||
imports = [
|
imports = [
|
||||||
# Programs
|
# Programs
|
||||||
../../home/programs/brave
|
../../home/programs/helium
|
||||||
../../home/programs/proton
|
../../home/programs/proton
|
||||||
../../home/programs/proton/auto-start-vpn.nix
|
../../home/programs/proton/auto-start-vpn.nix
|
||||||
../../home/programs/ghostty
|
../../home/programs/ghostty
|
||||||
@@ -10,12 +10,12 @@
|
|||||||
../../home/programs/git
|
../../home/programs/git
|
||||||
../../home/programs/git/lazygit.nix
|
../../home/programs/git/lazygit.nix
|
||||||
../../home/programs/git/signing.nix # CHANGEME: Change the key or remove this file
|
../../home/programs/git/signing.nix # CHANGEME: Change the key or remove this file
|
||||||
../../home/programs/spicetify
|
|
||||||
../../home/programs/thunar
|
../../home/programs/thunar
|
||||||
../../home/programs/nixy
|
../../home/programs/nixy
|
||||||
../../home/programs/nightshift
|
|
||||||
../../home/programs/qutebrowser
|
|
||||||
../../home/programs/nix-utils
|
../../home/programs/nix-utils
|
||||||
|
../../home/programs/spotatui
|
||||||
|
../../home/programs/yazi
|
||||||
|
../../home/programs/desktop-actions # TODO:
|
||||||
|
|
||||||
../../home/programs/group/basic-apps.nix
|
../../home/programs/group/basic-apps.nix
|
||||||
../../home/programs/group/cybersecurity.nix
|
../../home/programs/group/cybersecurity.nix
|
||||||
@@ -23,9 +23,12 @@
|
|||||||
../../home/programs/group/misc.nix
|
../../home/programs/group/misc.nix
|
||||||
|
|
||||||
# System (Desktop environment like stuff)
|
# System (Desktop environment like stuff)
|
||||||
|
../../home/system/hyprlock
|
||||||
../../home/system/hyprland
|
../../home/system/hyprland
|
||||||
../../home/system/caelestia-shell
|
../../home/system/waybar
|
||||||
../../home/system/hyprpaper
|
../../home/system/swaync
|
||||||
|
../../home/system/swayosd
|
||||||
|
../../home/system/tofi
|
||||||
../../home/system/mime
|
../../home/system/mime
|
||||||
../../home/system/udiskie
|
../../home/system/udiskie
|
||||||
|
|
||||||
@@ -36,15 +39,28 @@
|
|||||||
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
|
||||||
};
|
};
|
||||||
|
|
||||||
# Don't touch this
|
# Don't touch this
|
||||||
stateVersion = "24.05";
|
stateVersion = "26.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;
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
{
|
{
|
||||||
inputs,
|
inputs,
|
||||||
pkgs,
|
pkgs,
|
||||||
|
lib,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
@@ -14,11 +15,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 +53,12 @@ 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
|
||||||
|
|||||||
@@ -5,20 +5,16 @@
|
|||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
# Choose your theme here:
|
# Choose your theme here:
|
||||||
../../themes/darkviolet.nix
|
../../themes/nixy.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
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";
|
||||||
|
|
||||||
location = "Paris";
|
|
||||||
timeZone = "Europe/Paris";
|
timeZone = "Europe/Paris";
|
||||||
defaultLocale = "en_US.UTF-8";
|
defaultLocale = "en_US.UTF-8";
|
||||||
extraLocale = "fr_FR.UTF-8";
|
extraLocale = "fr_FR.UTF-8";
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
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.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;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
../../home/programs/git/lazygit.nix
|
../../home/programs/git/lazygit.nix
|
||||||
../../home/programs/nixy
|
../../home/programs/nixy
|
||||||
../../home/programs/nix-utils
|
../../home/programs/nix-utils
|
||||||
|
../../home/programs/yazi
|
||||||
|
|
||||||
../../home/programs/group/dev.nix
|
../../home/programs/group/dev.nix
|
||||||
];
|
];
|
||||||
@@ -23,4 +24,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
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,20 +5,16 @@
|
|||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
# Choose your theme here:
|
# Choose your theme here:
|
||||||
../../themes/rose-pine.nix
|
../../themes/nixy.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
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";
|
||||||
|
|
||||||
location = "Paris";
|
|
||||||
timeZone = "Europe/Paris";
|
timeZone = "Europe/Paris";
|
||||||
defaultLocale = "en_US.UTF-8";
|
defaultLocale = "en_US.UTF-8";
|
||||||
extraLocale = "fr_FR.UTF-8";
|
extraLocale = "fr_FR.UTF-8";
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
{config, ...}: {
|
||||||
|
imports = [
|
||||||
|
# Mostly system related configuration
|
||||||
|
../../nixos/audio.nix
|
||||||
|
../../nixos/fonts.nix
|
||||||
|
../../nixos/home-manager.nix
|
||||||
|
../../nixos/nix.nix
|
||||||
|
../../nixos/systemd-boot.nix
|
||||||
|
../../nixos/tuigreet.nix
|
||||||
|
../../nixos/usbguard.nix
|
||||||
|
../../nixos/users.nix
|
||||||
|
../../nixos/utils.nix
|
||||||
|
../../nixos/hyprland.nix
|
||||||
|
../../home/programs/helium/system.nix # I hate browser's configuration..
|
||||||
|
|
||||||
|
# You should let those lines as is
|
||||||
|
./hardware-configuration.nix
|
||||||
|
./variables.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
home-manager.users."${config.var.username}" = import ./home.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 1d6b:0002 serial "0000:00:14.0" name "xHCI Host Controller" hash "jEP/6WzviqdJ5VSeTUY8PatCNBKeaREvo2OqdplND/o=" parent-hash "rV9bfLq7c2eA4tYjVjwO4bxhm+y6GgZpl9J60L0fBkY=" with-interface 09:00:00 with-connect-type ""
|
||||||
|
allow id 1d6b:0003 serial "0000:00:14.0" name "xHCI Host Controller" hash "prM+Jby/bFHCn2lNjQdAMbgc6tse3xVx+hZwjOPHSdQ=" parent-hash "rV9bfLq7c2eA4tYjVjwO4bxhm+y6GgZpl9J60L0fBkY=" with-interface 09:00:00 with-connect-type ""
|
||||||
|
allow id 17ef:608d serial "" name "Lenovo USB Optical Mouse" hash "klpDZuv1jhWGNqZLOl+KXF+75Ir3PfBm6D6ncjoLRBU=" parent-hash "jEP/6WzviqdJ5VSeTUY8PatCNBKeaREvo2OqdplND/o=" via-port "1-7" with-interface 03:01:02 with-connect-type "hotplug"
|
||||||
|
allow id 17ef:6190 serial "" name "Lenovo Calliope USB Keyboard G2" hash "CfZ9R/aoXGm7BN/ojVEzKQwVoxCUtRWMuACrE7BL/5Y=" parent-hash "jEP/6WzviqdJ5VSeTUY8PatCNBKeaREvo2OqdplND/o=" via-port "1-10" with-interface { 03:01:01 03:00:00 } with-connect-type "hotplug"
|
||||||
|
allow id 0781:5581 name " SanDisk 3.2Gen1"
|
||||||
|
'';
|
||||||
|
|
||||||
|
networking.firewall.allowedTCPPorts = [9001];
|
||||||
|
|
||||||
|
# Don't touch this
|
||||||
|
system.stateVersion = "24.05";
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
inputs,
|
||||||
|
nixpkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
nixpkgs.lib.nixosSystem {
|
||||||
|
modules = [
|
||||||
|
{
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
inputs.nur.overlays.default
|
||||||
|
];
|
||||||
|
_module.args = {inherit inputs;};
|
||||||
|
}
|
||||||
|
inputs.home-manager.nixosModules.home-manager
|
||||||
|
inputs.stylix.nixosModules.stylix
|
||||||
|
inputs.nix-index-database.nixosModules.default
|
||||||
|
inputs.helium-browser.nixosModules.default
|
||||||
|
./configuration.nix
|
||||||
|
];
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user