diff --git a/flake.lock b/flake.lock index 4efd383..ac6300b 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "catppuccin-bat": { "flake": false, "locked": { - "lastModified": 1729267055, - "narHash": "sha256-x1yqPCWuoBSx/cI94eA+AWwhiSA42cLNUOFJl7qjhmw=", + "lastModified": 1734996624, + "narHash": "sha256-6fWoCH90IGumAMc4buLRWL0N61op+AuMNN9CAR9/OdI=", "owner": "catppuccin", "repo": "bat", - "rev": "d2bbee4f7e7d5bac63c054e4d8eca57954b31471", + "rev": "699f60fc8ec434574ca7451b444b880430319941", "type": "github" }, "original": { @@ -48,6 +48,29 @@ "type": "github" } }, + "firefox-addons": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "dir": "pkgs/firefox-addons", + "lastModified": 1739786038, + "narHash": "sha256-L2MJfl7uOwItCNNn43AqOSDqVSfVqHy0VeAVwsmu2m8=", + "owner": "rycee", + "repo": "nur-expressions", + "rev": "017212503164634aa014b8064dfbf48c47f744a4", + "type": "gitlab" + }, + "original": { + "dir": "pkgs/firefox-addons", + "owner": "rycee", + "repo": "nur-expressions", + "type": "gitlab" + } + }, "fjordlauncher": { "inputs": { "flake-compat": "flake-compat", @@ -56,11 +79,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1733005766, - "narHash": "sha256-GfjY/cCstUaifv/KWJjApLCBF3NjkP4SZ8CIZZ5Upbo=", + "lastModified": 1739753159, + "narHash": "sha256-noRrq1VtZqHOWGutXzUU20AcgPTA2t06PqYXbXZJ2E0=", "owner": "unmojang", "repo": "FjordLauncher", - "rev": "687934433423b9d7c1014867f66f2bc73bd57c91", + "rev": "ec0baa6a1e701339c39fd51ef8db6e48f1ce91b2", "type": "github" }, "original": { @@ -72,11 +95,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1732722421, - "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -106,6 +129,21 @@ "type": "github" } }, + "flake-utils": { + "locked": { + "lastModified": 1629284811, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -113,11 +151,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { @@ -132,11 +170,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1733056338, - "narHash": "sha256-sp14z0mrqrtmouz1+bU4Jh8/0xi+xwQHF2l7mhGSSVU=", + "lastModified": 1739465511, + "narHash": "sha256-kXdVW89VJoG+W6N1u0m8hgK2VIWUAweQVzehRZwdNSo=", "owner": "hyprwm", "repo": "contrib", - "rev": "d7c55140f1785b8d9fef351f1cd2a4c9e1eaa466", + "rev": "59178a657b7e09ddf82b9e79681f482b6c2f378b", "type": "github" }, "original": { @@ -178,11 +216,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -194,11 +232,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1739580444, + "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "8bb37161a0488b89830168b81c48aed11569cb93", "type": "github" }, "original": { @@ -226,11 +264,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1734875076, - "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "lastModified": 1739624908, + "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1807c2b91223227ad5599d7067a61665c52d1295", + "rev": "a60651b217d2e529729cbc7d989c19f3941b9250", "type": "github" }, "original": { @@ -242,11 +280,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1739580444, + "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "8bb37161a0488b89830168b81c48aed11569cb93", "type": "github" }, "original": { @@ -263,11 +301,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734967981, - "narHash": "sha256-KIuQ0VsT710KKVFRKHzBv2aJ0OrvyJA8m/9wMRRoj/Q=", + "lastModified": 1739782361, + "narHash": "sha256-xd5HJX9ZW2MkKpCrnBVl/9EtwhnEQLDQaVYSjzCbtKE=", "owner": "nix-community", "repo": "NUR", - "rev": "7319b75ff769a1ff0917afde77650110bc441377", + "rev": "5dfbce41e737044067e52cdf44dd2c42fbbcf64e", "type": "github" }, "original": { @@ -281,6 +319,7 @@ "catppuccin-bat": "catppuccin-bat", "catppuccin-cava": "catppuccin-cava", "catppuccin-starship": "catppuccin-starship", + "firefox-addons": "firefox-addons", "fjordlauncher": "fjordlauncher", "home-manager": "home-manager", "hypr-contrib": "hypr-contrib", diff --git a/flake.nix b/flake.nix index eeb9582..970c3e9 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,11 @@ nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nur.url = "github:nix-community/NUR"; + firefox-addons = { + url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + hypr-contrib.url = "github:hyprwm/contrib"; fjordlauncher.url = "github:unmojang/FjordLauncher"; diff --git a/modules/home/browsers/default.nix b/modules/home/browsers/default.nix new file mode 100644 index 0000000..397d431 --- /dev/null +++ b/modules/home/browsers/default.nix @@ -0,0 +1,10 @@ +{...}: { + imports = [(import ./librewolf.nix)]; + + xdg.mimeApps.defaultApplications = { + "text/html" = ["librewolf.desktop"]; + "text/xml" = ["librewolf.desktop"]; + "x-scheme-handler/http" = ["librewolf.desktop"]; + "x-scheme-handler/https" = ["librewolf.desktop"]; + }; +} diff --git a/modules/home/browsers/librewolf.nix b/modules/home/browsers/librewolf.nix new file mode 100644 index 0000000..2781eb8 --- /dev/null +++ b/modules/home/browsers/librewolf.nix @@ -0,0 +1,80 @@ +{ + pkgs, + inputs, + ... +}: { + programs.librewolf = { + enable = true; + settings = { + "webgl.disabled" = false; + # "privacy.resistFingerprinting" = false; + "privacy.clearOnShutdown.history" = false; + "privacy.clearOnShutdown.cookies" = false; + "network.cookie.lifetimePolicy" = 0; + "identity.fxaccounts.enabled" = true; + }; + profiles.pedro = { + search = { + force = true; + default = "FruesX"; + privateDefault = "FruesX"; + order = ["FruesX" "DuckDuckGo" "Google"]; + engines = { + "FruesX" = { + urls = [{template = "https://searx.peprolinbot.com/search?q={searchTerms}";}]; + iconUpdateURL = "https://searx.peprolinbot.com/favicon.ico"; + }; + }; + }; + bookmarks = {}; + extensions = with inputs.firefox-addons.packages.${pkgs.system}; [ + # ublock-origin # Included in Librewolf + bitwarden + skip-redirect + libredirect + multi-account-containers + clearurls + istilldontcareaboutcookies + hoppscotch + ]; + bookmarks = {}; + settings = { + # Sync settings + "services.sync.engine.addresses" = false; + "services.sync.engine.bookmarks" = true; + "services.sync.engine.creditcards" = false; + "services.sync.engine.history" = true; + "services.sync.engine.passwords" = false; + "services.sync.engine.prefs" = false; + "services.sync.engine.tabs" = true; + + # Layout + "browser.uiCustomization.state" = builtins.toJSON { + currentVersion = 20; + newElementCount = 5; + dirtyAreaCache = ["nav-bar" "PersonalToolbar" "toolbar-menubar" "TabsToolbar" "widget-overflow-fixed-list"]; + placements = { + PersonalToolbar = ["personal-bookmarks"]; + TabsToolbar = ["tabbrowser-tabs" "new-tab-button" "alltabs-button"]; + nav-bar = [ + "back-button" + "forward-button" + "stop-reload-button" + "urlbar-container" + "downloads-button" + "ublock0_raymondhill_net-browser-action" # uBlock + "_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action" # Bitwarden + "7esoorv3_alefvanoon_anonaddy_me-browser-action" # LibRedirect + "_testpilot-containers-browser-action" # Multi-account containers + "unified-extensions-button" # Button with the rest of extensions + ]; + toolbar-menubar = ["menubar-items"]; + unified-extensions-area = []; + widget-overflow-fixed-list = []; + }; + seen = ["developer-button" "ublock0_raymondhill_net-browser-action" "_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action" "_testpilot-containers-browser-action"]; + }; + }; + }; + }; +} diff --git a/modules/home/default.nix b/modules/home/default.nix index 3e2ebac..21dafb0 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -6,11 +6,11 @@ }: { imports = [(import ./bat.nix)] # better cat command + ++ [(import ./browsers)] # browser configurations ++ [(import ./btop.nix)] # resouces monitor ++ [(import ./cava.nix)] # audio visualizer ++ [(import ./discord.nix)] # discord with catppuccin theme ++ [(import ./gpg.nix)] # GnuPG and its agent (gpg-agent) - ++ [(import ./floorp/floorp.nix)] # firefox based browser ++ [(import ./fuzzel.nix)] # launcher ++ [(import ./gaming.nix)] # packages related to gaming ++ [(import ./git.nix)] # version control @@ -18,12 +18,12 @@ ++ [(import ./hyprland)] # window manager ++ [(import ./kdeconnect.nix)] ++ [(import ./kitty.nix)] # terminal - ++ [(import ./swaync/swaync.nix)] # notification deamon + ++ [(import ./swaync)] # notification deamon ++ [(import ./nextcloud.nix)] # nextcloud client ++ [(import ./nvim.nix)] # neovim editor ++ [(import ./packages.nix)] # other packages ++ [(import ./retroarch.nix)] - ++ [(import ./scripts/scripts.nix)] # personal scripts + ++ [(import ./scripts)] # personal scripts ++ [(import ./spotify.nix)] ++ [(import ./starship.nix)] # shell prompt ++ [(import ./qt.nix)] diff --git a/modules/home/floorp/extensions_list.txt b/modules/home/floorp/extensions_list.txt deleted file mode 100644 index 13a5cbc..0000000 --- a/modules/home/floorp/extensions_list.txt +++ /dev/null @@ -1,14 +0,0 @@ -Bitwarden Password Manager -ClearURLs -Dark Reader -Decentraleyes -Firefox Color -FoxyProxy -I still don't care about cookies -LibRedirect -Privacy Badger -Ruffle - Flash Emulator -Tree Style Tab -Tridactyl -uBlock Origin -Wappalyzer - Technology profiler diff --git a/modules/home/floorp/floorp.nix b/modules/home/floorp/floorp.nix deleted file mode 100644 index 6a58750..0000000 --- a/modules/home/floorp/floorp.nix +++ /dev/null @@ -1,3 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [floorp]; -} diff --git a/modules/home/hyprland/variables.nix b/modules/home/hyprland/variables.nix index 703c16e..6e4f740 100644 --- a/modules/home/hyprland/variables.nix +++ b/modules/home/hyprland/variables.nix @@ -20,6 +20,7 @@ QT_QPA_PLATFORMTHEME = "qt5ct"; QT_STYLE_OVERRIDE = "kvantum"; MOZ_ENABLE_WAYLAND = "1"; + MOZ_USE_XINPUT2 = "1"; WLR_BACKEND = "vulkan"; WLR_NO_HARDWARE_CURSORS = "1"; XDG_SESSION_TYPE = "wayland"; diff --git a/modules/home/scripts/scripts.nix b/modules/home/scripts/default.nix similarity index 100% rename from modules/home/scripts/scripts.nix rename to modules/home/scripts/default.nix diff --git a/modules/home/swaync/swaync.nix b/modules/home/swaync/default.nix similarity index 100% rename from modules/home/swaync/swaync.nix rename to modules/home/swaync/default.nix