diff options
| -rw-r--r-- | marvin.nix | 2 | ||||
| -rw-r--r-- | modules/hardware/network-manager.nix | 2 | ||||
| -rw-r--r-- | modules/hardware/thinkpad.nix | 1 | ||||
| -rw-r--r-- | modules/user-interface.nix | 5 | ||||
| -rw-r--r-- | packages/emacs.nix | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/marvin.nix b/marvin.nix index f047d88..3227fd7 100644 --- a/marvin.nix +++ b/marvin.nix @@ -38,5 +38,5 @@ domain = "alanpearce.eu"; }; - system.stateVersion = "17.09"; + system.stateVersion = "18.09"; } diff --git a/modules/hardware/network-manager.nix b/modules/hardware/network-manager.nix index 28b8838..04480a8 100644 --- a/modules/hardware/network-manager.nix +++ b/modules/hardware/network-manager.nix @@ -2,7 +2,7 @@ { networking.networkmanager = { enable = true; - useDnsmasq = false; + dns = "unbound"; }; environment.systemPackages = with pkgs; [ diff --git a/modules/hardware/thinkpad.nix b/modules/hardware/thinkpad.nix index 15ec4df..0d2a1ee 100644 --- a/modules/hardware/thinkpad.nix +++ b/modules/hardware/thinkpad.nix @@ -13,7 +13,6 @@ services.thinkfan = { enable = true; - sensor = "/sys/class/thermal/thermal_zone0/temp"; }; services.tlp = { diff --git a/modules/user-interface.nix b/modules/user-interface.nix index c13baba..5793a12 100644 --- a/modules/user-interface.nix +++ b/modules/user-interface.nix @@ -2,11 +2,12 @@ let emacsPackage = import ../packages/emacs.nix { - pkgs = pkgs.unstable; + inherit pkgs; + # pkgs = pkgs.unstable; }; in { programs.browserpass.enable = true; - programs.info.enable = true; + documentation.info.enable = true; nixpkgs.config.firefox.enableOfficialBranding = true; environment.systemPackages = with pkgs; [ diff --git a/packages/emacs.nix b/packages/emacs.nix index 6d7dc74..450591b 100644 --- a/packages/emacs.nix +++ b/packages/emacs.nix @@ -89,8 +89,8 @@ in js2-mode js2-refactor json-mode - kubernetes - kubernetes-evil + # kubernetes + # kubernetes-evil ledger-mode lsp-javascript-typescript lsp-mode |