diff --git a/assets/avatar.png b/assets/avatar.png index e3e0d49..f55269b 100644 Binary files a/assets/avatar.png and b/assets/avatar.png differ diff --git a/flake.nix b/flake.nix index 50ca097..8199fab 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,8 @@ # Home manager home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + + #nur.url = "github:nix-community/NUR"; }; outputs = { diff --git a/home-manager/home.nix b/home-manager/home.nix index 17a3952..f2d0d2f 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -56,11 +56,97 @@ # Enable home-manager and git programs.home-manager.enable = true; - programs.git.enable = true; # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "24.05"; + home.file = { + ".face" = { + source = ./assets/avatar.png; + } + }; + + programs.firefox = { + enable = true; + + # Install extensions from NUR + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + ublock-origin + darkreader + ]; + + # Privacy about:config settings + profiles.notus = { + settings = { + "browser.send_pings" = false; + "browser.urlbar.speculativeConnect.enabled" = false; + "dom.event.clipboardevents.enabled" = true; + "media.navigator.enabled" = false; + "network.cookie.cookieBehavior" = 1; + "network.http.referer.XOriginPolicy" = 2; + "network.http.referer.XOriginTrimmingPolicy" = 2; + "beacon.enabled" = false; + "browser.safebrowsing.downloads.remote.enabled" = false; + "network.IDN_show_punycode" = true; + "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org"; + "app.shield.optoutstudies.enabled" = false; + "dom.security.https_only_mode_ever_enabled" = true; + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + "browser.toolbars.bookmarks.visibility" = "never"; + "geo.enabled" = false; + + # Disable telemetry + "browser.newtabpage.activity-stream.feeds.telemetry" = false; + "browser.ping-centre.telemetry" = false; + "browser.tabs.crashReporting.sendReport" = false; + "devtools.onboarding.telemetry.logged" = false; + "toolkit.telemetry.enabled" = false; + "toolkit.telemetry.unified" = false; + "toolkit.telemetry.server" = ""; + + # Disable Pocket + "browser.newtabpage.activity-stream.feeds.discoverystreamfeed" = false; + "browser.newtabpage.activity-stream.feeds.section.topstories" = false; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; + "browser.newtabpage.activity-stream.showSponsored" = false; + "extensions.pocket.enabled" = false; + + # Disable prefetching + "network.dns.disablePrefetch" = true; + "network.prefetch-next" = false; + + # Disable JS in PDFs + "pdfjs.enableScripting" = false; + + # Harden SSL + "security.ssl.require_safe_negotiation" = true; + + # Extra + "identity.fxaccounts.enabled" = false; + "browser.search.suggest.enabled" = false; + "browser.urlbar.shortcuts.bookmarks" = false; + "browser.urlbar.shortcuts.history" = false; + "browser.urlbar.shortcuts.tabs" = false; + "browser.urlbar.suggest.bookmark" = false; + "browser.urlbar.suggest.engines" = false; + "browser.urlbar.suggest.history" = false; + "browser.urlbar.suggest.openpage" = false; + "browser.urlbar.suggest.topsites" = false; + "browser.uidensity" = 1; + "media.autoplay.enabled" = false; + "toolkit.zoomManager.zoomValues" = ".8,.90,.95,1,1.1,1.2"; + + "privacy.firstparty.isolate" = true; + "network.http.sendRefererHeader" = 0; + }; + }; + }; + + programs.git = { + enabled = true; + userName = "Seven Of Aces"; + userEmail = "sevenofaces42@gmail.com"; + }; } \ No newline at end of file diff --git a/lib/default.nix b/lib/default.nix deleted file mode 100644 index d2d5f19..0000000 --- a/lib/default.nix +++ /dev/null @@ -1 +0,0 @@ -/run/media/aces/Data/Personal/PFP/Picrew/scholar.png \ No newline at end of file diff --git a/lib/mkSystem.nix b/lib/mkSystem.nix deleted file mode 100644 index 7a10d25..0000000 --- a/lib/mkSystem.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ self, ... } @ inputs: name: system: inputs.nixpkgs.lib.nixosSystem ( - { - inherit system; - specialArgs = { inherit inputs self; }; - modules = [ - "${self}/hosts/${name}/system.nix" - "${self}/hosts/${name}/user.nix" - inputs.home-manager.nixosModule - ]; - } -) \ No newline at end of file diff --git a/nixos/configuration.nix b/nixos/configuration.nix index a23757d..cd5f777 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -71,6 +71,15 @@ nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs; }; + nixpkgs.config.packageOverrides = pkgs: { + nur = import (builtins.fetchTarball { + url = "https://github.com/nix-community/NUR/archive/master.tar.gz"; + sha256 = "1facb9jgayc9dpnvg3696r5a5w8x0791zkp0qdbiadg56w4lax6r"; + }) { + inherit pkgs; + }; + }; + # FIXME: Add the rest of your current configuration # Enable networking networking.networkmanager.enable = true; @@ -91,6 +100,7 @@ # TODO: Configure your system-wide user settings (groups, etc), add more users as needed. users.users = { + # FIXME: Replace with your username aces = { # TODO: You can set an initial password for your user. @@ -170,7 +180,29 @@ jetbrains.clion jetbrains.pycharm-professional vim + python3 + lua git + (vscode-with-extensions.override { + vscodeExtensions = with vscode-extensions; [ + dracula-theme.theme-dracula + yzhang.markdown-all-in-one + rust-lang.rust-analyzer + # jscearcy.rust-doc-viewer + # swellaby.vscode-rust-test-adapter + tamasfe.even-better-toml + ms-vsliveshare.vsliveshare + aaron-bond.better-comments + bbenoist.nix + ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "remote-ssh-edit"; + publisher = "ms-vscode-remote"; + version = "0.47.2"; + sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g"; + } + ]; + }) # game steam @@ -183,7 +215,14 @@ blender # other - firefox discord + + # sys utils + gnupg ffmpeg unzip + mpv ]; -} \ No newline at end of file + + programs.git.enable = true; + + programs.firefox.enable = true; +}