diff --git a/flake.lock b/flake.lock index d6a7d3f..c7e8674 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "fenix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1722752898, + "narHash": "sha256-8BwcY0yYlUxpoqpAoeXKxVG+w97LUBp+pfzUiISOmeY=", + "owner": "nix-community", + "repo": "fenix", + "rev": "0caa626457f1f4f8273a89775bf9081b7fc09823", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -54,12 +75,30 @@ }, "root": { "inputs": { + "fenix": "fenix", "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "rust-overlay": "rust-overlay" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1722589793, + "narHash": "sha256-OYDIo1Iqb6ldcC6JdqzKAKSRiXjDOwOAJKKMH8OZutk=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "aa00ddcf654a35ba0eafe17247cf189958d33182", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 994feb4..9ae4c0a 100644 --- a/flake.nix +++ b/flake.nix @@ -20,12 +20,18 @@ url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; + + fenix = { + url = "github:nix-community/fenix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, rust-overlay, nixpkgs, + fenix, home-manager, ... } @ inputs: let @@ -71,6 +77,10 @@ # nixpkgs.overlays = [ rust-overlay.overlays.default ]; # import = [ ./modules/nixos/rust-toolchain.nix ]; # }) + ({ pkgs, ... }: { + nixpkgs.overlays = [ fenix.overlays.default ]; + + }) ]; }; rogue = nixpkgs.lib.nixosSystem { @@ -82,6 +92,10 @@ nixpkgs.overlays = [ rust-overlay.overlays.default ]; environment.systemPackages = [ pkgs.rust-bin.stable.latest.default ]; }) + ({ pkgs, ... }: { + nixpkgs.overlays = [ fenix.overlays.default ]; + + }) ]; }; }; diff --git a/home.nix b/home.nix index 39c7b69..4845b19 100644 --- a/home.nix +++ b/home.nix @@ -75,13 +75,16 @@ home.stateVersion = "24.05"; home.file = { ".face" = { - source = ../assets/avatar.png; + source = assets/avatar.png; + }; + ".bashrc" = { + source = assets/.bashrc; }; "Documents/projects/rust/flake.nix" = { - source = ../assets/toolchains/rust/flake.nix; + source = assets/toolchains/rust/flake.nix; }; "Documents/projects/rust/.envrc" = { - source = ../assets/toolchains/rust/.envrc; + source = assets/toolchains/rust/.envrc; }; }; @@ -92,26 +95,10 @@ extensions = with pkgs.nur.repos.rycee.firefox-addons; [ ublock-origin darkreader + bitwarden ]; 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; @@ -137,24 +124,6 @@ # 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; }; }; }; diff --git a/hosts/blackstar/nixos/configuration.nix b/hosts/blackstar/nixos/configuration.nix index 48b27f2..6b7c92c 100644 --- a/hosts/blackstar/nixos/configuration.nix +++ b/hosts/blackstar/nixos/configuration.nix @@ -223,6 +223,8 @@ # sys utils gnupg ffmpeg unzip mpv + hyfetch + pgadmin4 ]; programs.git.enable = true; diff --git a/result b/result deleted file mode 120000 index cb143dc..0000000 --- a/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/6l8s1fmrmy8fv4l9qyzwfm63cg3c2dns-home-manager-generation \ No newline at end of file