summary refs log tree commit diff stats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/grub2.nix1
-rw-r--r--modules/hidpi.nix8
-rw-r--r--modules/intel-gpu.nix8
-rw-r--r--modules/nix.nix9
-rw-r--r--modules/satoshipay.nix2
-rw-r--r--modules/shell.nix1
-rw-r--r--modules/xserver.nix7
7 files changed, 21 insertions, 15 deletions
diff --git a/modules/grub2.nix b/modules/grub2.nix
index be78a60c..6eaa8cc5 100644
--- a/modules/grub2.nix
+++ b/modules/grub2.nix
@@ -9,5 +9,4 @@
     };
     efi.canTouchEfiVariables = true;
   };
-  boot.earlyVconsoleSetup = true;
 }
diff --git a/modules/hidpi.nix b/modules/hidpi.nix
index 762e50e1..1f4644c5 100644
--- a/modules/hidpi.nix
+++ b/modules/hidpi.nix
@@ -6,12 +6,4 @@
       terminus_font
     ];
   };
-
-  fonts = {
-    defaultFonts = {
-      monospace = [ "Noto Mono" ];
-      sansSerif = [ "Noto Sans" ];
-      serif = [ "Noto Serif" ];
-    };
-  };
 }
diff --git a/modules/intel-gpu.nix b/modules/intel-gpu.nix
index 775396ae..b44ddadf 100644
--- a/modules/intel-gpu.nix
+++ b/modules/intel-gpu.nix
@@ -3,4 +3,12 @@
 { hardware.opengl.extraPackages = with pkgs; [
     vaapiIntel
   ];
+
+  boot.earlyVconsoleSetup = true;
+  boot.initrd.kernelModules = [
+    "i915"
+  ];
+  boot.kernelModules = [
+    "i915"
+  ];
 }
diff --git a/modules/nix.nix b/modules/nix.nix
index e5353de5..e1f1e163 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -18,7 +18,10 @@
   system.autoUpgrade = {
     enable = true;
   };
-  systemd.services.nixos-upgrade.script = ''
-    ${config.system.build.nixos-rebuild}/bin/nixos-rebuild boot ${toString config.system.autoUpgrade.flags}
-  '';
+  systemd.services.nixos-upgrade = {
+    environment.NIXPKGS_ALLOW_UNFREE = "1";
+    script = ''
+      ${config.system.build.nixos-rebuild}/bin/nixos-rebuild boot ${toString config.system.autoUpgrade.flags}
+    '';
+  };
 }
diff --git a/modules/satoshipay.nix b/modules/satoshipay.nix
index ffe6ccf7..2ff3b9eb 100644
--- a/modules/satoshipay.nix
+++ b/modules/satoshipay.nix
@@ -17,7 +17,7 @@ in
     google-chrome
     docker_compose
     mongodb
-    franz
+    electrum
     pkgsUnstable.scudcloud
   ];
 
diff --git a/modules/shell.nix b/modules/shell.nix
index dd08a4a4..dd511cd5 100644
--- a/modules/shell.nix
+++ b/modules/shell.nix
@@ -16,6 +16,7 @@
     iotop
     nmap
     netperf
+    moreutils
     psmisc
     tree
     zip
diff --git a/modules/xserver.nix b/modules/xserver.nix
index 799eab82..80430f40 100644
--- a/modules/xserver.nix
+++ b/modules/xserver.nix
@@ -6,6 +6,8 @@
     exportConfiguration = true;
   };
 
+  services.dbus.socketActivated = true;
+
   environment.sessionVariables = {
     XCURSOR_PATH = [
       "${config.system.path}/share/icons"
@@ -29,8 +31,9 @@
     flat-plat
     paper-gtk-theme
     paper-icon-theme
-    numix-gtk-theme
-    numix-icon-theme
+
+    arc-icon-theme
+    tango-icon-theme
 
     gtk-engine-murrine
     gtk_engines