Merge remote-tracking branch 'origin/main' into test-merge

.gitignore

@@ -1 +1,2 @@
 host
+result

configuration.nix

@@ -0,0 +1,120 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+      ./modules/automatic/nix.nix
+    ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
+
+  networking.hostName = "lappy"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+
+  # Set your time zone.
+  time.timeZone = "America/Chicago";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.utf8";
+
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+  # Enable the GNOME Desktop Environment.
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
+
+  # Configure keymap in X11
+  services.xserver = {
+    layout = "us";
+    xkbVariant = "";
+  };
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # Enable sound with pipewire.
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    #jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
+  };
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.xserver.libinput.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.greg = {
+    isNormalUser = true;
+    description = "Greg Hellings";
+    extraGroups = [ "networkmanager" "wheel" ];
+    packages = with pkgs; [
+      firefox
+    #  thunderbird
+    ];
+  };
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+    git
+    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    wget
+  ];
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "22.05"; # Did you read the comment?
+
+}

flake.lock

@@ -25,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1654113405,
+        "lastModified": 1656169755,
-        "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=",
+        "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675",
+        "rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
         "type": "github"
       },
       "original": {
@@ -57,11 +57,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1654005557,
+        "lastModified": 1659342832,
-        "narHash": "sha256-J6elwUzPoco+r5qWPHhvS2EHVWomUtNcxzkfdAQOwEU=",
+        "narHash": "sha256-ePnxG4hacRd6oZMk+YeCSYMNUnHCe+qPLI0/+VaTu48=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "08950a6e29cf7bddee466592eb790a417550f7f9",
+        "rev": "e43cf1748462c81202a32b26294e9f8eefcc3462",
         "type": "github"
       },
       "original": {
@@ -73,11 +73,11 @@
     },
     "nixunstable": {
       "locked": {
-        "lastModified": 1653931853,
+        "lastModified": 1659219666,
-        "narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=",
+        "narHash": "sha256-pzYr5fokQPHv7CmUXioOhhzDy/XyWOIXP4LZvv/T7Mk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f1c167688a6f81f4a51ab542e5f476c8c595e457",
+        "rev": "7b9be38c7250b22d829ab6effdee90d5e40c6e5c",
         "type": "github"
       },
       "original": {
@@ -87,13 +87,13 @@
         "type": "github"
       }
     },
-    "nur": {
+    "nurpkgs": {
       "locked": {
-        "lastModified": 1654123271,
+        "lastModified": 1659423577,
-        "narHash": "sha256-xM85/VFYu8I8jZiZ7U0CmZO/98sHO7+f7PIMxQVZXCM=",
+        "narHash": "sha256-i2wSHqFqu4xpBJU/o9SRpQblAHknnEtyeN6Kuq/c1JA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "4c83235ccca7cfcf34fee9f49023f21c0e9db128",
+        "rev": "0bdb7691364dc93c8f04016c0ed395b675bdc50c",
         "type": "github"
       },
       "original": {
@@ -108,7 +108,7 @@
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs_2",
         "nixunstable": "nixunstable",
-        "nur": "nur"
+        "nurpkgs": "nurpkgs"
       }
     }
   },

flake.nix

@@ -12,24 +12,21 @@
 			url = "github:nix-community/home-manager/release-22.05";
 			inputs.nixpkgs.follows = "nixpkgs";
 		};
-		nur.url = "github:nix-community/NUR";
+		nurpkgs.url = "github:nix-community/NUR";
 	};
 
-	outputs = {nixpkgs, nixunstable, agenix, home-manager, nur, self}@inputs:
+	outputs = {nixpkgs, nixunstable, agenix, home-manager, nurpkgs, self}@inputs:
 	let
 		local_overlay = import ./overlays;
 
 		mods = hostname: [
-			{ nixpkgs.overlays = [ nur.overlay local_overlay ]; }
+			{ nixpkgs.overlays = [ nurpkgs.overlay local_overlay ]; }
 			agenix.nixosModule
 			./modules
-			./profiles/base
 			./hosts/${hostname}
 			home-manager.nixosModules.home-manager {
 				home-manager.useGlobalPkgs = true;
 				home-manager.useUserPackages = true;
-				home-manager.users.greg = import ./home/home.nix  "greg";
-				home-manager.users.root = import ./home/home.nix  "root";
 				home-manager.extraSpecialArgs = {
 					inherit nixunstable;
 				};
@@ -50,9 +47,20 @@
 
 			"jude" = machine "x86_64-linux" "jude";
 
+			"lappy" = machine "x86_64-linux" "lappy";
+
 			"iso" = machine "x86_64-linux" "iso";
 		};
 
 		defaultPackage."x86_64-linux" = inputs.self.nixosConfigurations.iso.config.system.build.isoImage;
+
+		homeConfigurations = (
+			import ./home {
+				inherit nixpkgs nixunstable agenix home-manager nurpkgs;
+			}
+		);
+
+		overlay = local_overlay;
+		modules = import ./modules;
 	};
 }

