Adapted for new laptop, not tested

3 files changed, 22 insertions, 90 deletions

diff --git a/configuration.nix b/configuration.nix
index a87aacc..c55e8af 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -8,6 +8,7 @@
     imports =
         [ # Include the results of the hardware scan.
         ./hardware-configuration.nix
+        # ./pc_t14.nix
     ];
 
     boot = {
@@ -15,9 +16,6 @@
         loader.grub = {
             enable = true;
             version = 2;
-
-            # Define on which hard drive you want to install Grub.
-            device = "/dev/sda"; 
         };
         tmpOnTmpfs = true;
         supportedFilesystems = [ "ntfs" ];
@@ -50,7 +48,8 @@
 
     networking = {
         # Hostname and wireless enabled
-        hostName = "jx230";
+        # set in device specific file
+
         # wireless.enable = true;
 
         # The global useDHCP flag is deprecated, therefore explicitly set to false here.
@@ -60,7 +59,7 @@
         interfaces.wlp3s0.useDHCP = true;
 
         # Firewall configuration
-        # firewall.enable = true; yeah who needs that
+        # firewall.enable = true; yeah who needs that shit
 
         networkmanager = {
             enable = true;
@@ -167,7 +166,7 @@
         # Enable CUPS to print documents.
         printing.enable = true;
 
-        blueman.enable = true;
+        # blueman.enable = true;
 
         postgresql = {
             enable = false;
@@ -215,14 +214,14 @@
             wget vim neovim git htop zsh stow pass tree dnsutils gnupg zip
             unzip gopass tig file imagemagick whois nmap usbutils lshw gnumake
             aspell aspellDicts.da aspellDicts.en pv acpi jq killall netcat-gnu perl gopass
-            cowsay cdrkit gdb man-pages pdftk sox
+            cowsay gdb man-pages sox
 
             # Landuage support
             rustup gcc binutils python3 python go clang-tools
 
             # Network stuff
-            networkmanagerapplet networkmanager-openconnect networkmanager-l2tp
-            iw batctl wirelesstools
+            networkmanagerapplet networkmanager-openconnect iw batctl
+            wirelesstools
 
             # X stuff
             feh xscreensaver dmenu rofi xorg.xmodmap xss-lock xclip
@@ -230,22 +229,20 @@
 
             # Gui applications
             firefox pavucontrol okular leafpad inkscape gimp 
-            meld pinentry gnome3.gnome-system-monitor gnome3.dconf pcmanfm 
-            termite quasselClient nomacs wireshark spotify pavucontrol fractal
-            gnome3.file-roller geogebra gnome3.gnome-calculator 
-            gnome3.simple-scan vlc xorg.xev gnome3.evolution 
+            meld pinentry gnome3.gnome-system-monitor gnome3.dconf
+            termite quasselClient wireshark spotify
+            gnome3.file-roller gnome3.gnome-calculator 
+            gnome3.simple-scan vlc mpv xorg.xev gnome3.evolution 
             evolution-data-server vimHugeX tor-browser-bundle-bin
             (mumble.override { pulseSupport = true; })
-            (slstatus.override { conf = (builtins.readFile ./slstatus.h); })
-            libreoffice-fresh liferea
+            libreoffice-fresh liferea qutebrowser
 
             # Other stuff
             # texlive.combined.scheme-full biber
-            aldo asciidoctor git-lfs youtube-dl sshpass
+            youtube-dl sshpass
 
-            # Hardware stuff. X230
+            # Hardware stuff. X230 and T14
             linuxPackages.acpi_call
         ];
     };
 }
-# vi: et sw=4
diff --git a/pc_t14.nix b/pc_t14.nix
new file mode 100644
index 0000000..221e6ba
--- /dev/null
+++ b/pc_t14.nix
@@ -0,0 +1,7 @@
+{ config, ... };
+
+{
+    boot.loader.grub.device = "/dev/sda";
+    networking.hostName = "nixT14s";
+}
+
diff --git a/slstatus.h b/slstatus.h
deleted file mode 100644
index 3e18c8f..0000000
--- a/slstatus.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-/* See LICENSE file for copyright and license details. */
-
-/* interval between updates (in ms) */
-const unsigned int interval = 1000;
-
-/* text to show if no value can be retrieved */
-static const char unknown_str[] = "n/a";
-
-/* maximum output string length */
-#define MAXLEN 2048
-
-/*
- * function            description                     argument (example)
- *
- * battery_perc        battery percentage              battery name (BAT0)
- *                                                     NULL on OpenBSD/FreeBSD
- * battery_state       battery charging state          battery name (BAT0)
- *                                                     NULL on OpenBSD/FreeBSD
- * battery_remaining   battery remaining HH:MM         battery name (BAT0)
- *                                                     NULL on OpenBSD/FreeBSD
- * cpu_perc            cpu usage in percent            NULL
- * cpu_freq            cpu frequency in MHz            NULL
- * datetime            date and time                   format string (%F %T)
- * disk_free           free disk space in GB           mountpoint path (/)
- * disk_perc           disk usage in percent           mountpoint path (/)
- * disk_total          total disk space in GB          mountpoint path (/")
- * disk_used           used disk space in GB           mountpoint path (/)
- * entropy             available entropy               NULL
- * gid                 GID of current user             NULL
- * hostname            hostname                        NULL
- * ipv4                IPv4 address                    interface name (eth0)
- * ipv6                IPv6 address                    interface name (eth0)
- * kernel_release      `uname -r`                      NULL
- * keyboard_indicators caps/num lock indicators        format string (c?n?)
- *                                                     see keyboard_indicators.c
- * keymap              layout (variant) of current     NULL
- *                     keymap
- * load_avg            load average                    NULL
- * netspeed_rx         receive network speed           interface name (wlan0)
- * netspeed_tx         transfer network speed          interface name (wlan0)
- * num_files           number of files in a directory  path
- *                                                     (/home/foo/Inbox/cur)
- * ram_free            free memory in GB               NULL
- * ram_perc            memory usage in percent         NULL
- * ram_total           total memory size in GB         NULL
- * ram_used            used memory in GB               NULL
- * run_command         custom shell command            command (echo foo)
- * swap_free           free swap in GB                 NULL
- * swap_perc           swap usage in percent           NULL
- * swap_total          total swap size in GB           NULL
- * swap_used           used swap in GB                 NULL
- * temp                temperature in degree celsius   sensor file
- *                                                     (/sys/class/thermal/...)
- *                                                     NULL on OpenBSD
- *                                                     thermal zone on FreeBSD
- *                                                     (tz0, tz1, etc.)
- * uid                 UID of current user             NULL
- * uptime              system uptime                   NULL
- * username            username of current user        NULL
- * vol_perc            OSS/ALSA volume in percent      mixer file (/dev/mixer)
- * wifi_perc           WiFi signal in percent          interface name (wlan0)
- * wifi_essid          WiFi ESSID                      interface name (wlan0)
- */
-static const struct arg args[] = {
-	/* function format          argument */
-	{ vol_perc,      "TIK [V:%s] ", "/dev/mixer" },
-	{ ram_free,      "[F:%s] ", NULL },
-	{ battery_perc,  "[B:%s,", "BAT0" },
-	{ battery_state, "%s] ", "BAT0" },
-	{ datetime,      "%s",    "%F %T" },
-};