Adapted for new laptop, not tested

1 files changed, 15 insertions, 18 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