From 7a4fc4cadb62966dea3b4d8ec8b1a66f8275a870 Mon Sep 17 00:00:00 2001 From: vali Date: Fri, 12 Apr 2024 20:58:33 +0200 Subject: [PATCH] added ssh, removed unnecessary imports in flake.nix --- flake.nix | 11 +---------- hosts/vali/mars/configuration.nix | 1 + modules/services/default.nix | 1 + modules/services/ssh.nix | 16 ++++++++++++++++ options/common/networking.nix | 5 ++++- 5 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 modules/services/ssh.nix diff --git a/flake.nix b/flake.nix index df11d3f..9e0b0ea 100644 --- a/flake.nix +++ b/flake.nix @@ -36,19 +36,10 @@ url = "github:nix-community/fenix"; inputs.nixpkgs.follows = "nixpkgs"; }; - - hyprland = { - url = "github:hyprwm/Hyprland"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - hyprlock = { - url = "github:hyprwm/hyprlock"; - inputs.nixpkgs.follows = "nixpkgs"; - }; split-monitor-workspaces = { url = "github:Duckonaut/split-monitor-workspaces"; - inputs.hyprland.follows = "hyprland"; +# inputs.hyprland.follows = "hyprland"; }; }; } diff --git a/hosts/vali/mars/configuration.nix b/hosts/vali/mars/configuration.nix index fa98be9..3f0b0c6 100644 --- a/hosts/vali/mars/configuration.nix +++ b/hosts/vali/mars/configuration.nix @@ -20,6 +20,7 @@ }; programs = { vesktop.enable = true; + ssh.enable = true; btop.enable = true; mpv.enable = true; i3.enable = true; diff --git a/modules/services/default.nix b/modules/services/default.nix index a17ae8a..433a36b 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -1,5 +1,6 @@ _: { imports = [ ./pipewire.nix + ./ssh.nix ]; } diff --git a/modules/services/ssh.nix b/modules/services/ssh.nix new file mode 100644 index 0000000..448aeaf --- /dev/null +++ b/modules/services/ssh.nix @@ -0,0 +1,16 @@ +{ config, lib, pkgs, ... } +with lib; let + cfg = config.myOptions.programs.ssh; + username = config.myOptions.other.system.username; +in { + options.myOptions.programs.ssh.enable = mkEnableOption "ssh"; + + config = mkIf cfg.enable { + home-manager.users.${username} = { + programs.ssh = { + startAgent = true; + }; + }; + }; + +} diff --git a/options/common/networking.nix b/options/common/networking.nix index 9023909..b1601cd 100644 --- a/options/common/networking.nix +++ b/options/common/networking.nix @@ -10,7 +10,10 @@ networking = { }; services.resolved = { enable = true; - fallbackDns = ["9.9.9.9"]; + fallbackDns = [ + "9.9.9.9" + "2620::fe::fe" + ]; }; users.users.${username}.extraGroups = [ "networkmanager" ]; }