hardware-configuration.nix

@@ -0,0 +1,39 @@
+# 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, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/63bcc80e-0501-4aef-bb58-30bb83881055";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot/efi" =
+    { device = "/dev/disk/by-uuid/C617-B2B1";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/bc4f24a3-5969-4bcb-95f4-f80109e36ebb"; }
+    ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;
+
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

home/default.nix

@@ -0,0 +1,35 @@
+{ nixpkgs, nurpkgs, home-manager, username ? builtins.getEnv "USER", ... }:
+
+let
+	homeDirectory = if username == "root" then "/root" else "/home/${username}";
+	configDir = "${homeDirectory}/.config";
+
+	pkgs = import nixpkgs {
+		config.allowUnfree = true;
+		config.xdg.configHome = configDir;
+		overlays = [
+			nurpkgs.overlay
+			(import ../overlays)
+		];
+	};
+
+	nur = import nurpkgs {
+		inherit pkgs;
+		nur = pkgs;
+	};
+
+	mkhome = system: gui:
+		home-manager.lib.homeManagerConfiguration rec {
+			inherit pkgs system username homeDirectory;
+			stateVersion = "22.05";
+			configuration = import ./home.nix username {
+				inherit nur pkgs gui;
+				inherit (pkgs) config lib stdenv;
+			};
+		};
+in {
+	"aarch64-gui" = mkhome "aarch64-linux" true;
+	"aarch64-nogui" = mkhome "aarch64-linux" false;
+	"x86_64-gui" = mkhome "x86_64-linux" true;
+	"x86_64-nogui" = mkhome "x86_64-linux" false;
+}

home/gui/default.nix

@@ -9,6 +9,9 @@
 
 	home.packages = with pkgs; [
 		bitwarden
+		handbrake
 		onlyoffice-bin
+		synology-drive-client
+		vlc
 	];
 }

home/gui/firefox.nix

@@ -19,7 +19,7 @@ in with lib;
 			};
 		};
 		extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-			keepassxc-browser
+			bitwarden
 			octotree
 			refined-github
 			tree-style-tab

home/home.nix

@@ -1,7 +1,7 @@
-name: { pkgs, lib, nixosConfig, ...}:
+name: { pkgs, lib, gui, ...}:
 
 let
-	guiImports = if nixosConfig.greg.gnome.enable then
+	guiImports = if gui then
 		[ ./gui ] else [];
 
 in {
@@ -17,7 +17,12 @@ in {
 	] ++ guiImports;
 
 
-	home.username = name;
+	home.stateVersion = "22.05";
-	home.homeDirectory = if name == "root" then "/root" else "/home/${name}";
+	home.packages = with pkgs; [
-	home.stateVersion = "21.11";
+		cdrtools
+		ffmpeg
+		hms
+		libtheora
+		x265
+	];
 }

home/xonsh.nix

@@ -1,8 +1,6 @@
-{ pkgs, config, nixosConfig, lib, ... }:
+{ pkgs, config, lib, ... }:
 
