firefox: add addons per nix

This commit is contained in:
DashieTM 2024-05-25 14:26:39 +02:00
parent 1f76c7359e
commit a5226f566e
14 changed files with 422 additions and 241 deletions

221
nix/flake.lock generated
View file

@ -84,7 +84,7 @@
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"oxicalc",
"hyprdock",
"nixpkgs"
]
},
@ -105,7 +105,7 @@
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"oxidash",
"oxicalc",
"nixpkgs"
]
},
@ -126,7 +126,7 @@
"flake-parts_4": {
"inputs": {
"nixpkgs-lib": [
"oxinoti",
"oxidash",
"nixpkgs"
]
},
@ -147,7 +147,7 @@
"flake-parts_5": {
"inputs": {
"nixpkgs-lib": [
"oxipaste",
"oxinoti",
"nixpkgs"
]
},
@ -168,7 +168,7 @@
"flake-parts_6": {
"inputs": {
"nixpkgs-lib": [
"oxishut",
"oxipaste",
"nixpkgs"
]
},
@ -187,6 +187,27 @@
}
},
"flake-parts_7": {
"inputs": {
"nixpkgs-lib": [
"oxishut",
"nixpkgs"
]
},
"locked": {
"lastModified": 1715865404,
"narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_8": {
"inputs": {
"nixpkgs-lib": [
"reset",
@ -335,11 +356,30 @@
"type": "github"
}
},
"hyprdock": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1716453478,
"narHash": "sha256-EoKGnKvYKoe9geFoK0wyEAMTPGOfRtjXibt4GUCfvBA=",
"owner": "DashieTM",
"repo": "hyprdock",
"rev": "8d07dbdf446e6b21528cc994547cc8f173a70330",
"type": "github"
},
"original": {
"owner": "DashieTM",
"repo": "hyprdock",
"type": "github"
}
},
"ironbar": {
"inputs": {
"crane": "crane",
"naersk": "naersk",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_4",
"rust-overlay": "rust-overlay"
},
"locked": {
@ -358,7 +398,7 @@
},
"naersk": {
"inputs": {
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1713520724,
@ -422,6 +462,22 @@
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1706487304,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "90f456026d284c22b3e3497be980b2e47d0b28ac",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1716137900,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
@ -437,7 +493,7 @@
"type": "github"
}
},
"nixpkgs_11": {
"nixpkgs_12": {
"locked": {
"lastModified": 1716190602,
"narHash": "sha256-xYRimrR0duWvokWQEvB87bSsICeCvvX9DxpUOzCfsDE=",
@ -453,7 +509,7 @@
"type": "github"
}
},
"nixpkgs_12": {
"nixpkgs_13": {
"locked": {
"lastModified": 1716137900,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
@ -469,23 +525,23 @@
"type": "github"
}
},
"nixpkgs_13": {
"locked": {
"lastModified": 1706487304,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "90f456026d284c22b3e3497be980b2e47d0b28ac",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_14": {
"locked": {
"lastModified": 1706487304,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "90f456026d284c22b3e3497be980b2e47d0b28ac",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_15": {
"locked": {
"lastModified": 1716137900,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
@ -501,7 +557,7 @@
"type": "github"
}
},
"nixpkgs_15": {
"nixpkgs_16": {
"locked": {
"lastModified": 1706487304,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
@ -517,7 +573,7 @@
"type": "github"
}
},
"nixpkgs_16": {
"nixpkgs_17": {
"locked": {
"lastModified": 1716062047,
"narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=",
@ -534,6 +590,22 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1716330097,
"narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1714314149,
"narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=",
@ -547,7 +619,7 @@
"type": "indirect"
}
},
"nixpkgs_3": {
"nixpkgs_4": {
"locked": {
"lastModified": 1714253743,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
@ -563,7 +635,7 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_5": {
"locked": {
"lastModified": 1716293225,
"narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=",
@ -579,22 +651,6 @@
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1716137900,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1716137900,
@ -612,6 +668,22 @@
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1716137900,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1706487304,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
@ -627,7 +699,7 @@
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_9": {
"locked": {
"lastModified": 1716137900,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
@ -643,26 +715,25 @@
"type": "github"
}
},
"nixpkgs_9": {
"nur": {
"locked": {
"lastModified": 1706487304,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "90f456026d284c22b3e3497be980b2e47d0b28ac",
"lastModified": 1716637573,
"narHash": "sha256-i7KOcVGJE3oRvjF4r45/GvbrKHaxtSc4K9DCJ+DR9DQ=",
"owner": "nix-community",
"repo": "nur",
"rev": "a619ed4c9346515d8a9665cd3d44909944a1fc8e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"owner": "nix-community",
"repo": "nur",
"type": "github"
}
},
"oxicalc": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_5"
"flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1716225554,
@ -680,8 +751,8 @@
},
"oxidash": {
"inputs": {
"flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_6",
"flake-parts": "flake-parts_4",
"nixpkgs": "nixpkgs_7",
"rust-overlay": "rust-overlay_2"
},
"locked": {
@ -700,8 +771,8 @@
},
"oxinoti": {
"inputs": {
"flake-parts": "flake-parts_4",
"nixpkgs": "nixpkgs_8",
"flake-parts": "flake-parts_5",
"nixpkgs": "nixpkgs_9",
"rust-overlay": "rust-overlay_3"
},
"locked": {
@ -720,8 +791,8 @@
},
"oxipaste": {
"inputs": {
"flake-parts": "flake-parts_5",
"nixpkgs": "nixpkgs_10",
"flake-parts": "flake-parts_6",
"nixpkgs": "nixpkgs_11",
"rust-overlay": "rust-overlay_4"
},
"locked": {
@ -740,8 +811,8 @@
},
"oxishut": {
"inputs": {
"flake-parts": "flake-parts_6",
"nixpkgs": "nixpkgs_12",
"flake-parts": "flake-parts_7",
"nixpkgs": "nixpkgs_13",
"rust-overlay": "rust-overlay_5"
},
"locked": {
@ -760,8 +831,8 @@
},
"reset": {
"inputs": {
"flake-parts": "flake-parts_7",
"nixpkgs": "nixpkgs_14",
"flake-parts": "flake-parts_8",
"nixpkgs": "nixpkgs_15",
"rust-overlay": "rust-overlay_6"
},
"locked": {
@ -783,9 +854,11 @@
"Hyprspace": "Hyprspace",
"anyrun": "anyrun",
"home-manager": "home-manager",
"hyprdock": "hyprdock",
"ironbar": "ironbar",
"nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_5",
"nur": "nur",
"oxicalc": "oxicalc",
"oxidash": "oxidash",
"oxinoti": "oxinoti",
@ -820,7 +893,7 @@
"rust-overlay_2": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_7"
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1716171463,
@ -839,7 +912,7 @@
"rust-overlay_3": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_9"
"nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1716171463,
@ -858,7 +931,7 @@
"rust-overlay_4": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_11"
"nixpkgs": "nixpkgs_12"
},
"locked": {
"lastModified": 1716171463,
@ -877,7 +950,7 @@
"rust-overlay_5": {
"inputs": {
"flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_13"
"nixpkgs": "nixpkgs_14"
},
"locked": {
"lastModified": 1716171463,
@ -896,7 +969,7 @@
"rust-overlay_6": {
"inputs": {
"flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_15"
"nixpkgs": "nixpkgs_16"
},
"locked": {
"lastModified": 1716171463,
@ -914,7 +987,7 @@
},
"sops-nix": {
"inputs": {
"nixpkgs": "nixpkgs_16",
"nixpkgs": "nixpkgs_17",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {

View file

@ -22,6 +22,11 @@
inputs.hyprland.follows = "nixpkgs";
};
nur.url = "github:nix-community/nur";
# hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
# hyprland.url = "git+https://github.com/hyprwm/Hyprland?rev=2f1735bd93adb9e153758cd4171d8fd3ae610357";
# hyprland.url = "github:hyprwm/Hyprland/xwayland-rewrite?submodules=1";
ironbar = {
url = "github:JakeStanger/ironbar";
};
@ -32,6 +37,7 @@
oxinoti.url = "github:DashieTM/OxiNoti";
oxidash.url = "github:DashieTM/OxiDash";
oxipaste.url = "github:DashieTM/OxiPaste";
hyprdock.url = "github:DashieTM/hyprdock";
reset.url = "github:Xetibo/ReSet";
};
@ -39,6 +45,9 @@
let
pkgs = import inputs.nixpkgs {
system = "x86_64-linux";
overlays = [
inputs.nur.overlay
];
config = {
allowUnfree = true;
};

View file

@ -13,4 +13,5 @@
programs.ironbar.battery = [
{ type = "upower"; class = "memory-usage"; }
];
programs.hyprland.extra_autostart = [ "hyprdock --server" ];
}

View file

@ -13,4 +13,7 @@
programs.boot.boot_params = [ "rtc_cmos.use_acpi_alarm=1" ];
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
# for hyprdock
services.acpid.enable = true;
}

View file

@ -21,6 +21,7 @@
# cpp
bear
clang-tools
#sql
nodePackages.sql-formatter

View file

@ -15,7 +15,6 @@ in
home.packages = with pkgs; [
vesktop
kitty
firefox
fish
ripgrep
rm-improved
@ -49,6 +48,7 @@ in
greetd.regreet
sops
flake-checker
ffmpeg
(callPackage
../override/streamdeck.nix
{ })
@ -63,8 +63,11 @@ in
programs.oxidash.enable = true;
programs.oxishut.enable = true;
programs.oxipaste.enable = true;
programs.hyprdock.enable = true;
programs.reset.enable = true;
nixpkgs.config.allowUnfree = true;
home.username = "dashie";
home.homeDirectory = "/home/dashie";
home.stateVersion = "24.05";

View file

@ -8,6 +8,8 @@ let
inputs.oxinoti.homeManagerModules.default
inputs.oxidash.homeManagerModules.default
inputs.oxipaste.homeManagerModules.default
inputs.hyprdock.homeManagerModules.default
# inputs.hyprland.homeManagerModules.default
inputs.reset.homeManagerModules.default
inputs.nix-flatpak.homeManagerModules.nix-flatpak
inputs.sops-nix.homeManagerModules.sops

View file

@ -30,6 +30,7 @@
"$mod SUPER,G,exec,oxicalc"
"$mod SUPER,D,exec,oxishut"
"$mod SUPER,A,exec,oxipaste"
"$mod SUPERSHIFT,P,exec,hyprdock --gui"
"$mod SUPERSHIFT,L,exec, playerctl -a pause & hyprlock & systemctl suspend"
"$mod SUPERSHIFT,K,exec, playerctl -a pause & hyprlock & systemctl hibernate"
@ -242,8 +243,6 @@
"ironbar"
"firefox"
"oxipaste_daemon"
# TODO: is this necessary?
#"/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1"
"nextcloud --background"
"oxinoti"
] ++ config.programs.hyprland.extra_autostart;

View file

@ -7,5 +7,7 @@
./ssh.nix
./direnv.nix
./git.nix
./firefox.nix
./keepass.nix
];
}

View file

@ -0,0 +1,29 @@
{ inputs, pkgs, ... }: {
programs.firefox = {
enable = true;
policies = {
EnableTrackingProtection = {
Value = true;
Locked = true;
Cryptomining = true;
Fingerprinting = true;
};
DisablePocket = true;
DisplayBookmarksToolbar = "never";
DisplayMenuBar = "default-off";
};
profiles.dashie = {
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
ublock-origin
darkreader
privacy-badger
vimium
keepassxc-browser
i-dont-care-about-cookies
tokyo-night-v2
];
};
};
}

View file

@ -0,0 +1,26 @@
{
xdg.configFile."keepassxc/keepassxc.ini" = {
text =
''
[General]
ConfigVersion=2
[Browser]
CustomProxyLocation=
Enabled=true
[GUI]
ApplicationTheme=classic
HidePasswords=true
TrayIconAppearance=monochrome-light
[PasswordGenerator]
AdditionalChars=
ExcludedChars=
Length=18
[Security]
EnableCopyOnDoubleClick=true
'';
};
}

View file

@ -28,6 +28,7 @@ vim.g.mkdp_auto_start = 1
vim.g.loaded_netrw = 1
vim.g.loaded_netrwPlugin = 1
vim.g.autoformat = false
for k, v in pairs(options) do
vim.opt[k] = v
end

View file

@ -5,7 +5,22 @@ return {
{
"neovim/nvim-lspconfig",
---@class PluginLspOpts
opts = {
opts = function(_, opts)
local path = vim.fn.stdpath("config") .. "/spell/ltex.dictionary.en-US.txt"
local words = {}
local file, err = io.open(path, "r")
if err ~= nil then
os.execute("mkdir " .. vim.fn.stdpath("config") .. "/spell")
file = io.open(path, "w")
file:write("")
file:close()
file = io.open(path, "r")
end
for word in file:lines() do
table.insert(words, word)
end
local new_opts = {
format_notify = false,
-- LSP Server Settings
---@type lspconfig.options
@ -123,6 +138,9 @@ return {
settings = {
ltex = {
checkFrequency = "save",
dictionary = {
["en-US"] = words,
},
},
},
filetypes = {
@ -137,6 +155,7 @@ return {
"pandoc",
"typst",
"typ",
"text",
},
mason = false,
},
@ -177,7 +196,9 @@ return {
},
},
},
},
}
return vim.tbl_deep_extend("keep", new_opts, opts)
end,
init = function()
local keys = require("lazyvim.plugins.lsp.keymaps").get()
local my_keys = require("config.lsp-keymap").get()

View file

@ -281,4 +281,15 @@ return {
},
{ "akinsho/git-conflict.nvim", version = "*", config = true },
{ "Hoffs/omnisharp-extended-lsp.nvim" },
{
"barreiroleo/ltex_extra.nvim",
branch = "dev",
ft = { "markdown", "tex", "typst", "typ", "text" },
config = function()
require("ltex_extra").setup({
load_langs = { "en-US" },
path = vim.fn.stdpath("config") .. "/spell",
})
end,
},
}