V1.1 (#13)

* Refactored sound; starmachine and snowmachine have same settings (#9)

* Added git aliases to 'g()' function (#10)

* Added NextDNS as secure DNS provider (#11)

* Update flake (#12)

* Updated flake.lock; resolved compile error and warnings

* Enabled vim to address a deprecation warning

* Update docs

Author: Wittionary

README.md

@@ -61,4 +61,15 @@ nh os switch .
 
 # for home-manager changes
 nh home switch .
-```
+
+# every once in a while
+nh clean all
+```
+
+## update flakes
+Make sure you're on a new branch and that you've got 15 minutes for this thing to build.
+```bash
+nix flake update
+nh os switch && nh home switch
+```
+After that, you'll probably get a handful of errors and warnings that need to be resolved as a result of new deprecations or naming changes.

flake.lock

@@ -92,7 +92,7 @@
   gtk.theme.package = pkgs.adw-gtk3;
   gtk.theme.name = "adw-gtk3";
 
-  gtk.iconTheme.package = pkgs.gnome.adwaita-icon-theme;
+  gtk.iconTheme.package = pkgs.adwaita-icon-theme;
   gtk.iconTheme.name = "Adwaita";
 
   # theming engine
@@ -243,7 +243,7 @@
   # TERMINAL --------------------------
   programs.kitty = {
     enable = true;
-    theme = lib.mkDefault "Novel"; #"Doom One";
+    themeFile = lib.mkDefault "Novel"; #"Doom One";
     font = {
       size = 18;
       package = pkgs.dejavu_fonts;
@@ -332,7 +332,26 @@
               #echo "StackOverflow link is in clipboard"
               echo "https://stackoverflow.com/questions/927358/how-do-i-undo-the-most-recent-local-commits-in-git"
           elif [[ "$1" == "pp" ]]; then
+              # Push
               git push --progress
+          elif [[ "$1" == "l" ]]; then
+              # Recent commits
+              git log -3
+          elif [[ "$1" == "ll" ]]; then
+              # All of the commits
+              git log
+          elif [[ "$1" == "ch" ]]; then
+              # Checkout a branch
+              if [[ "$2" != "" ]]; then
+                  git checkout $2
+              else
+                  git checkout $(
+                      git branch --list | 
+                      grep -v "\*" | # everything but the currently selected branch
+                      sed 's/^[ \t]*//;s/[ \t]*$//' | fzf --height 25% --layout=reverse
+                  )
+
+              fi
           fi
       }
       kc() { # kubectl but as a rainbow

home/global/default.nix

@@ -8,6 +8,6 @@
   ];
 
   programs.kitty = {
-    theme = "Doom One";
+    themeFile = "Doom_One";
   };
 }

home/starmachine.nix

@@ -75,7 +75,22 @@
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # Enable networking
-  networking.networkmanager.enable = true;
+  networking.networkmanager = {
+    enable = true;
+    dns = "systemd-resolved";
+  };
+  services.resolved = {
+    enable = true;
+    extraConfig = lib.mkDefault ''
+      DNS=45.90.28.0#c49352.dns.nextdns.io # TODO: consider implementing this native package; it's kind of trash though
+      DNS=2a07:a8c0::#c49352.dns.nextdns.io # TODO: refactor so the hostname is auto-prefixed in this global config
+      DNS=45.90.30.0#c49352.dns.nextdns.io
+      DNS=2a07:a8c1::#c49352.dns.nextdns.io 
+    '';
+    dnssec = "allow-downgrade";
+    dnsovertls = "true";
+  };
+
   networking.hosts = {
     # example: "0.0.0.0" = [ "site-to-block.net" ];
   };
@@ -135,7 +150,7 @@
   services.hardware.bolt.enable = true;
 
   # hardware acceleration
-  hardware.opengl.extraPackages = [
+  hardware.graphics.extraPackages = [
     pkgs.intel-compute-runtime
   ];
 
@@ -191,6 +206,16 @@
     };
   };
 
+    # Enable sound with pipewire.
+  services.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+
   # SECURITY --------------------------
   security.polkit.enable = true; # needed for sway
   security.pam.services.swaylock = {}; # needed for swaylock
@@ -210,7 +235,10 @@
   users.defaultUserShell = pkgs.zsh;
   programs.zsh.enable = true;
 
-  programs.vim.defaultEditor = true;
+  programs.vim = {
+    enable = true;
+    defaultEditor = true;
+  };
 
   fonts.packages = with pkgs; [
     ibm-plex

hosts/common/global/default.nix

@@ -22,6 +22,14 @@
   networking = {
     hostName = "snowmachine";
   };
+  services.resolved = {
+    extraConfig = ''
+      DNS=45.90.28.0#snowmachine-c49352.dns.nextdns.io # TODO: consider implementing this native package; it's kind of trash though
+      DNS=2a07:a8c0::#snowmachine-c49352.dns.nextdns.io
+      DNS=45.90.30.0#snowmachine-c49352.dns.nextdns.io
+      DNS=2a07:a8c1::#snowmachine-c49352.dns.nextdns.io
+    '';
+  };
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
@@ -32,16 +40,6 @@
     videoDrivers = [ "displayLink" "modesetting" ];
   };
 
-  # 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;
-  };
 
   # SECURITY --------------------------
 

hosts/snowmachine/default.nix

@@ -22,27 +22,25 @@
   networking = {
     hostName = "starmachine";
   };
+  services.resolved = {
+    extraConfig = ''
+      DNS=45.90.28.0#starmachine-c49352.dns.nextdns.io # TODO: consider implementing this native package; it's kind of trash though
+      DNS=2a07:a8c0::#starmachine-c49352.dns.nextdns.io
+      DNS=45.90.30.0#starmachine-c49352.dns.nextdns.io
+      DNS=2a07:a8c1::#starmachine-c49352.dns.nextdns.io
+    '';
+  };
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   # graphics card stuff
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
   hardware.nvidia = {
     open = false;
   };
 
-  # Enable sound with pipewire.
-  sound.enable = false; # https://github.com/NixOS/nixpkgs/issues/319809#issuecomment-2167912680
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
 
   # SECURITY --------------------------