From ce4e7563ead28140300084e9dd88aa77df662e65 Mon Sep 17 00:00:00 2001 From: sstent Date: Thu, 30 Nov 2023 19:57:37 +0000 Subject: [PATCH] fixing fitbit --- home-manager/global.nix | 65 ---------- home-manager/users/sstent/default.nix | 4 +- hosts/StuPC-WSL/default.nix | 12 +- hosts/commonold.nix | 179 -------------------------- 4 files changed, 8 insertions(+), 252 deletions(-) delete mode 100644 home-manager/global.nix delete mode 100644 hosts/commonold.nix diff --git a/home-manager/global.nix b/home-manager/global.nix deleted file mode 100644 index e8e36fc..0000000 --- a/home-manager/global.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - inputs, - lib, - pkgs, - config, - outputs, - ... -}: { - imports = - [ - # ./beets.nix - # ./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 - 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 = { - 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; - - programs = { - home-manager.enable = true; - git.enable = true; - }; - }; -} diff --git a/home-manager/users/sstent/default.nix b/home-manager/users/sstent/default.nix index 31ac360..f112a14 100644 --- a/home-manager/users/sstent/default.nix +++ b/home-manager/users/sstent/default.nix @@ -12,8 +12,8 @@ # ./beets.nix # ./keybase.nix "${inputs.vscode-server}/modules/vscode-server/home.nix" - # ] ++ (builtins.attrValues outputs.homeManagerModules); - ]; + ] ++ (builtins.attrValues outputs.homeManagerModules); + # ]; # custom = { diff --git a/hosts/StuPC-WSL/default.nix b/hosts/StuPC-WSL/default.nix index 217e628..49b0374 100644 --- a/hosts/StuPC-WSL/default.nix +++ b/hosts/StuPC-WSL/default.nix @@ -17,10 +17,10 @@ nixpkgs.hostPlatform.system = "x86_64-linux"; networking.hostName = "StuPC-WSL"; services.openssh.enable = true; - custom = { - mullvad.enable = true; - mnt_public.enable = true; - syncthing.enable = true; - wsl.enable = true; - }; + # custom = { + # mullvad.enable = true; + # mnt_public.enable = true; + # syncthing.enable = true; + # wsl.enable = true; + # }; } diff --git a/hosts/commonold.nix b/hosts/commonold.nix deleted file mode 100644 index 9b8b1c1..0000000 --- a/hosts/commonold.nix +++ /dev/null @@ -1,179 +0,0 @@ -<<<<<<< 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; - - # 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); - -###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; - - # 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; - -# nix.nixPath = [ "nixpkgs=pkgs.outPath" ]; -# boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; -boot.binfmt.emulatedSystems = ["armv7l-linux" "aarch64-linux"]; - -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 - ]; - -}; -} ->>>>>>> dacf7df (updates)