-let
+{
-	enable = nixosConfig.greg.gnome.enable;
-in {
 	programs.xonsh = {
 		enable = true;
 

hosts/iso/default.nix

@@ -2,7 +2,7 @@
 {
 
 	imports = [
-		"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-base.nix"
+		"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix"
 	];
 
 	networking.networkmanager.enable = lib.mkForce false;

hosts/jude/boot.nix

@@ -4,6 +4,12 @@
 	# Use the systemd-boot EFI boot loader.
 	#boot.loader.systemd-boot.enable = true;
 	boot.loader.grub.device = "/dev/nvme0n1";
+	boot.loader.grub.useOSProber = true;
+	boot.loader.grub.extraEntries = ''
+		menuentry "Windows" {
+		  chainloader (hd0,2)+1
+		}
+	'';
 	boot.loader.efi.canTouchEfiVariables = true;
 	networking.interfaces.enp4s0.useDHCP = true;
 }

hosts/lappy/default.nix

@@ -0,0 +1,15 @@
+{ ... }:
+
+{
+	imports = [
+		./hardware-configuration.nix
+	];
+	# Bootloader.
+	boot.loader.systemd-boot.enable = true;
+	boot.loader.efi.canTouchEfiVariables = true;
+	boot.loader.efi.efiSysMountPoint = "/boot/efi";
+	# Graphics, please
+	greg.gnome.enable = true;
+	# Set host name
+	networking.hostName = "lappy";
+}

hosts/lappy/hardware-configuration.nix

@@ -0,0 +1,39 @@
+# 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, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/63bcc80e-0501-4aef-bb58-30bb83881055";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot/efi" =
+    { device = "/dev/disk/by-uuid/C617-B2B1";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/bc4f24a3-5969-4bcb-95f4-f80109e36ebb"; }
+    ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;
+
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

modules/automatic.nix

@@ -0,0 +1,12 @@
+{ ... }:
+
+{
+	imports = [
+		./automatic/nix.nix
+		./automatic/programs.nix
+		./automatic/syncthing.nix
+		./automatic/users.nix
+	];
+	# I am a fan of network manager, myself
+	networking.networkmanager.enable = true;
+}

modules/automatic/nix.nix

@@ -20,4 +20,5 @@ keep-derivations = true
 		autoOptimiseStore = true;
 	};
 	nixpkgs.config.allowUnfree = true;
+	system.stateVersion = "22.05";
 }

modules/automatic/programs.nix

@@ -15,6 +15,7 @@ in {
 		git
 		gnupatch
 		findutils
+		hms # My own home manager switcher
 		home-manager
 		htop
 		myPython

modules/automatic/users.nix

@@ -1,16 +1,6 @@
 { config, pkgs, agenix, ... }:
 
 {
-	imports = [
-		./nix.nix
-		./programs.nix
-		./syncthing.nix
-	];
-
-
-	# I am a fan of network manager, myself
-	networking.networkmanager.enable = true;
-
 	# Enable the OpenSSH daemon for remote control
 	services.openssh.enable = true;
 	#services.openssh.permitRootLogin = "yes";
@@ -33,8 +23,4 @@
 		font = "Lat2-Terminus16";
 		keyMap = "us";
 	};
-
-	# The set of default values, which allow syou to keep system defaults set
-	# to a predictable value as you upgrade the system
-	system.stateVersion = "21.11";
 }

modules/default.nix

@@ -2,6 +2,7 @@
 
 {
 	imports = [
+		./automatic.nix
 		./backup.nix
 		./home.nix
 		./gnome.nix

modules/gnome.nix

@@ -12,7 +12,8 @@ in with lib; {
 		greg.xprograms.enable = true;
 
 		# Sets up a basic Gnome installation
-		services.xserver = {
+		services = {
+			xserver = {
 				enable = true;
 				displayManager.gdm.enable = true;
 				desktopManager.gnome.enable = true;
@@ -21,6 +22,20 @@ in with lib; {
 				libinput.enable = true;
 			};
 
+			udev.packages = with pkgs; [
+				gnome3.gnome-settings-daemon
+			];
+
+			pipewire.enable = true;
+
+			# Enablement for Firefox
+			gnome = {
+				chrome-gnome-shell.enable = true;
+				sushi.enable = true;
+				gnome-online-accounts.enable = true;
+			};
+		};
+
 		programs.dconf.enable = true;
 		programs.sway.enable = true;  # Gives us Wayland
 		xdg.portal = {
@@ -32,17 +47,11 @@ in with lib; {
 		# Enable some Gnome plugins that I like
 		environment.systemPackages = with pkgs; [
 			gnome3.adwaita-icon-theme
+			gnome3.gnome-tweaks
+			gnome3.dconf-editor
 			gnomeExtensions.appindicator
+			gnomeExtensions.clipboard-indicator
 			gnomeExtensions.dash-to-dock
 		];
-
-		services.udev.packages = with pkgs; [
-			gnome3.gnome-settings-daemon
-		];
-
-		services.pipewire.enable = true;
-
-		# Enablement for Firefox
-		services.gnome.chrome-gnome-shell.enable = true;
 	};
 }

overlays/default.nix

@@ -8,4 +8,8 @@ self: super:
 	xonsh = super.xonsh.overridePythonAttrs (old: rec{
 		propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.xonsh-direnv ];
 	});
+
+	hms = super.callPackage ./hms.nix {
+		pkgs = self.pkgs;
+	};
 }

overlays/hms.nix

@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+
+pkgs.writeShellScriptBin "hms" ''
+set -eo pipefail
+# Build different targets with GUI or not
+if [ -z "$DISPLAY" ]; then
+	target="nogui"
+else
+	target="gui"
+fi
+
+# Build and switch
+echo "Building $(uname -m)-$target"
+dest=$(mktemp -d)
+pushd "$dest" > /dev/null
+nix build --impure /etc/nixos#homeConfigurations.$(uname -m)-$target.activationPackage
+./result/activate
+popd > /dev/null
+rm -r "$dest"
+''

overlays/xonsh-direnv.nix

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
 	pname = "xonsh-direnv";
-	version = "1.5.0";
+	version = "1.6.1";
 
 	src = fetchPypi {
 		inherit pname version;
-		sha256 = "OLjtGD2lX4Yf3aHrxCWmAbSPZnf8OuVrBu0VFbsna1Y=";
+		sha256 = "Nt8Da1EtMVWZ9mbBDjys7HDutLYifwoQ1HVmI5CN2Ww=";
 	};
 
 	meta = with lib; {