From 05908c445dd5d53e90d97da302974aaa94e8f093 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Fri, 7 Mar 2025 18:52:59 -0500 Subject: [PATCH] changing dns --- flake.lock | 16 ++++++++++++++++ flake.nix | 2 ++ homes/emenel/default.nix | 1 + hosts/eddie/configuration.nix | 18 +++++++++++++++--- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 5c2d3f2..42c26fd 100644 --- a/flake.lock +++ b/flake.lock @@ -83,6 +83,21 @@ "type": "github" } }, + "emenel-templates": { + "locked": { + "lastModified": 1741380318, + "narHash": "sha256-C0HpGd73NBqMUjOTLJWmSBBpTiFPwetmgV182WBNrFQ=", + "ref": "refs/heads/main", + "rev": "de41a02caa5d87aabaaf56600dc3fe71b995821d", + "revCount": 1, + "type": "git", + "url": "ssh://git@gt.emenel.ca/emenel/nix-flake-templates" + }, + "original": { + "type": "git", + "url": "ssh://git@gt.emenel.ca/emenel/nix-flake-templates" + } + }, "flake-compat": { "locked": { "lastModified": 1733328505, @@ -1077,6 +1092,7 @@ "affinity-nix": "affinity-nix", "emacs-lsp-booster": "emacs-lsp-booster", "emacs-overlay": "emacs-overlay", + "emenel-templates": "emenel-templates", "home-manager": "home-manager", "hypridle": "hypridle", "hyprlock": "hyprlock", diff --git a/flake.nix b/flake.nix index 8b09b04..430ad73 100644 --- a/flake.nix +++ b/flake.nix @@ -81,6 +81,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + emenel-templates.url = "git+ssh://git@gt.emenel.ca/emenel/nix-flake-templates"; + }; outputs = diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index 1b1de8b..19ded12 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -66,6 +66,7 @@ GSK_RENDERER = "ngl"; MOZ_ENABLE_WAYLAND = 1; LSP_USE_PLISTS = "true"; + NH_FLAKE = "\${HOME}/source/nixos-config"; }; stateVersion = "24.05"; diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 4988bff..5c440d1 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -2,6 +2,7 @@ nix-config, config, pkgs, + nixpkgs, inputs, ... }: @@ -48,6 +49,8 @@ ]; }; + # environment.etc."nix/inputs/nixpkgs".source = "${nixpkgs}"; + nix = { settings = { experimental-features = [ @@ -62,8 +65,17 @@ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ]; + nix-path = [ "nixpkgs=${inputs.nixpkgs}" ]; + # nix-path = lib.mkForce "nixpkgs=/etc/nix/inputs/nixpkgs"; }; - nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; + + registry = { + nixpkgs.flake = inputs.nixpkgs; + emenel-templates.flake = inputs.emenel-templates; + }; + + channel.enable = false; # remove nix-channel related tools & configs, we use flakes instead. + }; # Set your time zone. @@ -350,8 +362,8 @@ hostName = "eddie"; domain = "local"; nameservers = [ - "1.1.1.1" - "1.0.0.1" + "95.85.95.85" + "2.56.220.2" ]; networkmanager = { enable = true;