Create a configuration for laptops

Author: jonaswouters

Diff for: machines/base-workstation.nix

@@ -8,7 +8,7 @@
 
     # Enable exfat and ntfs for mounted drives
     # boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
-    boot.supportedFilesystems = [ "ntfs" ];
+    boot.supportedFilesystems = [ "ntfs" "exfat" ];
 
     # Timezone
     time.timeZone = "CET";

Diff for: machines/jwx1carbon/configuration.nix

@@ -0,0 +1,109 @@
+{ config, pkgs, lib,... }:
+
+{
+  # Channels
+  #nix.nixPath = lib.mkDefault (lib.mkBefore [
+  #  "nixpkgs=https://nixos.org/channels/nixos-18.09"
+  #  "nixos-hardware=https://github.com/NixOS/nixos-hardware/archive/master.tar.gz"
+  #]);
+
+  imports =
+    [
+      <nixos-hardware/lenovo/thinkpad/x1/6th-gen>
+      ../base-workstation.nix
+      ../../private/thinkpadje-wifi.nix
+
+      # Yubikey
+      ../../yubikey.nix
+
+      # Packages
+      ../../packages/user/common.nix
+      ../../packages/user/development.nix
+      ../../packages/docker.nix
+      ../../packages/user/fonts.nix
+      ../../packages/user/fish.nix
+      ../../packages/user/insync.nix
+      ../../packages/user/gnupg.nix
+      ../../packages/user/desktop/programs/kitty.nix
+      ../../packages/user/desktop/programs/toggl.nix
+
+      # Audio
+      ../../packages/audio.nix
+      ../../packages/user/desktop/programs/audio.nix
+
+      # Bluetooth 
+      ../../packages/bluetooth.nix
+      
+      # Xserver
+      ../../packages/xserver.nix
+      ../../packages/user/desktop/i3.nix
+      ./trackpad.nix
+      
+      # Packages
+      ../../packages/user/common.nix
+      ../../packages/user/development.nix
+      ../../packages/user/fonts.nix
+      ../../packages/user/gnupg.nix
+      
+    ];
+    
+  # Boot settings
+  boot = {
+    # Use latest kernel
+    kernelPackages = pkgs.linuxPackages_latest;
+    loader = {
+      # Use the systemd-boot EFI boot loader.
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+  };
+  
+  # This value determines the NixOS release with which your
+  # system is to be compatible, in order to avoid breaking
+  # some software such as database servers. You should
+  # change this only after NixOS release notes say you
+  # should.
+  system.stateVersion = "19.09";
+  
+  # Networking
+  networking = {
+    hostName = "thinkpadje";
+    wireless.enable = true;
+  };
+
+  # Printing
+  services.printing.enable = true;
+  services.printing.drivers = [ pkgs.cups-bjnp pkgs.gutenprintBin ];
+
+  # ACPI
+  services.acpid = {
+    enable = true;
+  };
+
+  # Update settings
+  system.autoUpgrade.enable = true;
+  time.hardwareClockInLocalTime = true;
+
+  # Power management
+  environment.systemPackages = with pkgs; [
+    powertop
+    wpa_supplicant_gui
+  ];
+
+  # Overrides
+  programs.fish = {
+    shellInit = ''
+      ${builtins.readFile ../../packages/user/fish/work.fish }
+    '';
+  };
+
+  # Thinkpad x1 Backlight control via buttons
+  programs.light.enable = true;
+  services.actkbd = {
+    enable = true;
+    bindings = [
+      { keys = [ 224 ]; events = [ "key" ]; command = "/run/current-system/sw/bin/light -U 5"; } # Light -
+      { keys = [ 225 ]; events = [ "key" ]; command = "/run/current-system/sw/bin/light -A 5"; } # Light +
+    ];
+  };
+}

Diff for: machines/jwx1carbon/README.md renamed to machines/thinkpadje/README.md

@@ -11,4 +11,9 @@ in
   home-manager.users.${secrets.username}.home.packages = with pkgs; [
     keybase
   ];
+
+    # Enable Keybase service
+    services.keybase = {
+      enable = true;
+    };
 }

Diff for: machines/thinkpadje/configuration.nix

@@ -24,5 +24,9 @@ in
 
     # API
     unstable.postman
+
+    # Golang
+    unstable.go
+    gcc
   ];
 }

Diff for: machines/jwx1carbon/trackpad.nix renamed to machines/thinkpadje/trackpad.nix

@@ -11,4 +11,7 @@ set -xg NPM_CONFIG_PREFIX $XDG_CONFIG_HOME/npm/global
 set PATH $NPM_CONFIG_PREFIX/bin $PATH
 
 # TERMINAL
-set -xg TERMINAL xterm-color
+set -xg TERMINAL xterm-color
+
+# GOLANG
+set -xg GOPATH $HOME/Projects/go

Diff for: packages/user/common.nix

@@ -12,6 +12,12 @@ in
       push = { default = "current"; };
       pull = { rebase = true; };
       rebase = { autoStash = true; };
+      "url \"[email protected]:\"" = { insteadOf = "https://bitbucket.org/"; };
+      "url \"[email protected]:\"" = { insteadOf = "https://github.com/"; };
+    };
+    signing = {
+      signByDefault = true;
+      key = "3E5DD4E9B37115436F1F91E847C02FA6BCC1976D";
     };
     aliases = {
         co = "checkout";

Diff for: packages/user/development.nix

@@ -8,6 +8,8 @@ in
     enable = true;
     defaultCacheTtlSsh = 28800;
     maxCacheTtlSsh = 28800;
+    defaultCacheTtl = 28800;
+    maxCacheTtl = 28800;
     enableSshSupport = true;
   };
 }

Diff for: packages/user/fish/config.fish

@@ -21,6 +21,7 @@ in
     unstable.yubikey-personalization
     unstable.yubikey-personalization-gui
     unstable.yubioath-desktop
+    unstable.yubikey-manager
   ];
 
   services.udev.packages = with pkgs; [