summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--modules/dev.nix2
-rw-r--r--modules/gnome.nix24
-rw-r--r--modules/printing.nix8
-rw-r--r--modules/satoshipay.nix4
-rw-r--r--modules/t470s.nix2
-rw-r--r--modules/window-manager.nix3
-rw-r--r--modules/zeroconf.nix7
-rw-r--r--satoshipad.nix2
8 files changed, 52 insertions, 0 deletions
diff --git a/modules/dev.nix b/modules/dev.nix
index 453d365..48679cb 100644
--- a/modules/dev.nix
+++ b/modules/dev.nix
@@ -10,6 +10,8 @@
     ripgrep
 
     httpie
+    http-prompt
+    mitmproxy
 
     nodePackages.js-yaml
   ];
diff --git a/modules/gnome.nix b/modules/gnome.nix
new file mode 100644
index 0000000..bd78545
--- /dev/null
+++ b/modules/gnome.nix
@@ -0,0 +1,24 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+{ services = {
+    gnome3 = {
+      gnome-documents.enable = false;
+      gnome-user-share.enable = false;
+      gnome-online-accounts.enable = false;
+      seahorse.enable = false;
+      tracker.enable = false;
+    };
+    telepathy.enable = false;
+
+    xserver = {
+      desktopManager.gnome3 = {
+        enable = true;
+        extraGSettingsOverrides = ''
+          [org.gnome.desktop.input-sources]
+          sources=[('xkb','${config.services.xserver.layout + (optionalString (config.services.xserver.xkbVariant != "") ("+" + config.services.xserver.xkbVariant))}')]
+        '';
+      };
+    };
+  };
+}
diff --git a/modules/printing.nix b/modules/printing.nix
new file mode 100644
index 0000000..3172f33
--- /dev/null
+++ b/modules/printing.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{ services.printing.enable = true;
+
+  imports = [
+    ./zeroconf.nix
+  ];
+}
diff --git a/modules/satoshipay.nix b/modules/satoshipay.nix
index 91aa89f..ffe6ccf 100644
--- a/modules/satoshipay.nix
+++ b/modules/satoshipay.nix
@@ -21,5 +21,9 @@ in
     pkgsUnstable.scudcloud
   ];
 
+  services.printing.drivers = with pkgs; [
+    pkgsUnstable.cups-toshiba-estudio
+  ];
+
   networking.domain = "satoshipay.io";
 }
diff --git a/modules/t470s.nix b/modules/t470s.nix
index ddaba1d..133354a 100644
--- a/modules/t470s.nix
+++ b/modules/t470s.nix
@@ -5,6 +5,8 @@
     firmwareLinuxNonfree
   ];
 
+  systemd.services.ModemManager.enable = true;
+
   environment.systemPackages = with pkgs; [
     nvme-cli
   ];
diff --git a/modules/window-manager.nix b/modules/window-manager.nix
index 4b6a710..b8cbb85 100644
--- a/modules/window-manager.nix
+++ b/modules/window-manager.nix
@@ -9,7 +9,10 @@
   environment.systemPackages = with pkgs; [
     dmenu
     dunst
+    libnotify # for notify-send
     sxhkd
     scrot
+
+    perlPackages.FileMimeInfo # xdg-utils uses this when no DE
   ];
 }
diff --git a/modules/zeroconf.nix b/modules/zeroconf.nix
new file mode 100644
index 0000000..aa4b47e
--- /dev/null
+++ b/modules/zeroconf.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{ services.avahi = {
+    enable = true;
+    nssmdns = true;
+  };
+}
diff --git a/satoshipad.nix b/satoshipad.nix
index c9e2921..766f78c 100644
--- a/satoshipad.nix
+++ b/satoshipad.nix
@@ -19,6 +19,7 @@
     ./modules/xserver.nix
     ./modules/british-english.nix
     ./modules/bare-metal.nix
+    ./modules/printing.nix
     ./modules/intel-gpu.nix
     ./modules/t470s.nix
     ./modules/user.nix
@@ -31,6 +32,7 @@
     ./modules/accounting.nix
     ./modules/passwords.nix
     ./modules/network-manager.nix
+    ./modules/zeroconf.nix
     ./modules/nix.nix
     ./modules/i3.nix
     ./modules/window-manager.nix