cleanup

configuration.nix

@@ -6,7 +6,8 @@
 
 {
   imports =
-    [ # Include the results of the hardware scan.
+    [
+      # Include the results of the hardware scan.
       ./hardware-configuration.nix
     ];
 
@@ -22,7 +23,7 @@
   networking.hostName = "nixos76"; # Define your hostname.
   # Pick only one of the below networking options.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+  networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
 
   # Set your time zone.
   time.timeZone = "America/New_York";
@@ -43,21 +44,21 @@
   environment.etc.crypttab = {
     enable = true;
     text = ''
-# /etc/crypttab: mappings for encrypted partitions.
+      # /etc/crypttab: mappings for encrypted partitions.
-#
+      #
-# Each mapped device will be created in /dev/mapper, so your /etc/fstab
+      # Each mapped device will be created in /dev/mapper, so your /etc/fstab
-# should use the /dev/mapper/<name> paths for encrypted devices.
+      # should use the /dev/mapper/<name> paths for encrypted devices.
-#
+      #
-# See crypttab(5) for the supported syntax.
+      # See crypttab(5) for the supported syntax.
-#
+      #
-# NOTE: Do not list your root (/) partition here, it must be set up
+      # NOTE: Do not list your root (/) partition here, it must be set up
-#       beforehand by the initramfs (/etc/mkinitcpio.conf). The same applies
+      #       beforehand by the initramfs (/etc/mkinitcpio.conf). The same applies
-#       to encrypted swap, which should be set up with mkinitcpio-openswap
+      #       to encrypted swap, which should be set up with mkinitcpio-openswap
-#       for resume support.
+      #       for resume support.
-#
+      #
-# <name>               <device>                         <password> <options>
+      # <name>               <device>                         <password> <options>
-# luks-d515fd8a-a021-4a1e-bd21-5793c3c3a771 UUID=d515fd8a-a021-4a1e-bd21-5793c3c3a771     /crypto_keyfile.bin luks
+      # luks-d515fd8a-a021-4a1e-bd21-5793c3c3a771 UUID=d515fd8a-a021-4a1e-bd21-5793c3c3a771     /crypto_keyfile.bin luks
-externaldrive UUID=b9e3979c-9362-4242-a835-6dd702dfb0ee /etc/externalHD_keyfile.bin luks
+      externaldrive UUID=b9e3979c-9362-4242-a835-6dd702dfb0ee /etc/externalHD_keyfile.bin luks
     '';
   };
 
@@ -105,59 +106,44 @@ externaldrive UUID=b9e3979c-9362-4242-a835-6dd702dfb0ee /etc/externalHD_keyfile.
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.alex = {
     isNormalUser = true;
-    home = "/home/alex";
     extraGroups = [ "wheel" "networkmanager" ]; # Enable ‘sudo’ for the user.
-    packages = with pkgs; [
-      firefox
-      keepassxc
-      nextcloud-client
-      discord
-      vscode
-      wineWowPackages.unstableFull
-      winetricks
-      mpv
-      git
-      lutris
-      steam
-      spotify
-    ];
   };
 
   home-manager.users.alex = import ./home.nix;
 
   fileSystems."/home/alex/Documents" = {
-  	device = "/media/external/Documents";
+    device = "/media/external/Documents";
-        options = [ "bind" ];
+    options = [ "bind" ];
   };
 
   fileSystems."/home/alex/Games" = {
-  	device = "/media/external/Games";
+    device = "/media/external/Games";
-        options = [ "bind" ];
+    options = [ "bind" ];
   };
 
   fileSystems."/home/alex/Git" = {
-  	device = "/media/external/Git";
+    device = "/media/external/Git";
-        options = [ "bind" ];
+    options = [ "bind" ];
   };
 
   fileSystems."/home/alex/Lutris" = {
-  	device = "/media/external/Lutris";
+    device = "/media/external/Lutris";
-        options = [ "bind" ];
+    options = [ "bind" ];
   };
 
   fileSystems."/home/alex/Music" = {
-  	device = "/media/external/Music";
+    device = "/media/external/Music";
-        options = [ "bind" ];
+    options = [ "bind" ];
   };
 
   fileSystems."/home/alex/Pictures" = {
-  	device = "/media/external/Pictures";
+    device = "/media/external/Pictures";
-        options = [ "bind" ];
+    options = [ "bind" ];
   };
 
   fileSystems."/home/alex/Videos" = {
-  	device = "/media/external/Videos";
+    device = "/media/external/Videos";
-        options = [ "bind" ];
+    options = [ "bind" ];
   };
 
   # List packages installed in system profile. To search, run:
@@ -168,7 +154,6 @@ externaldrive UUID=b9e3979c-9362-4242-a835-6dd702dfb0ee /etc/externalHD_keyfile.
     font-manager
     lshw
     mesa_22_3
-    nixfmt
     pavucontrol
     unzip
     vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
@@ -209,6 +194,5 @@ externaldrive UUID=b9e3979c-9362-4242-a835-6dd702dfb0ee /etc/externalHD_keyfile.
   # 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 = "23.05"; # Did you read the comment?
-
 }
 

home.nix

@@ -7,8 +7,21 @@
   home.homeDirectory = "/home/alex";
 
   # Packages that should be installed to the user profile.
-  home.packages = [
+  home.packages = with pkgs; [
-    pkgs.nixpkgs-fmt
+    discord
+    firefox
+    git
+    keepassxc
+    lutris
+    mpv
+    nextcloud-client
+    nixpkgs-fmt
+    spotify
+    steam
+    vscode
+    winetricks
+    wineWowPackages.unstableFull
+    yt-dlp
   ];
 
   # This value determines the Home Manager release that your

quick-switch.sh

@@ -1,11 +1,12 @@
 #!/usr/bin/env bash 
+set -euo pipefail
 
 if [ -z "$(git status --porcelain)" ]
 then
   git push --force-with-lease
+  rev=$(git rev-parse HEAD)
   sudo nixos-rebuild switch \
-    --show-trace \
+    --flake "git+https://git.atauno.com/atau/nixos-config.git?ref=master&rev=$rev"
-    --flake "git+https://git.atauno.com/atau/nixos-config.git"
 else
   echo "Git working directory is unclean, please commit changes"
   exit 1