From 96c26005a538bdfe323bc3ffab40c7fd2a4ea502 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Mon, 27 Apr 2020 23:19:31 +0000
Subject: [PATCH] Change name, add rocm

---
 .gitmodules          |  3 +++
 boot-config.nix      |  2 +-
 configuration.nix    |  3 ++-
 dns.nix              |  3 +--
 externals/nixos-rocm |  1 +
 packages.nix         | 11 +++++++----
 rocm.nix             |  6 ++++++
 7 files changed, 21 insertions(+), 8 deletions(-)
 create mode 160000 externals/nixos-rocm
 create mode 100644 rocm.nix

diff --git a/.gitmodules b/.gitmodules
index 636d5c9..dc14acf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "private"]
 	path = private
 	url = git@github.com:artemist/nixos-config-private.git
+[submodule "externals/nixos-rocm"]
+	path = externals/nixos-rocm
+	url = https://github.com/nixos-rocm/nixos-rocm.git
diff --git a/boot-config.nix b/boot-config.nix
index bb99d56..be72e79 100644
--- a/boot-config.nix
+++ b/boot-config.nix
@@ -10,7 +10,7 @@
     initrd.luks = {
       reusePassphrases = true;
       devices = {
-        balrog = {
+        "${config.networking.hostName}" = {
           device = "/dev/disk/by-uuid/274ec302-20b7-43bf-aa72-895ffdd96919";
           preLVM = true;
           allowDiscards = true;
diff --git a/configuration.nix b/configuration.nix
index 8adeea4..42b0659 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -14,6 +14,7 @@
     ./fonts.nix
     ./ssh.nix
     ./dns.nix
+    ./rocm.nix
   ];
 
   nix = {
@@ -130,7 +131,7 @@
   };
 
   networking = {
-    hostName = "balrog";
+    hostName = "starlight";
     firewall.enable = false;
     networkmanager = {
       enable = true;
diff --git a/dns.nix b/dns.nix
index 6c756d3..e9f757b 100644
--- a/dns.nix
+++ b/dns.nix
@@ -2,7 +2,6 @@
 
 {
   networking = {
-    nameservers = [ "::1" "127.0.0.1" ];
     resolvconf.useLocalResolver = true;
     networkmanager.dns = "none";
   };
@@ -20,7 +19,7 @@
       };
 
       server_names = ["cloudflare"];
-      fallback_resolvers = ["1.1.1.1:53" "1.0.0.1:53"];
+      fallback_resolvers = ["1.1.1.1:53" "8.8.8.8:53"];
 
       listen_addresses = ["0.0.0.0:53"];
     };
diff --git a/externals/nixos-rocm b/externals/nixos-rocm
new file mode 160000
index 0000000..a1f8c15
--- /dev/null
+++ b/externals/nixos-rocm
@@ -0,0 +1 @@
+Subproject commit a1f8c1518b4fd9ae718abd059986d004069be7da
diff --git a/packages.nix b/packages.nix
index 9e3fc2c..5bae5b5 100644
--- a/packages.nix
+++ b/packages.nix
@@ -100,6 +100,7 @@ in
     fzf
     git-lfs
     gitAndTools.gitFull
+    gitAndTools.pass-git-helper
     htop
     hunspell
     iw
@@ -110,11 +111,12 @@ in
     neovim
     nix-index
     openssl
-    parallel
     p7zip
     pandoc
+    parallel
     pciutils
     pdftk
+    pijul
     poppler_utils
     ripgrep
     rlwrap
@@ -123,6 +125,7 @@ in
     tomb
     traceroute
     tree
+    unrar
     unzip
     usbutils
     xclip
@@ -175,9 +178,8 @@ in
     yosys
 
     # Radio
-    gr-limesdr
     limesuite
-    gnuradio
+    gnuradio-with-packages
     soapysdr
     gqrx
 
@@ -226,10 +228,11 @@ in
     tdesktop
 
     # Gnome configuration
-    arc-theme
     gnome3.adwaita-icon-theme
     gnome3.gnome-tweak-tool
+    gnome3.gsettings-desktop-schemas
     gnomeExtensions.appindicator
+    gnome_themes_standard
     hicolor-icon-theme
     numix-icon-theme
     numix-icon-theme-circle
diff --git a/rocm.nix b/rocm.nix
new file mode 100644
index 0000000..002cafa
--- /dev/null
+++ b/rocm.nix
@@ -0,0 +1,6 @@
+{ config, pkgs, lib, ... }:
+
+{
+  nixpkgs.overlays = [ (import ./externals/nixos-rocm) ];
+  hardware.opengl.extraPackages = [ pkgs.rocm-opencl-icd ];
+}