From 8513d03468115cf4431fc6bef85a7cf7bb5eb8d1 Mon Sep 17 00:00:00 2001 From: sstent Date: Thu, 30 Nov 2023 15:16:17 +0000 Subject: [PATCH] fixing fitbit --- flake.nix | 2 +- hosts/common.nix | 214 +++++++++++------------------------------------ 2 files changed, 48 insertions(+), 168 deletions(-) diff --git a/flake.nix b/flake.nix index 96228dd..d6e2876 100644 --- a/flake.nix +++ b/flake.nix @@ -131,7 +131,7 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.sstent = import ./home-manager; + home-manager.users.sstent = import ./home-manager/sstent; home-manager.sharedModules = [ inputs.sops-nix.homeManagerModules.sops ]; diff --git a/hosts/common.nix b/hosts/common.nix index d918d71..e012e97 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -1,180 +1,60 @@ -<<<<<<< HEAD -# This file (and the global directory) holds config that i use on all hosts -{ - lib, - inputs, - outputs, - pkgs, - config, - ... -}: { - imports = - [ - inputs.home-manager.nixosModules.home-manager - inputs.sops-nix.nixosModules.sops - ] - ++ (builtins.attrValues outputs.nixosModules); - - ###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 - options._secrets = lib.mkOption { - type = lib.types.str; - default = "/run/user/1000/secrets"; - description = "Path to the Secrets runtime"; - }; - - ###secretstore path variable - options._secretstore = lib.mkOption { - type = lib.types.str; - default = "${inputs.self}/secrets"; - description = "Path to the Secrets storage"; - }; - - config = { - system.stateVersion = "23.05"; - - sops = { - defaultSopsFile = "${config._secretstore}/host-secrets.yaml"; - age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; - }; - - home-manager = { - useUserPackages = true; - extraSpecialArgs = {inherit inputs outputs;}; - sharedModules = [ - inputs.sops-nix.homeManagerModules.sops - ]; - }; - - nixpkgs.config.allowUnfree = true; - programs.fuse.userAllowOther = true; - security.sudo.wheelNeedsPassword = false; - virtualisation.docker.enable = true; - - # nixpkgs.overlays = overlays; - # Enable nix flakes - nix.package = pkgs.nixFlakes; - nix.extraOptions = '' - experimental-features = nix-command flakes - ''; - nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"]; - # 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 - ]; - - 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 - }; - }; -} -======= # This file (and the global directory) holds config that i use on all hosts -{ lib, inputs, outputs, pkgs, config, ... }: { - imports = [ - inputs.home-manager.nixosModules.home-manager - inputs.sops-nix.nixosModules.sops - # ./binfmt.nix - ]++ (builtins.attrValues outputs.nixosModules); + lib, + inputs, + pkgs, + config, + ... +}: { + imports = + [ + inputs.home-manager.nixosModules.home-manager + inputs.sops-nix.nixosModules.sops + ]; -###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"; - }; + config = { + system.stateVersion = "23.05"; -###secrets path variable - options._secrets = lib.mkOption { - type = lib.types.str; - default = "/run/user/1000/secrets"; - description = "Path to the Secrets runtime"; - }; + sops = { + defaultSopsFile = ../secrets/host-secrets.yaml; + age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; + }; -###secretstore path variable - options._secretstore = lib.mkOption { - type = lib.types.str; - default = "${inputs.self}/secrets"; - description = "Path to the Secrets storage"; - }; - -config = { - system.stateVersion = "23.05"; - - - sops = { - defaultSopsFile = "${config._secretstore}/host-secrets.yaml"; - age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; -}; - - - home-manager = { - useUserPackages = true; - extraSpecialArgs = { inherit inputs outputs; }; - sharedModules = [ - inputs.sops-nix.homeManagerModules.sops - ]; - }; - - nixpkgs.config.allowUnfree = true; - programs.fuse.userAllowOther = true; - security.sudo.wheelNeedsPassword = false; + programs.fuse.userAllowOther = true; + security.sudo.wheelNeedsPassword = false; + virtualisation.docker.enable = true; # nixpkgs.overlays = overlays; - # Enable nix flakes - nix.package = pkgs.nixFlakes; - nix.extraOptions = '' - experimental-features = nix-command flakes - ''; -nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; -# nix.extra-platforms = aarch64-linux i686-linux; + # Enable nix flakes + nix.package = pkgs.nixFlakes; + nix.extraOptions = '' + experimental-features = nix-command flakes + ''; + nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"]; + # nix.nixPath = [ "nixpkgs=pkgs.outPath" ]; + networking.search = ["node.dc1.consul" "service.dc1.consul"]; -# nix.nixPath = [ "nixpkgs=pkgs.outPath" ]; -# boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; -boot.binfmt.emulatedSystems = ["armv7l-linux" "aarch64-linux"]; + ##VSCode + #services.vscode-server.enable = true; + #services.vscode-server.enableFHS = true; + #services.vscode-server.nodejsPackage = pkgs.nodejs-18_x; -nix.settings.substituters = [ - "https://fbleagh.cachix.org" - "https://cache.armv7l.xyz" - "https://arm.cachix.org" - "https://thefloweringash-armv7.cachix.org" ]; -nix.settings.trusted-public-keys = [ - "fbleagh.cachix.org-1:HNgEVkx9HfKmEQdR+9IeCwqFza0k8d8fJgcYvOTVDB8=" - "cache.armv7l.xyz-1:kBY/eGnBAYiqYfg0fy0inWhshUo+pGFM3Pj7kIkmlBk=" - "arm.cachix.org-1:K3XjAeWPgWkFtSS9ge5LJSLw3xgnNqyOaG7MDecmTQ8=" - "thefloweringash-armv7.cachix.org-1:v+5yzBD2odFKeXbmC+OPWVqx4WVoIVO6UXgnSAWFtso=" -]; -nix.settings.trusted-users = [ "root" "sstent" ]; -#services.envfs.enable = true; - environment.systemPackages = [ - pkgs.git - pkgs.home-manager - pkgs.sops - pkgs.ssh-to-age - pkgs.age - pkgs.qemu - pkgs.cachix - ]; + #services.envfs.enable = true; + environment.systemPackages = [ + pkgs.git + pkgs.home-manager + 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 + }; + }; } ->>>>>>> dacf7df (updates)