Merge remote-tracking branch 'origin/master'

nixos/environment.nix

@@ -38,8 +38,11 @@ with lib;
     environment = {
       homeBinInPath = true;
       localBinInPath = true;
+      shellAliases = {
+        df_ssh = "TERM='xterm-256color ssh -o StrictHostKeyChecking=no'";
+      };
       interactiveShellInit = ''
-                vterm_printf(){
+        vterm_printf(){
             if [ -n "$TMUX" ] && ([ "''${TERM%%-*}" = "tmux" ] || [ "''${TERM%%-*}" = "screen" ] ); then
                 # Tell tmux to pass the escape sequences through
                 printf "\ePtmux;\e\e]%s\007\e\\" "$1"

nixos/essential.nix

@@ -31,6 +31,7 @@ in
     dolphin
     element-desktop
     gpick
+    torbrowser
 
     # Appearance
     numix-icon-theme-circle

nixos/home-manager.nix

@@ -73,15 +73,15 @@
     enable = true;
     repositories = {
       config = {
-        path = "/home/imalison/config";
+        path = config.home.homeDirectory + "/config";
         uri = "git@github.com:IvanMalison/config.git";
       };
       org = {
-        path = "/home/imalison/org";
+        path = config.home.homeDirectory + "/org";
         uri = "git@github.com:IvanMalison/org.git";
       };
       password-store = {
-        path = "/home/imalison/.password-store";
+        path = config.home.homeDirectory + "/.password-store";
         uri = "git@github.com:IvanMalison/.password-store.git";
       };
     };

nixos/machines/adele.nix

@@ -1,6 +1,3 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, inputs, ... }:
 
 {

nixos/machines/ryzen-shine.nix

@@ -5,6 +5,7 @@
     ../users.nix
     ../full.nix
     ../dfinity.nix
+    ../games.nix
   ];
 
   hardware.enableRedistributableFirmware = true;

nixos/machines/stevie-nixos.nix

@@ -0,0 +1,46 @@
+{ config, lib, pkgs, inputs, ... }:
+
+{
+  imports = [
+    ../full.nix
+    ../base.nix
+    inputs.nixos-hardware.nixosModules.dell-xps-17-9700-nvidia
+  ];
+
+  hardware.enableRedistributableFirmware = true;
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = with config.boot.kernelPackages; [ ];
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  services.xserver.libinput.enable = true;
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/7c999009-1ff1-42f7-a64a-3fa91fc777a8";
+      fsType = "ext4";
+    };
+
+  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/97c1eee7-b161-4186-9c14-6b1771d49afb";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-label/ESP";
+      fsType = "vfat";
+    };
+
+
+  swapDevices = [ ];
+
+  networking.hostName = "stevie-nixos";
+
+  nix.maxJobs = lib.mkDefault 16;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+
+  hardware.video.hidpi.enable = true;
+
+  system.stateVersion = "21.05";
+}

nixos/users.nix

@@ -27,6 +27,7 @@
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICzGkqGJm+nrMvsrfuWOLVxXHvi0UL1ULJmyfzS9sKpy imalison@biskcomp.local"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuO/tc728fKyctlufiehZQuKsD0XDiS/5x7TImk0Ip4 imalison@ivanm-dfinity-razer"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDt/rcYuGGlXBcRUJvzUCgOW8PNVkJJ5TwEOha1/KGM4 imalison@stevie-nixos"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIiZd2FiyTJvuvDh5hH0L3BqZV3E/kwwyau57QD7pz7C cardno:000614590850" # Dfinity Admin
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHOEt0T+Hxxat5tbkD9mSu8T271QjRrLr2EA0rIDXUNL cardno:000614590748" # Dfinity Read-Only
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUSkj7587e+MAUNyU/KRpw9Vk++53Wv5nB+0V1QgiTO3rMQe6HJt0Tm2wi/o/T8GNjueT2D69YgkqOIF1FQwsj2EFLObcMzeBgs5gTSglqggA2I91BIc1vvgjCDpogOMAzAQGlTxRnqrEXhqG0jJtw8KIzLr9WrvWLdTT4rHtWS8RoOBgkQ8oxbggZ4vtbMBIwoIAYGRr70KBRNCsLTPLa8yEf+DDQxq1entzxSjHXHgyeBSVVpPCrBVmhjandk+lIFInjvAiAE1ZkJHSRccL73ORmgb1crwH7xlD9NwBPmypowMi8UIRMKfL2lNehT0AQIlEAikUBLMDzPIPhnwLZ imalison@ivanm-dfinity-razer.local"