diff --git a/home/extra/browsers/chromium.nix b/home/extra/browsers/chromium.nix deleted file mode 100644 index 4689c242..00000000 --- a/home/extra/browsers/chromium.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - programs.chromium = { - enable = true; - extraOpts = { - "SyncDisabled" = true; - "PasswordManagerEnabled" = false; - "SpellcheckEnabled" = true; - "SpellcheckLanguage" = [ - "se" - "en-US" - ]; - }; - extensions = '' - [ - "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin - "mnjggcdmjocbbbhaepdhchncahnbgone" # sponsorblock - "gebbhagfogifgggkldgodflihgfeippi" # return dislike - "ponfpcnoihfmfllpaingbgckeeldkhle" # enhancer for youtube - ] - ''; - }; -} diff --git a/home/extra/browsers/default.nix b/home/extra/browsers/default.nix index 42c6877a..1ed52bdd 100644 --- a/home/extra/browsers/default.nix +++ b/home/extra/browsers/default.nix @@ -8,9 +8,8 @@ firefoxFlake = inputs.firefox-nightly.packages.${pkgs.stdenv.hostPlatform.system}; _firefoxNightly = firefoxFlake.firefox-nightly-bin; - _chromium = pkgs.chromium; - - _floorp = pkgs.floorp-unwrapped; + _chromium = pkgs.ungoogled-chromium; + # _mullvad = pkgs.mullvad-browser; in { home.packages = lib.mkMerge [ (lib.mkIf (pkgs.hostPlatform.system == "x86_64-linux") ( @@ -19,7 +18,6 @@ in { _firefoxNightly pkgs.firefox-bin _chromium - _floorp ] )) ]; diff --git a/home/extra/browsers/firefox.nix b/home/extra/browsers/firefox.nix deleted file mode 100644 index 1f91722a..00000000 --- a/home/extra/browsers/firefox.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - pkgs, - lib, - config, - inputs, - ... -}: let - firefoxFlake = inputs.firefox-nightly.packages.${pkgs.stdenv.hostPlatform.system}; - _firefoxNightly = firefoxFlake.firefox-nightly-bin; -in { - home.packages = lib.mkMerge [ - (lib.mkIf (pkgs.hostPlatform.system == "x86_64-linux") ( - with pkgs; [ - # browsers - _firefoxNightly - pkgs.firefox-bin - floorp - ] - )) - ]; -} diff --git a/nixos/core/shells/dev.nix b/nixos/core/shells/dev.nix index 77cc33b9..f98dbfca 100644 --- a/nixos/core/shells/dev.nix +++ b/nixos/core/shells/dev.nix @@ -11,6 +11,13 @@ pkg-config gtk3 gtk4 + libadwaita + glib + clang + gnumake + cmake + nasm + perl ]; }; } diff --git a/nixos/core/shells/dev.nixbak b/nixos/core/shells/dev.nixbak deleted file mode 100644 index dbbecdd6..00000000 --- a/nixos/core/shells/dev.nixbak +++ /dev/null @@ -1,34 +0,0 @@ -{ - inputs, - pkgs ? import {}, - ... -}: let - _rustBuildOxalica = inputs.rust-overlay.packages.${pkgs.stdenv.hostPlatform.system}.rust.override { - extensions = [ - "rust-src" - "rust-analyzer" - "clippy" - ]; - }; - _rustBuild = _rustBuildOxalica; -in { - default = pkgs.mkShell { - nativeBuildInputs = with pkgs; [ - _rustBuild - ]; - buildInputs = with pkgs; [ - rust-bin.stable.latest.default - openssl - pkg-config - ez - fd - gtk3 - gtk4 - ]; - shellHook = '' - alias ls=eza - alias find=fd - ''; - RUST_BACKTRACE = 1; - }; -}