Implemented DuckDNS module. Renamed avalon host to atlas.

flake.nix

@@ -1,32 +1,5 @@
 {
   description = "My personal NixOS system configuration.";
-
-  inputs = {
-
-    flake-parts.url = "github:hercules-ci/flake-parts";
-
-    # Only used to avoid dependency duplication (Multiple inputs use flake-utils).
-    flake-utils.url = "github:numtide/flake-utils";
-
-    # The package sets to use.
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
-    unstablepkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-
-    # HM to manage home directories.
-    home-manager = {
-
-      url = "github:nix-community/home-manager/release-23.05";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    # To generate easy ISOs.
-    nixos-generators = {
-
-      url = "github:nix-community/nixos-generators";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
   outputs = { flake-parts, nixpkgs, unstablepkgs, home-manager, ... } @ inputs: let 
 
     # Extend the default library with our own set of functions.
@@ -36,13 +9,17 @@
     createHost = system: hostPath: users: (lib.custom.mkHost { 
 
       inherit hostPath system users inputs lib
-        nixpkgs unstablepkgs home-manager; 
+        nixpkgs unstablepkgs home-manager;
+
+      # Add here the modules received in the flake inputs (except HM, which is handled automatically).
+      extraNixosModules = [ 
+
+        inputs.sops-nix.nixosModules.sops
+      ];
     });
 
   in flake-parts.lib.mkFlake { inherit inputs; } {
 
-    imports = [ ];
-
     # The systems tested at the moment.
     systems = [ "x86_64-linux" ];
     perSystem = { config, self', inputs', pkgs, upkgs, system, ... } @ args: let 
@@ -59,7 +36,39 @@
 
     flake = {
 
-      nixosConfigurations.avalon = createHost "x86_64-linux" ./hosts/avalon [ ./users/iivvaannxx ];
+      nixosConfigurations.avalon = createHost "x86_64-linux" ./hosts/atlas [ ./users/iivvaannxx ];
+    };
+  };
+
+  inputs = {
+
+    # Only used to avoid dependency duplication (Multiple inputs use flake-utils).
+    flake-utils.url = "github:numtide/flake-utils";
+    flake-parts.url = "github:hercules-ci/flake-parts";
+
+    # The package sets to use.
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    unstablepkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
+    # HM to manage home directories.
+    home-manager = {
+
+      url = "github:nix-community/home-manager/release-23.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # To generate easy ISOs.
+    nixos-generators = {
+
+      url = "github:nix-community/nixos-generators";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # To manage secrets.
+    sops-nix = {
+
+      url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 }

helpers.sh

@@ -13,7 +13,7 @@ repl () {
 rebuild () {
 
   mode=${1:-switch}
-  host=${2:-avalon}
+  host=${2:-atlas}
 
   sudo nixos-rebuild $mode --flake .#$host
 }

hosts/avalon/default.nix → hosts/atlas/default.nix

@@ -87,9 +87,16 @@ in {
     cached-nix-shell
   ];
 
-  programs._1password-gui.enable = true;
-  programs._1password-gui.package = upkgs._1password-gui;
-  programs._1password-gui.polkitPolicyOwners = [ "iivvaannxx" ];
+  modules.tools.onepassword = {
+
+    cli.enable = true;
+    gui = {
+
+      enable = true;
+      package = upkgs._1password-gui;
+      polkitPolicyOwners = [ "iivvaannxx" ];
+    };
+  };
 
   programs.zsh.enable = true;
   environment.shells = [ pkgs.zsh ];

hosts/avalon/hardware.nix → hosts/atlas/hardware.nix

@@ -20,4 +20,6 @@ in {
   # Auto-generated settings. Better to not touch them.
   powerManagement.cpuFreqGovernor = mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware;
-}
+
+  hardware.logitech.wireless.enable = true;
+}

hosts/atlas/networking.nix

@@ -0,0 +1,39 @@
+{ config, lib, pkgs, ... } @ args: let
+
+  inherit (lib) mkDefault;
+
+in {
+
+  modules.networking.duckdns = {
+
+    enable = false;
+    domains = [
+
+      {
+        name = "the name of the duckdns domain";
+        token = "fill this when secrets are ready.";
+      }
+    ];
+  };
+
+  networking = {
+
+    wireless.enable = false;
+    hostName = "atlas";
+
+    defaultGateway = "192.168.25.1";
+    nameservers = [ "1.1.1.1" "1.0.0.1" ];
+
+    interfaces = {
+
+      eno2.ipv4.addresses = [
+
+        {
+          address = "192.168.25.50";
+          prefixLength = 24;
+        }
+      ];
+    };
+
+  };
+}

lib/conditionals.nix

@@ -41,6 +41,4 @@ in {
 
   # Makes the given value unless the given predicate is true.
   mkUnless = pred: val: (mkIf (! pred) val);
-
-
 }

lib/default.nix

@@ -60,8 +60,9 @@ in {
 
     mkSubmoduleOption
     mkSubmoduleListOption
-    mkDynamicAttrsetOption 
+    mkSubmoduleWithConfigOption
 
+    mkDynamicAttrsetOption 
     mkPackageListOption
   ;
 

lib/nixos.nix

@@ -56,7 +56,7 @@
 in {
 
   # Creates a host from the given arguments.
-  mkHost = { hostPath, system, users, inputs, lib, nixpkgs, unstablepkgs, home-manager }: let
+  mkHost = { hostPath, system, users, inputs, lib, nixpkgs, unstablepkgs, home-manager, extraNixosModules ? [ ] }: let
 
     inherit (lib) nixosSystem;
     inherit (lib.custom) fromJSON';
@@ -97,10 +97,9 @@ in {
     inherit system lib;
 
     specialArgs = nixosSpecialArgs;
-    modules = nixosModules ++ [ 
+    modules = nixosModules ++ extraNixosModules ++ [ 
 
       hostPath 
-
       nixSystemRegistry
       nixosUsers
 

lib/options.nix

@@ -35,6 +35,16 @@ in {
     }
   );
 
+  # Shorthand for creating submodule options in custom modules.
+  mkSubmoduleWithConfigOption = default: description: submodule: config: (
+
+    mkOption {
+
+      inherit default description;
+      type = types.submodule { inherit config; options = submodule; };
+    }
+  );
+
   # Shorthand for creating submodule lists options in custom modules.
   mkSubmoduleListOption = default: description: submodule: (
 

modules/nixos/default.nix

@@ -1,3 +1,4 @@
 [
-
+  ./networking/duck-dns
+  ./tools/onepassword
 ]