From 089254699bc79b86ad1810c585c84d4d3d23dc90 Mon Sep 17 00:00:00 2001 From: sstent Date: Thu, 30 Nov 2023 15:14:53 +0000 Subject: [PATCH] fixing fitbit --- HyperV/configuration.nix | 48 --------------- HyperV/hardware.nix | 37 ----------- HyperV/hyperv.nix | 15 ----- HyperV/networking.nix | 24 -------- HyperV/ssh/ssh_host_ed25519_key | 7 --- HyperV/ssh/ssh_host_ed25519_key.pub | 1 - HyperV/ssh/ssh_host_rsa_key | 49 --------------- HyperV/ssh/ssh_host_rsa_key.pub | 1 - flake.nix | 28 ++++----- home-manager/users/sstent/default.nix | 89 ++++++--------------------- 10 files changed, 32 insertions(+), 267 deletions(-) delete mode 100644 HyperV/configuration.nix delete mode 100644 HyperV/hardware.nix delete mode 100644 HyperV/hyperv.nix delete mode 100644 HyperV/networking.nix delete mode 100755 HyperV/ssh/ssh_host_ed25519_key delete mode 100644 HyperV/ssh/ssh_host_ed25519_key.pub delete mode 100755 HyperV/ssh/ssh_host_rsa_key delete mode 100644 HyperV/ssh/ssh_host_rsa_key.pub diff --git a/HyperV/configuration.nix b/HyperV/configuration.nix deleted file mode 100644 index e6b6364..0000000 --- a/HyperV/configuration.nix +++ /dev/null @@ -1,48 +0,0 @@ -# This is your system's configuration file. -# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) -{ - lib, - config, - pkgs, - modulesPath, - ... -}: { - # You can import other NixOS modules here - - imports = [ - # Include my hardware settings. - ./hardware.nix - # Include static network settings. - ./networking.nix - "${modulesPath}/virtualisation/hyperv-image.nix" - ]; - - nixpkgs = {config = {allowUnfree = true;};}; - - nix = { - settings = { - experimental-features = "nix-command flakes"; - auto-optimise-store = true; - }; - }; - - networking.hostName = "HyperV"; - - boot.loader.systemd-boot.enable = true; - system.stateVersion = "23.05"; - - mymods = { - gnome.enable = true; - user_sstent.enable = true; - sshd.enable = true; - }; - - 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"; - environment.etc."ssh/ssh_host_rsa_key.pub".source = ./ssh/ssh_host_rsa_key.pub; - 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; -} diff --git a/HyperV/hardware.nix b/HyperV/hardware.nix deleted file mode 100644 index 0507ea4..0000000 --- a/HyperV/hardware.nix +++ /dev/null @@ -1,37 +0,0 @@ -# This is just an example, you should generate yours with nixos-generate-config and put it in here. -{ - config, - lib, - modulesPath, - pkgs, - ... -}: { - # Set your system kind (needed for flakes) - nixpkgs.hostPlatform = "x86_64-linux"; - virtualisation.hypervGuest.videoMode = "1920x1080"; - - boot.initrd.availableKernelModules = ["sd_mod" "sr_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["hv_sock"]; - - # fileSystems."/" = { - # device = "/dev/disk/by-label/nixos"; - # autoResize = true; - # 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}"]; - }; -} diff --git a/HyperV/hyperv.nix b/HyperV/hyperv.nix deleted file mode 100644 index 058ce40..0000000 --- a/HyperV/hyperv.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: { - # You can import other NixOS modules here - hyperv = { - baseImageSize = 8096; - }; - - # environment.etc = { - # nixos.source = ../..; - # }; -} diff --git a/HyperV/networking.nix b/HyperV/networking.nix deleted file mode 100644 index 43b1727..0000000 --- a/HyperV/networking.nix +++ /dev/null @@ -1,24 +0,0 @@ -{...}: { - # This file was populated at runtime with the networking - # details gathered from the active system. - networking = { - useDHCP = false; - nameservers = [ - "192.168.1.1" - "192.168.1.250" - "8.8.8.8" - "8.8.4.4" - ]; - defaultGateway = { - address = "192.168.1.1"; - }; - interfaces.eth0 = { - ipv4.addresses = [ - { - address = "192.168.1.230"; - prefixLength = 24; - } - ]; - }; - }; -} diff --git a/HyperV/ssh/ssh_host_ed25519_key b/HyperV/ssh/ssh_host_ed25519_key deleted file mode 100755 index 5acf773..0000000 --- a/HyperV/ssh/ssh_host_ed25519_key +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW -QyNTUxOQAAACBRqPpgqp6hRtY97TI6Mz5vDrhL62QDJsO7oZtkOacFwAAAAJAcdclzHHXJ -cwAAAAtzc2gtZWQyNTUxOQAAACBRqPpgqp6hRtY97TI6Mz5vDrhL62QDJsO7oZtkOacFwA -AAAEC5jt0tLdgOmfZOlDMV4bDqH5Q4/8/mYmVdQxGwArBYaVGo+mCqnqFG1j3tMjozPm8O -uEvrZAMmw7uhm2Q5pwXAAAAAC3Jvb3RASHlwZXJWAQI= ------END OPENSSH PRIVATE KEY----- diff --git a/HyperV/ssh/ssh_host_ed25519_key.pub b/HyperV/ssh/ssh_host_ed25519_key.pub deleted file mode 100644 index 2cc973a..0000000 --- a/HyperV/ssh/ssh_host_ed25519_key.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFGo+mCqnqFG1j3tMjozPm8OuEvrZAMmw7uhm2Q5pwXA root@HyperV diff --git a/HyperV/ssh/ssh_host_rsa_key b/HyperV/ssh/ssh_host_rsa_key deleted file mode 100755 index 11e1ced..0000000 --- a/HyperV/ssh/ssh_host_rsa_key +++ /dev/null @@ -1,49 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -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 -zudLA/fCobMAAAALcm9vdEBIeXBlclY= ------END OPENSSH PRIVATE KEY----- diff --git a/HyperV/ssh/ssh_host_rsa_key.pub b/HyperV/ssh/ssh_host_rsa_key.pub deleted file mode 100644 index 1bbd6a2..0000000 --- a/HyperV/ssh/ssh_host_rsa_key.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDFr00AO9ojy2RbfV2ECYnBtw/RvGGRIy7dDGuDACieuHb3DgdtbLx3ovZIQtRk+Dz8unw+a0Tve6wS2elym4smQ7onY1efosw9kkfS5ReEjIqNpRpPjfrlJm6+Jnhk+Ps1h5pYFzkTXlnlgZJeaOOV5LL8s2k8vMZVGW9dDrHbeQkCOZfPWIFnN+m8E0OLo0zAxVwMMCDrjwjxiXUz/HESxyGpiZ1AbWHVnByp97AyMbnCBcqqmm6NAnN87m7WF79MrTGfLOFwp615huhSVGOQmszR3Xwm3u6F/vG0FSreiXvMxirS+dYZ2/d3+oUCh90Zs7oCiVTUe6Ty2rtj8DzIwj97HrJFTs6HHHa7lH7YUAG0iI86Tr9rlgWtZ1Nwl7LKqyHUnZtKQ3t4G11CYneQfgjVsUsUcTDuteOIsL9MmWdh/r4IGLV8n6ub3XOrmr0jvzrpJzib6OaQLsyGjrD+PqtHSujzwNIgH06/fqnGS6P4i57ahI986HSsKhW3qH3fAejWpNWMaWgvNcOkgVzlot2MPw5nJBjjY41ilndt0p3YNqGu0uh1e4zz5PAY5xseuu/UyQaghUndmGXKPxsKOyTcDW6mHOdBI12dxlJHC0BwqpwLy95FIWinniiE28o1jZA682auG3zbGVE1WHePrlbJNBVL2HMpH+pkj7eyiw== root@HyperV diff --git a/flake.nix b/flake.nix index 391666e..96228dd 100644 --- a/flake.nix +++ b/flake.nix @@ -4,33 +4,22 @@ inputs = { # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/release-23.05"; - # You can access packages and modules from different nixpkgs revs - # at the same time. Here's an working example: - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. - # Home manager + # see 'unstable-packages' overlay at 'overlays/default.nix'. + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + + home-manager.url = "github:nix-community/home-manager/release-23.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - - # TODO: Add any other flake you might need - # hardware.url = "github:nixos/nixos-hardware"; - - # 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-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"; }; sops-nix.url = github:Mic92/sops-nix; flake-utils.url = "github:numtide/flake-utils"; - # nix.url = "github:NixOS/nix/2.12.0"; vscode-server.url = "github:msteen/nixos-vscode-server"; - # homeage = {url = "github:jordanisaacs/homeage"; inputs.nixpkgs.follows = "nixpkgs";}; # Nix Library Functions library = { type = "github"; @@ -138,6 +127,15 @@ }; modules = [ ./hosts/StuPC-WSL + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.sstent = import ./home-manager; + home-manager.sharedModules = [ + inputs.sops-nix.homeManagerModules.sops + ]; + } ]; }; }; diff --git a/home-manager/users/sstent/default.nix b/home-manager/users/sstent/default.nix index 2f71397..e9c36cc 100644 --- a/home-manager/users/sstent/default.nix +++ b/home-manager/users/sstent/default.nix @@ -1,35 +1,43 @@ { - inputs, - outputs, lib, - config, + outputs, pkgs, + config, hostName, ... }: { - imports = [ - ../../global.nix - ]; home.username = "sstent"; home.homeDirectory = "/home/sstent"; home.stateVersion = "23.05"; sops = { age.sshKeyPaths = ["/home/sstent/.ssh/id_ed25519"]; - defaultSopsFile = "${config._secretstore}/user-secrets.yaml"; + defaultSopsFile = ../secrets/user-secrets.yaml; secrets = { mrconfig = { - sopsFile = "${config._secretstore}/user_dotfiles/mrconfig"; + sopsFile = ../secrets/user_dotfiles/mrconfig; format = "binary"; path = "${config.home.homeDirectory}/.mrconfig"; }; }; }; - # home.file."/home/sstent/.config/beets/test".source = config.lib.file.mkOutOfStoreSymlink /run/user/1000/secrets/test; + custom = { + ssh-proxy.enable = false; + beets.enable = true; + keybase.enable = true; + }; + + ###dotfiles path variable + + ##VSCode + #services.vscode-server.enable = true; + #services.vscode-server.enableFHS = true; + #services.vscode-server.nodejsPackage = pkgs.nodejs-18_x; # Let Home Manager install and manage itself. programs.home-manager.enable = true; + home.packages = with pkgs; [ autossh azure-cli @@ -40,7 +48,7 @@ pyinfra sshpass nmap - nomad_1_4 + nomad consul terraform wget @@ -57,13 +65,6 @@ gnumake ]; - custom = { - ssh-proxy.enable = false; - beets.enable = true; - keybase.enable = true; - }; - - # home.file.".mrconfig".source = config.lib.file.mkOutOfStoreSymlink "${config._secrets}/mrconfig"; programs = { dircolors.enable = true; go.enable = true; @@ -79,7 +80,7 @@ historyControl = ["ignorespace"]; shellOptions = ["histappend"]; sessionVariables = { - DOCKER_HOST = "tcp://192.168.1.223:2375"; + DOCKER_HOST = "tcp://192.168.1.225:2375"; NOMAD_ADDR = "http://192.168.1.250:4646"; TERM = "xterm-256color"; ANSIBLE_HOST_KEY_CHECKING = "False"; @@ -117,55 +118,3 @@ }; }; } -#######If Gnome -# config = lib.mkIf config.mymods.gnome.enable { -# programs.bash.enable = true; -# programs.firefox.enable = true; -# programs.gnome-terminal.enable = true; -# programs.gnome-terminal.profile = { -# "f2afd3c7-cb35-4d08-b6c2-523b444be64d" = { -# visibleName = "Stu"; -# showScrollbar = true; -# default = true; -# font = "DejaVu Sans Mono 12"; -# colors = { -# backgroundColor = "rgb(23,20,33)"; -# foregroundColor = "rgb(208,207,204)"; -# palette = [ -# "#272224" -# "#FF473D" -# "#3DCCB2" -# "#FF9600" -# "#3B7ECB" -# "#F74C6D" -# "#00B5FC" -# "#3E3E3E" -# "#52494C" -# "#FF6961" -# "#85E6D4" -# "#FFB347" -# "#779ECB" -# "#F7A8B8" -# "#55CDFC" -# "#EEEEEC" -# ]; -# }; -# }; -# }; -# xdg.configFile."gnome-initial-setup-done".text = "yes"; -# xdg.configFile."gtk-3.0/bookmarks".text = '' -# file:///mnt/Public Public -# ''; -# dconf.settings = { -# # ... -# "org/gnome/shell" = { -# favorite-apps = [ -# "firefox.desktop" -# "org.gnome.Terminal.desktop" -# "org.gnome.Nautilus.desktop" -# ]; -# }; -# "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; }; -# }; -# }; -