From f61feecd8775ad5295e3588412c3e77e3ac14429 Mon Sep 17 00:00:00 2001 From: halbg0tt Date: Sat, 4 Jul 2026 03:55:53 +0200 Subject: [PATCH] added sum changes --- modules/default.nix | 3 +- modules/devel/default.nix | 1 + modules/devel/vscode.nix | 13 +++++ modules/home/home.nix | 8 ++- modules/home/vesktop.nix | 1 + modules/{environment.nix => pkgs.nix} | 17 +++--- modules/shell.nix | 9 ++-- modules/web/default.nix | 1 - modules/web/firefox.nix | 77 ++++++++++++++++++++++++++- 9 files changed, 113 insertions(+), 17 deletions(-) create mode 100644 modules/devel/vscode.nix create mode 100644 modules/home/vesktop.nix rename modules/{environment.nix => pkgs.nix} (91%) diff --git a/modules/default.nix b/modules/default.nix index ef71e93..fb84359 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -7,7 +7,7 @@ ./networking.nix ./security.nix ./system.nix - ./environment.nix + ./pkgs.nix ./gaming.nix ./media.nix ./graphics.nix @@ -15,6 +15,7 @@ ./shell.nix ./irc.nix ./devel/default.nix + ./web/firefox.nix ./dwm/default.nix ]; } diff --git a/modules/devel/default.nix b/modules/devel/default.nix index b316bce..d485400 100644 --- a/modules/devel/default.nix +++ b/modules/devel/default.nix @@ -4,5 +4,6 @@ ./nix-lang.nix ./python.nix ./lua.nix + ./vscode.nix ]; } diff --git a/modules/devel/vscode.nix b/modules/devel/vscode.nix new file mode 100644 index 0000000..8059b79 --- /dev/null +++ b/modules/devel/vscode.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + jnoortheen.nix-ide + kamadorueda.alejandra + jeff-hykin.better-nix-syntax + leonardssh.vscord + ]; + }; +} \ No newline at end of file diff --git a/modules/home/home.nix b/modules/home/home.nix index ec82277..26bb809 100644 --- a/modules/home/home.nix +++ b/modules/home/home.nix @@ -1,6 +1,12 @@ { config, pkgs, ... }: { - imports = [ ../web/qutebrowser.nix ../web/firefox.nix ../web/librewolf.nix ./proton.nix ./irssi.nix ]; + imports = [ + ../web/qutebrowser.nix + ../web/librewolf.nix + ./proton.nix + ./irssi.nix + ./vesktop.nix + ]; home = { username = "user"; homeDirectory = "/home/user"; diff --git a/modules/home/vesktop.nix b/modules/home/vesktop.nix new file mode 100644 index 0000000..9b7ce87 --- /dev/null +++ b/modules/home/vesktop.nix @@ -0,0 +1 @@ +_{}: { programs.vesktop.enable = true; } \ No newline at end of file diff --git a/modules/environment.nix b/modules/pkgs.nix similarity index 91% rename from modules/environment.nix rename to modules/pkgs.nix index 223993b..e9f2094 100644 --- a/modules/environment.nix +++ b/modules/pkgs.nix @@ -14,17 +14,18 @@ lsof tree ntfs3g - - # dev - rustup - python3 - - - # networking + usbutils net-tools inetutils ethtool - + dig + drill + + # dev + vscodium + rustup + python3 + qutebrowser neovide ]; diff --git a/modules/shell.nix b/modules/shell.nix index 33a4512..755442c 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -9,7 +9,7 @@ package = pkgs.bash-completion; }; promptInit = '' - PS1="\$PWD:[\h] % " + PS1="(\h) [\u:\w] % " ''; shellAliases = { "mount" = "doas mount --mkdir -v $@"; @@ -34,6 +34,9 @@ init = { defaultBranch = "main"; }; + safe = { + directory = "/etc/nixos"; + }; user = { name = "halbg0tt"; email = "halbg0tt@protonmail.com"; @@ -47,10 +50,6 @@ }; }; }; - extraConfig = { - init.defaultBranch = "main"; - safe.directory = "/etc/nixos"; - }; }; tmux = { enable = true; diff --git a/modules/web/default.nix b/modules/web/default.nix index b36bda2..e915adb 100644 --- a/modules/web/default.nix +++ b/modules/web/default.nix @@ -2,6 +2,5 @@ { imports = [ ./librewolf.nix - ./firefox.nix ]; } diff --git a/modules/web/firefox.nix b/modules/web/firefox.nix index 345a7c8..d8f8c21 100644 --- a/modules/web/firefox.nix +++ b/modules/web/firefox.nix @@ -1,4 +1,79 @@ { config, pkgs, ... }: + +let + lock-false = { + Value = false; + Status = "locked"; + }; + lock-true = { + Value = true; + Status = "locked"; + }; +in { - programs.firefox.enable = true; + programs = { + firefox = { + enable = true; + languagePacks = [ "en-US" ]; + policies = { + DisableTelemetry = true; + DisableFirefoxStudies = true; + EnableTrackingProtection = { + Value = true; + Locked = true; + Cryptomining = true; + Fingerprinting = true; + }; + DisablePocket = true; + DisableFirefoxAccounts = false; + DisableAccounts = true; + DisableFirefoxScreenshots = true; + OverrideFirstRunPage = ""; + OverridePostUpdatePage = ""; + DontCheckDefaultBrowser = true; + DisplayBookmarksToolbar = "newtab"; + DisplayMenuBar = "default-off"; + SearchBar = "unified"; + ExtensionSettings = { + "uBlock0@raymondhill.net" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; + installation_mode = "force_installed"; + }; + "78272b6fa58f4a1abaac99321d503a20@proton.me" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/proton-pass/latest.xpi"; + installation_mode = "force_installed"; + }; + "addon@darkreader.org" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/darkreader/latest.xpi"; + installation_mode = "force_installed"; + }; + "{f5bcc922-5c09-4ba5-9611-d7931812785c}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/file/4354513/oxocarbon-1.0.xpi"; + installation_mode = "force_installed"; + }; + }; + }; + preferences = { + "privacy.resistFingerprinting" = true; + "browser.contentblocking.category" = true; + "extensions.pocket.enabled" = false; + "extensions.screenshots.disabled" = true; + "browser.topsites.contile.enabled" = false; + "browser.formfill.enable" = false; + "browser.search.suggest.enabled" = false; + "browser.search.suggest.enabled.private" = false; + "browser.urlbar.suggest.searches" = true; + "browser.urlbar.showSearchSuggestionsFirst" = true; + "browser.newtabpage.activity-stream.feeds.section.topstories" = false; + "browser.newtabpage.activity-stream.feeds.snippets" = false; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; + "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false; + "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false; + "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false; + "browser.newtabpage.activity-stream.showSponsored" = false; + "browser.newtabpage.activity-stream.system.showSponsored" = false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + }; + }; + }; }