addin ssh key

HyperV/configuration.nix

@@ -1,7 +1,12 @@
 # This is your system's configuration file.
 # Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
-
+{
-{ lib, config, pkgs, modulesPath, ... }: {
+  lib,
+  config,
+  pkgs,
+  modulesPath,
+  ...
+}: {
   # You can import other NixOS modules here
 
   imports = [
@@ -10,10 +15,9 @@
     # Include static network settings.
     ./networking.nix
     "${modulesPath}/virtualisation/hyperv-image.nix"
-
   ];
 
-  nixpkgs = { config = { allowUnfree = true; }; };
+  nixpkgs = {config = {allowUnfree = true;};};
 
   nix = {
     settings = {
@@ -28,12 +32,12 @@
   system.stateVersion = "23.05";
 
   mymods = {
-     gnome.enable = true;
+    gnome.enable = true;
-     user_sstent.enable = true;
+    user_sstent.enable = true;
-     sshd.enable = true;
+    sshd.enable = true;
   };
 
-  networking.firewall.allowedTCPPorts = [ 22 ];
+  networking.firewall.allowedTCPPorts = [22];
 
   environment.etc."ssh/ssh_host_rsa_key".source = ./ssh/ssh_host_rsa_key;
   environment.etc."ssh/ssh_host_rsa_key".mode = "0400";
@@ -41,7 +45,4 @@
   environment.etc."ssh/ssh_host_ed25519_key".source = ./ssh/ssh_host_ed25519_key;
   environment.etc."ssh/ssh_host_ed25519_key".mode = "0400";
   environment.etc."ssh/ssh_host_ed25519_key.pub".source = ./ssh/ssh_host_ed25519_key.pub;
-
-
-
 }

HyperV/hardware.nix

@@ -7,33 +7,31 @@
   ...
 }: {
   # Set your system kind (needed for flakes)
-    nixpkgs.hostPlatform = "x86_64-linux";
+  nixpkgs.hostPlatform = "x86_64-linux";
-    virtualisation.hypervGuest.videoMode  = "1920x1080";
+  virtualisation.hypervGuest.videoMode = "1920x1080";
 
-    boot.initrd.availableKernelModules = [ "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = ["sd_mod" "sr_mod"];
-    boot.initrd.kernelModules = [ ];
+  boot.initrd.kernelModules = [];
-    boot.kernelModules = ["hv_sock"];
+  boot.kernelModules = ["hv_sock"];
 
+  # fileSystems."/" = {
+  #   device = "/dev/disk/by-label/nixos";
+  #   autoResize = true;
+  #   fsType = "ext4";
+  # };
 
-    # fileSystems."/" = {
+  # fileSystems."/boot" = {
-    #   device = "/dev/disk/by-label/nixos";
+  #   device = "/dev/disk/by-label/ESP";
-    #   autoResize = true;
+  #   fsType = "vfat";
-    #   fsType = "ext4";
+  # };
-    # };
-
-    # fileSystems."/boot" = {
-    #   device = "/dev/disk/by-label/ESP";
-    #   fsType = "vfat";
-    # };
-
-    fileSystems."/mnt/Public" = {
-        device = "//192.168.1.109/Public";
-        fsType = "cifs";
-        options = let
-          # this line prevents hanging on network split
-          automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
-        # in ["${automount_opts},credentials=/etc/nixos/smb-secrets"];
-        in ["${automount_opts}"];
-    };
 
+  fileSystems."/mnt/Public" = {
+    device = "//192.168.1.109/Public";
+    fsType = "cifs";
+    options = let
+      # this line prevents hanging on network split
+      automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
+      # in ["${automount_opts},credentials=/etc/nixos/smb-secrets"];
+    in ["${automount_opts}"];
+  };
 }

HyperV/hyperv.nix

@@ -1,11 +1,15 @@
-  
+{
-{ lib, config, pkgs, ... }: {
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # You can import other NixOS modules here
   hyperv = {
     baseImageSize = 8096;
   };
 
-# environment.etc = {
+  # environment.etc = {
-#   nixos.source = ../..;
+  #   nixos.source = ../..;
-# };
+  # };
 }

flake.nix

@@ -19,9 +19,12 @@
     # Shameless plug: looking for a way to nixify your themes and make
     # everything match nicely? Try nix-colors!
     # nix-colors.url = "github:misterio77/nix-colors";
-    nixos-hardware.url = "github:NixOS/nixos-hardware";        # Import nixos hardware quirks settings
+    nixos-hardware.url = "github:NixOS/nixos-hardware"; # Import nixos hardware quirks settings
     # nixos-generators = { url = "github:nix-community/nixos-generators"; inputs.nixpkgs.follows = "nixpkgs";};     #import nixos-generators for building images
-    nixos-wsl = {url = "github:nix-community/nixos-wsl"; inputs.nixpkgs.follows = "nixpkgs";};
+    nixos-wsl = {
+      url = "github:nix-community/nixos-wsl";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     sops-nix.url = github:Mic92/sops-nix;
     flake-utils.url = "github:numtide/flake-utils";
     # nix.url = "github:NixOS/nix/2.12.0";
@@ -45,112 +48,130 @@
 
     # Flake Utility Functions
     utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
-
-
   };
 
-  outputs = { self, nixpkgs, home-manager,nixpkgs-unstable,... }@inputs:
+  outputs = {
-    let
+    self,
-      inherit (lib.my) mapModules mapModulesRec mapHosts;
+    nixpkgs,
-      inherit (self) outputs;
+    home-manager,
+    nixpkgs-unstable,
+    ...
+  } @ inputs: let
+    inherit (lib.my) mapModules mapModulesRec mapHosts;
+    inherit (self) outputs;
 
-      system = "x86_64-linux";
+    system = "x86_64-linux";
 
-      mkPkgs = pkgs: extraOverlays: import pkgs {
+    mkPkgs = pkgs: extraOverlays:
+      import pkgs {
         inherit system;
-        config.allowUnfree = true;  # forgive me Stallman senpai
+        config.allowUnfree = true; # forgive me Stallman senpai
         overlays = extraOverlays ++ (lib.attrValues self.overlays);
       };
-      pkgs  = mkPkgs nixpkgs [ self.overlay ];
+    pkgs = mkPkgs nixpkgs [self.overlay];
-      pkgs' = mkPkgs nixpkgs-unstable [];
+    pkgs' = mkPkgs nixpkgs-unstable [];
 
-      lib = nixpkgs.lib.extend
+    lib =
-        (self: super: { my = import ./lib { inherit pkgs inputs outputs; lib = self; }; }// home-manager.lib);
+      nixpkgs.lib.extend
+      (self: super:
+        {
+          my = import ./lib {
+            inherit pkgs inputs outputs;
+            lib = self;
+          };
+        }
+        // home-manager.lib);
+  in {
+    lib = lib.my;
+    packages."${system}" =
+      mapModules ./pkgs (p: pkgs.callPackage p {});
+    formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
 
-    in {
+    devShell."${system}" =
-      lib = lib.my;
+      import ./shell.nix {inherit pkgs;};
-      packages."${system}" =
-        mapModules ./pkgs (p: pkgs.callPackage p {});
-        
-      devShell."${system}" =
-        import ./shell.nix { inherit pkgs; };
-    
-          overlay =
-        final: prev: {
-          #unstable = pkgs';
-          my = self.packages."${system}";
-        };
-
-      overlays = import ./overlays { inherit inputs; };
-
-
-      # Output all modules in ./modules to flake. Modules should be in
-      # individual subdirectories and contain a default.nix file
-      nixosModules = builtins.listToAttrs (map
-        (x: {
-          name = x;
-          value = import (./modules/nixos + "/${x}");
-        })
-        (builtins.attrNames (builtins.readDir ./modules/nixos)));
-        
-
-      ##import our HM modules
-      ## -- imported in ./home-manger/general  
-      
-      homeManagerModules = builtins.listToAttrs (map
-        (name: {
-          inherit name;
-          value = import (./modules/home-manager + "/${name}");
-        })
-        (builtins.attrNames (builtins.readDir ./modules/home-manager)));
-
-
-      # nixosConfigurations =
-      #   mapHosts ./hosts {};
-
-      # NixOS configuration entrypoint
-      # Available through 'nixos-rebuild --flake .#your-hostname'
-      nixosConfigurations = {
-        go3-wsl = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit  inputs outputs lib;hostName = "go3-wsl"; };
-          modules = [
-            ./hosts/go3-wsl
-          ];
-        };
-        StuPC-WSL = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit  inputs outputs lib; hostName = "StuPC";};
-          modules = [
-            ./hosts/StuPC-WSL
-          ];
-        };
-      
-      };
-
-      # Standalone home-manager configuration entrypoint
-      # Available through 'home-manager --flake .#your-username@your-hostname'
-      homeConfigurations = {
-        # FIXME replace with your username@hostname
-        "sstent@go3-wsl" = home-manager.lib.homeManagerConfiguration {
-          # pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
-          pkgs = pkgs;
-          extraSpecialArgs = { inherit inputs outputs lib; hostName = "go3-wsl"; };
-          modules = [
-            # > Our main home-manager configuration file <
-            ./home-manager/users/sstent
-            inputs.sops-nix.homeManagerModules.sops         
-          ];
-        };
-        "sstent@StuPC-WSL" = home-manager.lib.homeManagerConfiguration {
-          # pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
-          pkgs = pkgs;
-          extraSpecialArgs = { inherit inputs outputs lib; hostName = "StuPC-WSL";};
-          modules = [
-            # > Our main home-manager configuration file <
-            ./home-manager/users/sstent
-            inputs.sops-nix.homeManagerModules.sops         
-          ];
-        };
-      };
 
+    overlay = final: prev: {
+      #unstable = pkgs';
+      my = self.packages."${system}";
     };
+
+    overlays = import ./overlays {inherit inputs;};
+
+    # Output all modules in ./modules to flake. Modules should be in
+    # individual subdirectories and contain a default.nix file
+    nixosModules = builtins.listToAttrs (map
+      (x: {
+        name = x;
+        value = import (./modules/nixos + "/${x}");
+      })
+      (builtins.attrNames (builtins.readDir ./modules/nixos)));
+
+    ##import our HM modules
+    ## -- imported in ./home-manger/general
+
+    homeManagerModules = builtins.listToAttrs (map
+      (name: {
+        inherit name;
+        value = import (./modules/home-manager + "/${name}");
+      })
+      (builtins.attrNames (builtins.readDir ./modules/home-manager)));
+
+    # nixosConfigurations =
+    #   mapHosts ./hosts {};
+
+    # NixOS configuration entrypoint
+    # Available through 'nixos-rebuild --flake .#your-hostname'
+    nixosConfigurations = {
+      go3-wsl = nixpkgs.lib.nixosSystem {
+        specialArgs = {
+          inherit inputs outputs lib;
+          hostName = "go3-wsl";
+        };
+        modules = [
+          ./hosts/go3-wsl
+        ];
+      };
+      StuPC-WSL = nixpkgs.lib.nixosSystem {
+        specialArgs = {
+          inherit inputs outputs lib;
+          hostName = "StuPC";
+        };
+        modules = [
+          ./hosts/StuPC-WSL
+        ];
+      };
+    };
+
+    # Standalone home-manager configuration entrypoint
+    # Available through 'home-manager --flake .#your-username@your-hostname'
+    homeConfigurations = {
+      # FIXME replace with your username@hostname
+      "sstent@go3-wsl" = home-manager.lib.homeManagerConfiguration {
+        # pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
+        pkgs = pkgs;
+        extraSpecialArgs = {
+          inherit inputs outputs lib;
+          hostName = "go3-wsl";
+        };
+        modules = [
+          # > Our main home-manager configuration file <
+          ./home-manager/users/sstent
+          inputs.sops-nix.homeManagerModules.sops
+        ];
+      };
+      "sstent@StuPC-WSL" = home-manager.lib.homeManagerConfiguration {
+        # pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
+        pkgs = pkgs;
+        extraSpecialArgs = {
+          inherit inputs outputs lib;
+          hostName = "StuPC-WSL";
+        };
+        modules = [
+          # > Our main home-manager configuration file <
+          ./home-manager/users/sstent
+          inputs.sops-nix.homeManagerModules.sops
+        ];
+      };
+    };
+  };
 }

home-manager/global.nix

@@ -1,65 +1,65 @@
-{ inputs, lib, pkgs, config, outputs, ... }:
 {
+  inputs,
+  lib,
+  pkgs,
+  config,
+  outputs,
+  ...
+}: {
+  imports =
+    [
+      # ./beets.nix
+      # ./keybase.nix
+      "${inputs.vscode-server}/modules/vscode-server/home.nix"
+    ]
+    ++ (builtins.attrValues outputs.homeManagerModules);
 
-  imports = [
+  ###dotfiles path variable
-    # ./beets.nix
+  options._dotfiles = lib.mkOption {
-    # ./keybase.nix
-    "${inputs.vscode-server}/modules/vscode-server/home.nix"
-  ] ++ (builtins.attrValues outputs.homeManagerModules);
-
-
-
-###dotfiles path variable
- options._dotfiles = lib.mkOption {
     type = lib.types.str;
     default = "${inputs.self}/home-manager/dotfiles";
     description = "Path to the dotfiles in this repository";
   };
 
-###secrets path variable
+  ###secrets path variable
- options._secrets = lib.mkOption {
+  options._secrets = lib.mkOption {
     type = lib.types.str;
     default = "/run/user/1000/secrets/";
     description = "Path to the Secrets runtime";
   };
 
-
+  ###secretstore path variable
-###secretstore path variable
+  options._secretstore = lib.mkOption {
- options._secretstore = lib.mkOption {
     type = lib.types.str;
     default = "${inputs.self}/secrets/";
     description = "Path to the Secrets storage";
   };
 
-config = {
+  config = {
+    nixpkgs = {
+      overlays = builtins.attrValues outputs.overlays;
+      config = {
+        allowUnfree = true;
+        allowUnfreePredicate = _: true;
+      };
+    };
 
+    nix = {
+      package = lib.mkDefault pkgs.nix;
+      settings = {
+        experimental-features = ["nix-command" "flakes" "repl-flake"];
+        warn-dirty = false;
+      };
+    };
 
+    ##VSCode
+    services.vscode-server.enable = true;
+    services.vscode-server.enableFHS = true;
+    services.vscode-server.nodejsPackage = pkgs.nodejs-18_x;
 
-  nixpkgs = {
+    programs = {
-    overlays = builtins.attrValues outputs.overlays;
+      home-manager.enable = true;
-    config = {
+      git.enable = true;
-      allowUnfree = true;
-      allowUnfreePredicate = (_: true);
     };
   };
-
-  nix = {
-    package = lib.mkDefault pkgs.nix;
-    settings = {
-      experimental-features = [ "nix-command" "flakes" "repl-flake" ];
-      warn-dirty = false;
-    };
-  };
-
-##VSCode
-  services.vscode-server.enable = true;
-  services.vscode-server.enableFHS = true;
-  services.vscode-server.nodejsPackage = pkgs.nodejs-18_x;
-
-
-  programs = {
-    home-manager.enable = true;
-    git.enable = true;
-  };
-};  
 }

home-manager/users/sstent/default.nix

@@ -1,7 +1,12 @@
-
-{ inputs, outputs, lib, config, pkgs, hostName, ... }:
-
 {
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  hostName,
+  ...
+}: {
   imports = [
     ../../global.nix
   ];
@@ -10,7 +15,7 @@
   home.stateVersion = "23.05";
 
   sops = {
-    age.sshKeyPaths = [ "/home/sstent/.ssh/id_ed25519" ];
+    age.sshKeyPaths = ["/home/sstent/.ssh/id_ed25519"];
     defaultSopsFile = "${config._secretstore}/user-secrets.yaml";
     secrets = {
       mrconfig = {
@@ -18,11 +23,9 @@
         format = "binary";
         path = "${config.home.homeDirectory}/.mrconfig";
       };
-     };
+    };
   };
 
-
-
   # home.file."/home/sstent/.config/beets/test".source = config.lib.file.mkOutOfStoreSymlink /run/user/1000/secrets/test;
 
   # Let Home Manager install and manage itself.
@@ -33,7 +36,7 @@
     bitwarden-cli
     ansible
     # sshpass
-    (import ./python-packages.nix { pkgs = pkgs; })
+    (import ./python-packages.nix {pkgs = pkgs;})
     pyinfra
     sshpass
     nmap
@@ -73,8 +76,8 @@
     yt-dlp.enable = true;
     bash = {
       enable = true;
-      historyControl = [ "ignorespace" ];
+      historyControl = ["ignorespace"];
-      shellOptions = [ "histappend" ];
+      shellOptions = ["histappend"];
       sessionVariables = {
         DOCKER_HOST = "tcp://192.168.1.223:2375";
         NOMAD_ADDR = "http://192.168.1.250:4646";
@@ -95,8 +98,7 @@
       enable = true;
       userName = "sstent";
       userEmail = "stuart.stent@gmail.com";
-      extraConfig = { pull.rebase = true; };
+      extraConfig = {pull.rebase = true;};
-
     };
     ssh = {
       enable = true;
@@ -114,9 +116,7 @@
       };
     };
   };
-
 }
-
 #######If Gnome
 # config = lib.mkIf config.mymods.gnome.enable {
 #   programs.bash.enable = true;
@@ -166,7 +166,6 @@
 #       ];
 #     };
 #     "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; };
-
 #   };
 # };
 

home-manager/users/sstent/python-packages.nix

@@ -1,7 +1,7 @@
-{ pkgs }:
+{pkgs}:
-
+pkgs.python3.withPackages (p:
-pkgs.python3.withPackages (p: with p; [
+    with p; [
-  requests # HTTP library
+      requests # HTTP library
-  setuptools # setup.py
+      setuptools # setup.py
-  paramiko # ssh library
+      paramiko # ssh library
-])
+    ])

hosts/StuPC-WSL/default.nix

@@ -1,9 +1,14 @@
-{ lib, pkgs, config, inputs,  ... }: {
+{
-
+  lib,
+  pkgs,
+  config,
+  inputs,
+  ...
+}: {
   imports = [
     ../common.nix
     ../user-sstent.nix
-      inputs.nixos-wsl.nixosModules.wsl
+    inputs.nixos-wsl.nixosModules.wsl
   ];
 
   # system.stateVersion = "22.11";
@@ -15,6 +20,4 @@
     syncthing.enable = true;
     wsl.enable = true;
   };
-
-
 }

hosts/common.nix

@@ -1,81 +1,84 @@
 # This file (and the global directory) holds config that i use on all hosts
-{ lib, inputs, outputs, pkgs, config, ... }:
 {
-  imports = [
+  lib,
-    inputs.home-manager.nixosModules.home-manager
+  inputs,
-    inputs.sops-nix.nixosModules.sops
+  outputs,
-   ]++ (builtins.attrValues outputs.nixosModules);
+  pkgs,
+  config,
+  ...
+}: {
+  imports =
+    [
+      inputs.home-manager.nixosModules.home-manager
+      inputs.sops-nix.nixosModules.sops
+    ]
+    ++ (builtins.attrValues outputs.nixosModules);
 
-###dotfiles path variable
+  ###dotfiles path variable
- options._dotfiles = lib.mkOption {
+  options._dotfiles = lib.mkOption {
     type = lib.types.str;
     default = "${inputs.self}/home-manager/dotfiles";
     description = "Path to the dotfiles in this repository";
   };
 
-###secrets path variable
+  ###secrets path variable
- options._secrets = lib.mkOption {
+  options._secrets = lib.mkOption {
     type = lib.types.str;
     default = "/run/user/1000/secrets";
     description = "Path to the Secrets runtime";
   };
 
-
+  ###secretstore path variable
-###secretstore path variable
+  options._secretstore = lib.mkOption {
- options._secretstore = lib.mkOption {
     type = lib.types.str;
     default = "${inputs.self}/secrets";
     description = "Path to the Secrets storage";
   };
 
-config = {
+  config = {
-  system.stateVersion = "23.05";
+    system.stateVersion = "23.05";
 
+    sops = {
+      defaultSopsFile = "${config._secretstore}/host-secrets.yaml";
+      age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
+    };
 
-  sops = {
+    home-manager = {
-  defaultSopsFile = "${config._secretstore}/host-secrets.yaml";
+      useUserPackages = true;
-  age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
+      extraSpecialArgs = {inherit inputs outputs;};
-};
+      sharedModules = [
+        inputs.sops-nix.homeManagerModules.sops
+      ];
+    };
 
-
+    nixpkgs.config.allowUnfree = true;
-  home-manager = {
+    programs.fuse.userAllowOther = true;
-    useUserPackages = true;
+    security.sudo.wheelNeedsPassword = false;
-    extraSpecialArgs = { inherit inputs outputs; };
-              sharedModules = [
-                inputs.sops-nix.homeManagerModules.sops
-              ];
-  };
-
-  nixpkgs.config.allowUnfree = true;
-   programs.fuse.userAllowOther = true;
-  security.sudo.wheelNeedsPassword = false;
 
     # nixpkgs.overlays = overlays;
-  # Enable nix flakes
+    # Enable nix flakes
-  nix.package = pkgs.nixFlakes;
+    nix.package = pkgs.nixFlakes;
-  nix.extraOptions = ''
+    nix.extraOptions = ''
-    experimental-features = nix-command flakes
+      experimental-features = nix-command flakes
-  '';
+    '';
-nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
+    nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
-#  nix.nixPath = [ "nixpkgs=pkgs.outPath" ];
+    #  nix.nixPath = [ "nixpkgs=pkgs.outPath" ];
     networking.search = ["node.dc1.consul" "service.dc1.consul"];
 
+    #services.envfs.enable = true;
+    environment.systemPackages = [
+      pkgs.git
+      pkgs.home-manager
+      pkgs.sops
+      pkgs.ssh-to-age
+      pkgs.age
+      pkgs.bitwarden-cli
+    ];
 
-#services.envfs.enable = true;
+    nix.gc = {
-  environment.systemPackages = [
+      automatic = true; # Enable the automatic garbage collector
-    pkgs.git
+      dates = "03:15"; # When to run the garbage collector
-    pkgs.home-manager
+      options = "-d"; # Arguments to pass to nix-collect-garbage
-    pkgs.sops
+    };
-    pkgs.ssh-to-age
+  };
-    pkgs.age
-    pkgs.bitwarden-cli
-  ];
-
-nix.gc = {
-    automatic = true;  # Enable the automatic garbage collector
-    dates = "03:15";   # When to run the garbage collector
-    options = "-d";    # Arguments to pass to nix-collect-garbage
-};
-
-};
 }

hosts/go3-wsl/default.nix

@@ -1,9 +1,14 @@
-{ lib, pkgs, config, inputs,  ... }: {
+{
-
+  lib,
+  pkgs,
+  config,
+  inputs,
+  ...
+}: {
   imports = [
     ../common.nix
     ../user-sstent.nix
-      inputs.nixos-wsl.nixosModules.wsl
+    inputs.nixos-wsl.nixosModules.wsl
   ];
 
   # system.stateVersion = "22.11";
@@ -16,5 +21,4 @@
     syncthing.enable = true;
     wsl.enable = true;
   };
-
 }

hosts/user-sstent.nix

@@ -1,25 +1,26 @@
-{ inputs, lib, config, ... }:
 {
-
+  inputs,
+  lib,
+  config,
+  ...
+}: {
   sops.secrets.sstent_password = {
     #sopsFile = ./secrets.yaml;
     neededForUsers = true;
   };
 
-    users.users = {
+  users.users = {
-      sstent = {
+    sstent = {
-        # initialPassword = "farscape5";
+      # initialPassword = "farscape5";
-        uid = 1000;
+      uid = 1000;
-        passwordFile = config.sops.secrets.sstent_password.path;
+      passwordFile = config.sops.secrets.sstent_password.path;
-        isNormalUser = true;
+      isNormalUser = true;
-        openssh.authorizedKeys.keys = [
+      openssh.authorizedKeys.keys = [
-          "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+D4o3mL4BQsRr0UIhB1hn0brSTIJ9Lr0m2fMMVGF3tIuEihnmwGTeAX78q5/bmoo4gZy7G+CHal54S1lY8LY1KvmIDCpPJ8848HvLbTiTX3qZ7Mjaav+Ox9eHMwX+7zkPwdhfP8TDvmNe12j1GEKBhAm+FhdBQCbEV7cbm1SkX0+WBGoVvI2qbRm1RF0mOuTAmO3Lr2YeAcKJ21YxwNMv1Qrj7oxGYH9rLHLNwZ/0soIdTC9cikl4DHyvCs4HRYcVw36uuCVc/AyIT2GeETRapAQr8nzT89Haa1IThgZ9ztjSsSSOtrUhxatlMIfTIpVjl/gWq7GLfqd/ei/evTal sstent@StuPC"
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+D4o3mL4BQsRr0UIhB1hn0brSTIJ9Lr0m2fMMVGF3tIuEihnmwGTeAX78q5/bmoo4gZy7G+CHal54S1lY8LY1KvmIDCpPJ8848HvLbTiTX3qZ7Mjaav+Ox9eHMwX+7zkPwdhfP8TDvmNe12j1GEKBhAm+FhdBQCbEV7cbm1SkX0+WBGoVvI2qbRm1RF0mOuTAmO3Lr2YeAcKJ21YxwNMv1Qrj7oxGYH9rLHLNwZ/0soIdTC9cikl4DHyvCs4HRYcVw36uuCVc/AyIT2GeETRapAQr8nzT89Haa1IThgZ9ztjSsSSOtrUhxatlMIfTIpVjl/gWq7GLfqd/ei/evTal sstent@StuPC"
-        ];
+      ];
-        extraGroups = [ "wheel" "video" ];
+      extraGroups = ["wheel" "video"];
-
-      };
     };
+  };
 
-#   home-manager.users.misterio = import home/${config.networking.hostName}.nix;
+  #   home-manager.users.misterio = import home/${config.networking.hostName}.nix;
-
 }

lib/attrs.nix

@@ -1,11 +1,9 @@
-{ lib, ... }:
+{lib, ...}:
-
 with builtins;
-with lib;
+with lib; rec {
-rec {
   # attrsToList
   attrsToList = attrs:
-    mapAttrsToList (name: value: { inherit name value; }) attrs;
+    mapAttrsToList (name: value: {inherit name value;}) attrs;
 
   # mapFilterAttrs ::
   #   (name -> value -> bool)

lib/default.nix

@@ -10,24 +10,28 @@
 #   map = callLibs ./map.nix;
 #   ## In configs, they can be used under "lib.our"
 # })
-
+{
-
+  inputs,
-
+  lib,
-{ inputs, lib, pkgs, ... }:
+  pkgs,
-
+  ...
-let
+}: let
   inherit (lib) makeExtensible attrValues foldr;
   inherit (modules) mapModules;
 
   modules = import ./modules.nix {
     inherit lib;
-    self.attrs = import ./attrs.nix { inherit lib; self = {}; };
+    self.attrs = import ./attrs.nix {
+      inherit lib;
+      self = {};
+    };
   };
 
   mylib = makeExtensible (self:
-    with self; mapModules ./.
+    with self;
-      (file: import file { inherit self lib pkgs inputs; }));
+      mapModules ./.
+      (file: import file {inherit self lib pkgs inputs;}));
 in
-mylib.extend
+  mylib.extend
   (self: super:
     foldr (a: b: a // b) {} (attrValues super))

lib/generators.nix

@@ -1,30 +1,32 @@
-{ lib, pkgs, ... }:
-
-with builtins;
-with lib;
 {
-  toCSSFile = file:
+  lib,
-    let fileName = removeSuffix ".scss" (baseNameOf file);
+  pkgs,
-        compiledStyles =
+  ...
-          pkgs.runCommand "compileScssFile"
+}:
-            { buildInputs = [ pkgs.sass ]; } ''
+with builtins;
-              mkdir "$out"
+with lib; {
-              scss --sourcemap=none \
+  toCSSFile = file: let
-                   --no-cache \
+    fileName = removeSuffix ".scss" (baseNameOf file);
-                   --style compressed \
+    compiledStyles =
-                   --default-encoding utf-8 \
+      pkgs.runCommand "compileScssFile"
-                   "${file}" \
+      {buildInputs = [pkgs.sass];} ''
-                   >>"$out/${fileName}.css"
+        mkdir "$out"
-            '';
+        scss --sourcemap=none \
-    in "${compiledStyles}/${fileName}.css";
+             --no-cache \
+             --style compressed \
+             --default-encoding utf-8 \
+             "${file}" \
+             >>"$out/${fileName}.css"
+      '';
+  in "${compiledStyles}/${fileName}.css";
 
-  toFilteredImage = imageFile: options:
+  toFilteredImage = imageFile: options: let
-    let result = "result.png";
+    result = "result.png";
-        filteredImage =
+    filteredImage =
-          pkgs.runCommand "filterWallpaper"
+      pkgs.runCommand "filterWallpaper"
-            { buildInputs = [ pkgs.imagemagick ]; } ''
+      {buildInputs = [pkgs.imagemagick];} ''
-              mkdir "$out"
+        mkdir "$out"
-              convert ${options} ${imageFile} $out/${result}
+        convert ${options} ${imageFile} $out/${result}
-            '';
+      '';
-    in "${filteredImage}/${result}";
+  in "${filteredImage}/${result}";
 }

lib/hm_secrets.nix

@@ -11,7 +11,6 @@
     hasSuffix
     mapAttrs'
     nameValuePair
-    
     ;
 in rec {
   filter = name: func: attrs: filterAttrs name (mapAttrs' func attrs);
@@ -20,13 +19,12 @@ in rec {
   hm_secrets = dir: out_dir:
     filter (name: type: type != null && !(hasPrefix "_" name)) (name: type:
       # if type == "regular" && hasSuffix ".age" name
-      if type == "regular"
+        if type == "regular"
-      then
+        then
-        nameValuePair name {
+          nameValuePair name {
-          sopsFile = dir + "/${name}";
+            sopsFile = dir + "/${name}";
-          format = "binary";
+            format = "binary";
-          path = out_dir + "/${name}";
+            path = out_dir + "/${name}";
-
+          }
-        }
+        else nameValuePair "" null) (readDir dir);
-      else nameValuePair "" null) (readDir dir);
 }

lib/modules.nix

@@ -1,53 +1,60 @@
-{ self, lib, ... }:
+{
-
+  self,
-let
+  lib,
+  ...
+}: let
   inherit (builtins) attrValues readDir pathExists concatLists;
   inherit (lib) id mapAttrsToList filterAttrs hasPrefix hasSuffix nameValuePair removeSuffix;
   inherit (self.attrs) mapFilterAttrs;
-in
+in rec {
-rec {
   mapModules = dir: fn:
     mapFilterAttrs
-      (n: v:
+    (n: v:
-        v != null &&
+      v
-        !(hasPrefix "_" n))
+      != null
-      (n: v:
+      && !(hasPrefix "_" n))
-        let path = "${toString dir}/${n}"; in
+    (n: v: let
-        if v == "directory" && pathExists "${path}/default.nix"
+      path = "${toString dir}/${n}";
-        then nameValuePair n (fn path)
+    in
-        else if v == "regular" &&
+      if v == "directory" && pathExists "${path}/default.nix"
-                n != "default.nix" &&
+      then nameValuePair n (fn path)
-                hasSuffix ".nix" n
+      else if
-        then nameValuePair (removeSuffix ".nix" n) (fn path)
+        v
-        else nameValuePair "" null)
+        == "regular"
-      (readDir dir);
+        && n != "default.nix"
+        && hasSuffix ".nix" n
+      then nameValuePair (removeSuffix ".nix" n) (fn path)
+      else nameValuePair "" null)
+    (readDir dir);
 
   mapModules' = dir: fn:
     attrValues (mapModules dir fn);
 
   mapModulesRec = dir: fn:
     mapFilterAttrs
-      (n: v:
+    (n: v:
-        v != null &&
+      v
-        !(hasPrefix "_" n))
+      != null
-      (n: v:
+      && !(hasPrefix "_" n))
-        let path = "${toString dir}/${n}"; in
+    (n: v: let
-        if v == "directory"
+      path = "${toString dir}/${n}";
-        then nameValuePair n (mapModulesRec path fn)
+    in
-        else if v == "regular" && n != "default.nix" && hasSuffix ".nix" n
+      if v == "directory"
-        then nameValuePair (removeSuffix ".nix" n) (fn path)
+      then nameValuePair n (mapModulesRec path fn)
-        else nameValuePair "" null)
+      else if v == "regular" && n != "default.nix" && hasSuffix ".nix" n
-      (readDir dir);
+      then nameValuePair (removeSuffix ".nix" n) (fn path)
+      else nameValuePair "" null)
+    (readDir dir);
 
-  mapModulesRec' = dir: fn:
+  mapModulesRec' = dir: fn: let
-    let
+    dirs =
-      dirs =
+      mapAttrsToList
-        mapAttrsToList
+      (k: _: "${dir}/${k}")
-          (k: _: "${dir}/${k}")
+      (filterAttrs
-          (filterAttrs
+        (n: v: v == "directory" && !(hasPrefix "_" n))
-            (n: v: v == "directory" && !(hasPrefix "_" n))
+        (readDir dir));
-            (readDir dir));
+    files = attrValues (mapModules dir id);
-      files = attrValues (mapModules dir id);
+    paths = files ++ concatLists (map (d: mapModulesRec' d id) dirs);
-      paths = files ++ concatLists (map (d: mapModulesRec' d id) dirs);
+  in
-    in map fn paths;
+    map fn paths;
 }

lib/nixos.nix

@@ -1,25 +1,29 @@
-{ inputs, lib, pkgs, ... }:
+{
-
+  inputs,
+  lib,
+  pkgs,
+  ...
+}:
 with lib;
-with lib.my;
+with lib.my; let
-let sys = "x86_64-linux";
+  sys = "x86_64-linux";
 in {
-  mkHost = path: attrs @ { system ? sys, ... }:
+  mkHost = path: attrs @ {system ? sys, ...}:
     nixosSystem {
       inherit system;
-      specialArgs = { inherit lib inputs system; };
+      specialArgs = {inherit lib inputs system;};
       modules = [
         {
           nixpkgs.pkgs = pkgs;
           networking.hostName = mkDefault (removeSuffix ".nix" (baseNameOf path));
         }
-        (filterAttrs (n: v: !elem n [ "system" ]) attrs)
+        (filterAttrs (n: v: !elem n ["system"]) attrs)
-        ../.   # /default.nix
+        ../. # /default.nix
         (import path)
       ];
     };
 
-  mapHosts = dir: attrs @ { system ? system, ... }:
+  mapHosts = dir: attrs @ {system ? system, ...}:
     mapModules dir
-      (hostPath: mkHost hostPath attrs);
+    (hostPath: mkHost hostPath attrs);
 }

lib/options.nix

@@ -1,18 +1,16 @@
-{ lib, ... }:
+{lib, ...}: let
-
-let
   inherit (lib) mkOption types;
-in
+in rec {
-rec {
+  mkOpt = type: default:
-  mkOpt  = type: default:
+    mkOption {inherit type default;};
-    mkOption { inherit type default; };
 
   mkOpt' = type: default: description:
-    mkOption { inherit type default description; };
+    mkOption {inherit type default description;};
 
-  mkBoolOpt = default: mkOption {
+  mkBoolOpt = default:
-    inherit default;
+    mkOption {
-    type = types.bool;
+      inherit default;
-    example = true;
+      type = types.bool;
-  };
+      example = true;
+    };
 }

modules/home-manager/beets/default.nix

@@ -1,7 +1,11 @@
-{ config, pkgs, lib, ... }:
+{
-with lib;
+  config,
-
+  pkgs,
-let cfg = config.custom.beets;
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.custom.beets;
 in {
   options.custom.beets = {
     enable = mkOption {
@@ -16,13 +20,12 @@ in {
       pkgs.ffmpeg # for replaygain
     ];
 
-
+    sops = {
-  sops = {
+      secrets.discogs_json = {
-    secrets.discogs_json = {
+        path = "${config.xdg.configHome}/beets/discogs_token.json";
-     path = "${config.xdg.configHome}/beets/discogs_token.json";
+      };
     };
-  };
+    programs.beets = {
-      programs.beets = {
       enable = true;
       settings = {
         album_fields = {
@@ -48,12 +51,12 @@ in {
           bracket = "[]";
           ignore_va = "compilation";
           types = [
-            { ep = "EP"; }
+            {ep = "EP";}
-            { single = "Single"; }
+            {single = "Single";}
-            { soundtrack = "OST"; }
+            {soundtrack = "OST";}
-            { live = "Live"; }
+            {live = "Live";}
-            { compilation = "Anthology"; }
+            {compilation = "Anthology";}
-            { remix = "Remix"; }
+            {remix = "Remix";}
           ];
         };
         aunique = {
@@ -61,9 +64,9 @@ in {
           disambiguators = "media";
           keys = "albumartist album";
         };
-        copyartifacts = { extensions = ".cue .log .jpg .jpeg .png .txt"; };
+        copyartifacts = {extensions = ".cue .log .jpg .jpeg .png .txt";};
         directory = "/mnt/q/CleanMusic/";
-        embedart = { auto = true; };
+        embedart = {auto = true;};
         extrafiles = {
           paths = {
             artworkdir = "$albumpath/Artwork";
@@ -73,7 +76,7 @@ in {
           };
           patterns = {
             all = "*.*";
-            artworkdir = [ "[sS]cans/" "[aA]rtwork/" "[aA]rt/" "[cC]over/" ];
+            artworkdir = ["[sS]cans/" "[aA]rtwork/" "[aA]rt/" "[cC]over/"];
           };
         };
         fetchart = {
@@ -93,8 +96,7 @@ in {
           isMultidisc = "1 if disctotal > 1 else 0";
           myBitDepth = "('' if bitdepth != 24 else '[24bit - '+ media + ']')";
           myDisc = "('' if disctotal <= 1 else str(disc) + ' - ')";
-          mySongartist =
+          mySongartist = "artist + ' - ' if artist != albumartist and artist != '' else ''";
-            "artist + ' - ' if artist != albumartist and artist != '' else ''";
         };
         library = "~/musiclibrary.db";
         match = {
@@ -123,8 +125,7 @@ in {
         };
         missing = {
           format_album = "$albumartist: ($year) $album $albumtype $atype";
-          format_item =
+          format_item = "$albumartist - $album [$albumtype]$atype: $track/$tracktotal $title";
-            "$albumartist - $album [$albumtype]$atype: $track/$tracktotal $title";
         };
         musicbrainz = {
           pass = "7ANCLPczDNFn6Sf65vdZ";
@@ -132,12 +133,9 @@ in {
         };
         original_date = true;
         paths = {
-          "albumtype:soundtrack" =
+          "albumtype:soundtrack" = "Soundtracks/$albumartist - $album%aunique{} ($year)/$myDisc$track - $artist - $title";
-            "Soundtracks/$albumartist - $album%aunique{} ($year)/$myDisc$track - $artist - $title";
+          comp = "Compilations/$albumartist/($year) $album%aunique{}/$myDisc$track - $artist - $title";
-          comp =
+          default = "%if{$artist_grouping,$artist_grouping/}$first_artist/$year - $album $atype%aunique{media}[%upper{$format}$bitdepth]%if{$media,[$media]}/%if{$isMultidisc,$disc - }$track - $mySongartist$title";
-            "Compilations/$albumartist/($year) $album%aunique{}/$myDisc$track - $artist - $title";
-          default =
-            "%if{$artist_grouping,$artist_grouping/}$first_artist/$year - $album $atype%aunique{media}[%upper{$format}$bitdepth]%if{$media,[$media]}/%if{$isMultidisc,$disc - }$track - $mySongartist$title";
         };
         per_disc_numbering = true;
         plugins = [
@@ -154,25 +152,21 @@ in {
           "replaygain"
           "info"
         ];
-                replaygain = {
+        replaygain = {
           backend = "ffmpeg";
         };
         rewrite = {
           "artist Björk & Tríó Guðmundar Ingólfssonar" = "Björk";
           "artist Brant Bjork and The Low Desert Punk Band" = "Brant Bjork";
-          "artist King Gizzard & The Lizard Wizard with Mild High Club" =
+          "artist King Gizzard & The Lizard Wizard with Mild High Club" = "King Gizzard & The Lizard Wizard";
-            "King Gizzard & The Lizard Wizard";
           "artist Kyuss _ Queens of the Stone Age" = "Kyuss";
           "artist Professor Elemental & Tom Caruana" = "Professor Elemental";
           "artist Resin Dogs Feat Spikey Tee" = "Resin Dogs";
           "artist Sepultura _ Exodus" = "Sepultura";
-          "artist The Knife in collaboration with Mount Sims and Planningtorock" =
+          "artist The Knife in collaboration with Mount Sims and Planningtorock" = "The Knife";
-            "The Knife";
           "artist Unida _ Dozer" = "Unida";
         };
       };
-
     };
-};
+  };
 }
-

modules/home-manager/keybase/default.nix

@@ -1,11 +1,17 @@
-{ config, pkgs, inputs, lib,  util, hostName, ... }:
+{
+  config,
+  pkgs,
+  inputs,
+  lib,
+  util,
+  hostName,
+  ...
+}:
 with lib;
-with lib.my;
+with lib.my; let
-let 
+  cfg = config.custom.keybase;
-cfg = config.custom.keybase;
+  username = config.home.username;
-username = config.home.username;
+  secretstore = config._secretstore;
-secretstore = config._secretstore;
-
 in {
   options.custom.keybase = {
     enable = mkOption {
@@ -15,16 +21,14 @@ in {
     };
   };
 
-
   config = mkIf cfg.enable {
-      services.keybase.enable = true;
+    services.keybase.enable = true;
-      services.kbfs.enable = true;
+    services.kbfs.enable = true;
-      systemd.user.services.keybase.Unit.After = [ "sops-nix.service" ];
+    systemd.user.services.keybase.Unit.After = ["sops-nix.service"];
-      systemd.user.services.kbfs.Unit.After = [ "sops-nix.service" ];
+    systemd.user.services.kbfs.Unit.After = ["sops-nix.service"];
 
-      sops = {
+    sops = {
-       secrets = hm_secrets "${secretstore}/user_dotfiles/${username}@${hostName}/keybase/" "${config.xdg.configHome}/keybase/";
+      secrets = hm_secrets "${secretstore}/user_dotfiles/${username}@${hostName}/keybase/" "${config.xdg.configHome}/keybase/";
-      };
+    };
-};
+  };
 }
-

modules/home-manager/ssh-proxy/default.nix

@@ -1,7 +1,11 @@
-{ lib, pkgs, config, ... }:
+{
-with lib;
+  lib,
-
+  pkgs,
-let cfg = config.custom.ssh-proxy;
+  config,
+  ...
+}:
+with lib; let
+  cfg = config.custom.ssh-proxy;
 in {
   options.custom.ssh-proxy = {
     enable = mkOption {
@@ -14,31 +18,28 @@ in {
   };
 
   config = mkIf cfg.enable {
-
     home.packages = with pkgs; [
-        npiperelay
+      npiperelay
-        socat
+      socat
     ];
 
+    systemd.user = {
+      startServices = true;
 
-   systemd.user = {
+      services.ssh-proxy = {
-
+        Unit = {
-  startServices = true;
+          Description = "WSL Proxy";
-
+          After = "sops-nix.service";
-  services.ssh-proxy = {
+        };
-    Unit = { Description = "WSL Proxy"; After = "sops-nix.service";};
+        Install = {WantedBy = ["default.target"];};
-    Install = { WantedBy = [ "default.target" ]; };
+        Service = {
-    Service = {
+          ExecStart = "${pkgs.writeShellScript "start-proxy" ''
-      ExecStart = "${pkgs.writeShellScript "start-proxy" ''
+            set -x -o xtrace # print commands
-set -x -o xtrace # print commands
+            ${pkgs.coreutils}/bin/rm -f /home/sstent/.ssh/wsl-ssh-agent.sock
-${pkgs.coreutils}/bin/rm -f /home/sstent/.ssh/wsl-ssh-agent.sock
+            ${pkgs.util-linux}/bin/setsid ${pkgs.socat}/bin/socat UNIX-LISTEN:/home/sstent/.ssh/wsl-ssh-agent.sock,fork EXEC:"${pkgs.npiperelay}/bin/npiperelay.exe -ei -s //./pipe/openssh-ssh-agent",nofork
-${pkgs.util-linux}/bin/setsid ${pkgs.socat}/bin/socat UNIX-LISTEN:/home/sstent/.ssh/wsl-ssh-agent.sock,fork EXEC:"${pkgs.npiperelay}/bin/npiperelay.exe -ei -s //./pipe/openssh-ssh-agent",nofork
+          ''}";
-      ''}";
+        };
+      };
     };
-    
-  };
- };
-
-
   };
 }

modules/nixos/mnt_public/default.nix

@@ -1,19 +1,21 @@
-{ lib, inputs, outputs, config, ... }:
+{
-with lib;
+  lib,
-
+  inputs,
- let cfg = config.custom.mnt_public;
+  outputs,
+  config,
+  ...
+}:
+with lib; let
+  cfg = config.custom.mnt_public;
 in {
   options.custom.mnt_public.enable = mkEnableOption "Enable mnt/Public";
 
   config = mkIf cfg.enable {
-
-
     fileSystems."/mnt/Public" = {
-        device = "//192.168.1.109/Public";
+      device = "//192.168.1.109/Public";
-        fsType = "cifs";
+      fsType = "cifs";
-        # options = ["uid=0,gid=1000"];
+      # options = ["uid=0,gid=1000"];
-        options = ["guest" "uid=1000"];
+      options = ["guest" "uid=1000"];
     };
- };
+  };
 }
-

modules/nixos/ssh/default.nix

@@ -1,20 +1,22 @@
-{ lib, pkgs, config, ... }:
+{
-with lib;
+  lib,
-
+  pkgs,
-let cfg = config.custom.sshd;
+  config,
+  ...
+}:
+with lib; let
+  cfg = config.custom.sshd;
 in {
-
   #define option to enable this
   options.custom.sshd.enable = mkEnableOption "Enable SSH";
 
   config = mkIf cfg.enable {
-services.openssh = {
+    services.openssh = {
-    enable = true;
+      enable = true;
-    permitRootLogin = "no";
+      permitRootLogin = "no";
-    passwordAuthentication = false;
+      passwordAuthentication = false;
-};
+    };
 
-  networking.firewall.allowedTCPPorts = [ 22 ];
+    networking.firewall.allowedTCPPorts = [22];
-
+  };
-};
 }

modules/nixos/syncthing/default.nix

@@ -1,33 +1,37 @@
-{ lib, inputs, outputs, config, ... }:
+{
-with lib;
+  lib,
-
+  inputs,
- let cfg = config.custom.syncthing;
+  outputs,
+  config,
+  ...
+}:
+with lib; let
+  cfg = config.custom.syncthing;
 in {
   options.custom.syncthing.enable = mkEnableOption "Enable mnt/Public";
 
   config = mkIf cfg.enable {
+    services.syncthing = {
+      enable = true;
+      dataDir = "/home/sstent";
+      openDefaultPorts = true;
+      configDir = "/home/sstent/.config/syncthing";
+      user = "sstent";
+      group = "users";
+      guiAddress = "0.0.0.0:8385";
 
-services.syncthing = {
+      overrideDevices = true;
-  enable = true;
+      overrideFolders = true;
-  dataDir = "/home/sstent";
+      devices = {
-  openDefaultPorts = true;
+        "StuPC" = {id = "Z43MPGF-OKG6K34-WTTFUDO-UG6E3TE-YCLSOAT-5LN5KMW-QHL2VSK-EZCGCAP";};
-  configDir = "/home/sstent/.config/syncthing";
+        "go3" = {id = "YDOL433-AHAL33M-NWLLDDQ-2D36ZIE-YNZVTKE-25TRBZ2-JXRSN7Y-Z5EOVQN";};
-  user = "sstent";
+      };
-  group = "users";
+      folders = {
-  guiAddress = "0.0.0.0:8385";
+        "default" = {
-    
+          path = "/home/sstent/sync";
-    overrideDevices = true;
+          devices = ["StuPC" "go3"];
-    overrideFolders = true;
+        };
-    devices = {
-      "StuPC" = { id = "Z43MPGF-OKG6K34-WTTFUDO-UG6E3TE-YCLSOAT-5LN5KMW-QHL2VSK-EZCGCAP"; };
-      "go3" = { id = "YDOL433-AHAL33M-NWLLDDQ-2D36ZIE-YNZVTKE-25TRBZ2-JXRSN7Y-Z5EOVQN"; };
-    };
-    folders = {
-      "default" = { 
-        path = "/home/sstent/sync"; 
-        devices = [ "StuPC" "go3" ];  
       };
     };
-};
   };
 }

modules/nixos/vpn/default.nix

@@ -1,41 +1,38 @@
-{ lib, pkgs, config, ... }:
+{
-with lib;
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+with lib; let
+  secretstore = config._secretstore;
+  host = config.networking.hostName;
 
-let 
+  cfg = config.custom.mullvad;
-secretstore = config._secretstore;
-host = config.networking.hostName;
-
-cfg = config.custom.mullvad;
-
-secret = if builtins.pathExists "${secretstore}/hosts/${host}/mullvad/device.json" then
-     ./secrets.nix
-   else
-    { };
 
+  secret =
+    if builtins.pathExists "${secretstore}/hosts/${host}/mullvad/device.json"
+    then ./secrets.nix
+    else {};
 in {
-
   #define option to enable this
   options.custom.mullvad.enable = mkEnableOption "Enable SSH";
 
   # imports = [ secret ];
 
   config = mkIf cfg.enable {
-  networking.wireguard.enable = true;
+    networking.wireguard.enable = true;
-  services.mullvad-vpn.enable = true;
+    services.mullvad-vpn.enable = true;
 
     # set some options after every daemon start
-  # to avoid accidentally leaving unsafe settings
+    # to avoid accidentally leaving unsafe settings
-  systemd.services."mullvad-daemon" = {
+    systemd.services."mullvad-daemon" = {
-    postStart = ''
+      postStart = ''
-      while ! ${pkgs.mullvad}/bin/mullvad status >/dev/null; do sleep 1; done
+        while ! ${pkgs.mullvad}/bin/mullvad status >/dev/null; do sleep 1; done
-      ${pkgs.mullvad}/bin/mullvad lan set allow   #enable local lan access
+        ${pkgs.mullvad}/bin/mullvad lan set allow   #enable local lan access
-      ${pkgs.mullvad}/bin/mullvad relay set tunnel-protocol wireguard
+        ${pkgs.mullvad}/bin/mullvad relay set tunnel-protocol wireguard
-      ${pkgs.mullvad}/bin/mullvad relay set location ca mtr
+        ${pkgs.mullvad}/bin/mullvad relay set location ca mtr
-    '';
+      '';
+    };
   };
-  
-
-
-
-};
 }

modules/nixos/vpn/secrets.nix

@@ -1,23 +1,18 @@
-{ lib, pkgs, config, ... }:
+{
-with lib;
+  lib,
-
+  pkgs,
-let 
+  config,
-secretstore = config._secretstore;
+  ...
-host = config.networking.hostName;
+}:
-secretpath = "${secretstore}/hosts/${host}/mullvad/device.json";
+with lib; let
-
+  secretstore = config._secretstore;
+  host = config.networking.hostName;
+  secretpath = "${secretstore}/hosts/${host}/mullvad/device.json";
 in {
-
+  sops.secrets.device_json = {
-
- sops.secrets.device_json= {
     sopsFile = "${secretstore}/hosts/${host}/mullvad/device.json";
     device_json.format = "binary";
- };
+  };
 
   environment.etc."mullvad-vpn/device.conf".source = config.sops.secrets.device_json.path;
-
-
-
-
-
 }

modules/nixos/wsl2/default.nix

@@ -1,56 +1,57 @@
-{ lib, inputs, outputs, config, pkgs, ... }:
+{
-with lib;
+  lib,
-
+  inputs,
- let cfg = config.custom.wsl;
+  outputs,
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.custom.wsl;
 in {
   options.custom.wsl.enable = mkEnableOption "Enable WSL2 settings";
 
   config = mkIf cfg.enable {
+    # Enable native Docker support
+    virtualisation.docker.enable = true;
 
-  # Enable native Docker support
+    wsl = {
-  virtualisation.docker.enable = true;
+      enable = true;
+      wslConf.automount.root = "/mnt";
+      defaultUser = "sstent";
+      startMenuLaunchers = true;
+      wslConf.interop.appendWindowsPath = false;
+      #No longer needed in 23.05
+      #interop.preserveArgvZero = true;
+      #docker-native.enable = true;
 
-  wsl = {
+      nativeSystemd = true;
-    enable = true;
+      # Enable integration with Docker Desktop (needs to be installed)
-    wslConf.automount.root = "/mnt";
+      # docker-desktop.enable = true;
-    defaultUser = "sstent";
-    startMenuLaunchers = true;
-    wslConf.interop.appendWindowsPath = false;
-    #No longer needed in 23.05
-    #interop.preserveArgvZero = true; 
-    #docker-native.enable = true;
-    
-    nativeSystemd = true;
-    # Enable integration with Docker Desktop (needs to be installed)
-    # docker-desktop.enable = true;
-  };
-  
-   systemd.services.nixs-wsl-systemd-fix = {
-    description = "Fix the /dev/shm symlink to be a mount";
-    unitConfig = {
-      DefaultDependencies = "no";
-      Before = [
-        "sysinit.target"
-        "systemd-tmpfiles-setup-dev.service"
-        "systemd-tmpfiles-setup.service"
-        "systemd-sysctl.service"
-      ];
-      ConditionPathExists = "/dev/shm";
-      ConditionPathIsSymbolicLink = "/dev/shm";
-      ConditionPathIsMountPoint = "/run/shm";
     };
-    serviceConfig = {
+
-      Type = "oneshot";
+    systemd.services.nixs-wsl-systemd-fix = {
-      ExecStart = [
+      description = "Fix the /dev/shm symlink to be a mount";
-        "${pkgs.coreutils-full}/bin/rm /dev/shm"
+      unitConfig = {
-        "/run/wrappers/bin/mount --bind -o X-mount.mkdir /run/shm /dev/shm"
+        DefaultDependencies = "no";
-      ];
+        Before = [
+          "sysinit.target"
+          "systemd-tmpfiles-setup-dev.service"
+          "systemd-tmpfiles-setup.service"
+          "systemd-sysctl.service"
+        ];
+        ConditionPathExists = "/dev/shm";
+        ConditionPathIsSymbolicLink = "/dev/shm";
+        ConditionPathIsMountPoint = "/run/shm";
+      };
+      serviceConfig = {
+        Type = "oneshot";
+        ExecStart = [
+          "${pkgs.coreutils-full}/bin/rm /dev/shm"
+          "/run/wrappers/bin/mount --bind -o X-mount.mkdir /run/shm /dev/shm"
+        ];
+      };
+      wantedBy = ["sysinit.target"];
     };
-    wantedBy = [ "sysinit.target" ];
-  };
-
-
-
-
   };
 }

nixpkgs.nix

@@ -1,8 +1,9 @@
 # A nixpkgs instance that is grabbed from the pinned nixpkgs commit in the lock file
 # This is useful to avoid using channels when using legacy nix commands
-let lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked;
+let
+  lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked;
 in
-import (fetchTarball {
+  import (fetchTarball {
-  url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz";
+    url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz";
-  sha256 = lock.narHash;
+    sha256 = lock.narHash;
-})
+  })

overlays/default.nix

@@ -1,8 +1,7 @@
 # This file defines overlays
-{ inputs, ... }:
+{inputs, ...}: {
-{
   # This one brings our custom packages from the 'pkgs' directory
-  additions = final: _prev: import ../pkgs { pkgs = final; };
+  additions = final: _prev: import ../pkgs {pkgs = final;};
 
   # This one contains whatever you want to overlay
   # You can change versions, add patches, set compilation flags, anything really.

pkgs/default.nix

@@ -1,8 +1,6 @@
 # Custom packages, that can be defined similarly to ones from nixpkgs
 # You can build them using 'nix build .#example' or (legacy) 'nix-build -A example'
-
+{pkgs ? (import ../nixpkgs.nix) {}}: {
-{ pkgs ? (import ../nixpkgs.nix) { } }: {
   # example = pkgs.callPackage ./example { };
-  npiperelay = pkgs.callPackage ./npiperelay { };
+  npiperelay = pkgs.callPackage ./npiperelay {};
-
 }

pkgs/npiperelay/default.nix

@@ -1,11 +1,13 @@
-{ lib, stdenv, fetchurl ,unzip }:
+{
-
+  lib,
-let
+  stdenv,
+  fetchurl,
+  unzip,
+}: let
   version = "1.6.3";
   srcs = {
     x86_64-linux = fetchurl {
-      url =
+      url = "https://github.com/jstarks/npiperelay/releases/download/v0.1.0/npiperelay_windows_amd64.zip";
-        "https://github.com/jstarks/npiperelay/releases/download/v0.1.0/npiperelay_windows_amd64.zip";
       sha256 = "sha256-a572H/0XwDUHqaPVTYFdzrPa5mmsZ/w79CJdHnZM5fY=";
     };
 
@@ -15,38 +17,36 @@ let
     #   sha256 = "sha256-zuy4e9bzcRqDeXP6mfzZLCDK/3we25LH6xktnO6HXps=";
     # };
   };
+in
+  stdenv.mkDerivation rec {
+    pname = "npiperelay";
+    inherit version;
 
-in stdenv.mkDerivation rec {
+    src = srcs.${stdenv.hostPlatform.system};
-  pname = "npiperelay";
-  inherit version;
 
-  src = srcs.${stdenv.hostPlatform.system};
+    nativeBuildInputs = [unzip];
 
-  nativeBuildInputs = [ unzip ];
+    #buildInputs = [ qtserialport qtwebsockets ];
+    unpackPhase = ''
+      mkdir npiperelay-$version
+      cd npiperelay-$version
+      unzip $src
+    '';
+    #unpackPhase = "dpkg-deb -x $src .";
 
-  #buildInputs = [ qtserialport qtwebsockets ];
+    installPhase = ''
-  unpackPhase = ''
+      mkdir -p $out/bin
-    mkdir npiperelay-$version
+      cp npiperelay.exe $out/bin/npiperelay.exe
-    cd npiperelay-$version
+      chmod +x $out/bin/npiperelay.exe
-    unzip $src
+    '';
-  '';
-  #unpackPhase = "dpkg-deb -x $src .";
 
-  installPhase = ''
+    meta = with lib; {
-            mkdir -p $out/bin
+      description = "Helper to interface with Windows ssh-agent.exe service from Windows Subsystem for Linux (WSL)";
-            cp npiperelay.exe $out/bin/npiperelay.exe
+      # 2019-08-19: The homepage links to old software that doesn't even work --
-            chmod +x $out/bin/npiperelay.exe
+      # it fails to detect ConBee2.
-  '';
+      homepage = "https://github.com/rupor-github/wsl-ssh-agent";
-
+      license = licenses.free;
-  meta = with lib; {
+      platforms = ["x86_64-linux"];
-    description =
+      maintainers = with maintainers; [sstent];
-      "Helper to interface with Windows ssh-agent.exe service from Windows Subsystem for Linux (WSL)";
+    };
-    # 2019-08-19: The homepage links to old software that doesn't even work --
+  }
-    # it fails to detect ConBee2.
-    homepage =
-      "https://github.com/rupor-github/wsl-ssh-agent";
-    license = licenses.free;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ sstent ];
-  };
-}

shell.nix

@@ -1,23 +1,23 @@
-{ pkgs ? import <nixpkgs> {} }:
+{pkgs ? import <nixpkgs> {}}:
-
+with pkgs; let
-with pkgs;
+  nixBin = writeShellScriptBin "nix" ''
-let nixBin =
+    ${nixFlakes}/bin/nix --option experimental-features "nix-command flakes" "$@"
-      writeShellScriptBin "nix" ''
-        ${nixFlakes}/bin/nix --option experimental-features "nix-command flakes" "$@"
-      '';
-in mkShell {
-  buildInputs = [
-    nix home-manager git   ssh-to-age    sops  age
-  ];
-  shellHook = ''
-    export FLAKE="$(pwd)"
-    export PATH="$FLAKE/bin:${nixBin}/bin:$PATH"
   '';
-}
+in
-
+  mkShell {
-
+    buildInputs = [
-
+      nix
-
+      home-manager
+      git
+      ssh-to-age
+      sops
+      age
+    ];
+    shellHook = ''
+      export FLAKE="$(pwd)"
+      export PATH="$FLAKE/bin:${nixBin}/bin:$PATH"
+    '';
+  }
 # { pkgs ? (import ./nixpkgs.nix) { } }: {
 #   default = pkgs.mkShell {
 #     # Enable experimental features without having to specify the argument
@@ -25,3 +25,4 @@ in mkShell {
 #     nativeBuildInputs = with pkgs; [ nix home-manager git   ssh-to-age    sops  age ];
 #   };
 # }
+