nix: cleanup defaults

diff --git a/nixos/defaults.nix b/nixos/defaults.nix
index e22b89646a5e193f3131c9d5da3d0f996cb3754f..fdb25037b5abf6725bb2033ab4a5ca7447f0ca74 100644 (file)
--- a/nixos/defaults.nix
+++ b/nixos/defaults.nix
@@ -19,13 +19,15 @@ nix = {
     dates = lib.mkDefault "weekly";
     options = lib.mkDefault "--delete-older-than 30d";
   };
+  nixPath = lib.mkForce [];
 };
+environment.variables.NIXPKGS_CONFIG = lib.mkForce "";
 
 documentation.nixos = {
-  enable = false; # NOTE: useless on a server, and CPU intensive.
+  enable = lib.mkDefault false; # NOTE: useless on a server, and CPU intensive.
 };
 
-console.font   = "Lat2-Terminus16";
+console.font = "Lat2-Terminus16";
 console.keyMap = lib.mkDefault "fr";
 i18n.defaultLocale = "fr_FR.UTF-8";
 nixpkgs.config.allowUnfree = false;
@@ -58,19 +60,18 @@ networking = {
   usePredictableInterfaceNames = true;
 };
 
-services = {
-  openssh = {
-    enable = true;
-    passwordAuthentication = false;
-  };
-  journald = {
-    extraConfig = ''
-      Compress=true
-      MaxRetentionSec=1month
-      Storage=persistent
-      SystemMaxUse=128M
-    '';
-  };
+services.journald = {
+  extraConfig = ''
+    Compress=true
+    MaxRetentionSec=1month
+    Storage=persistent
+    SystemMaxUse=128M
+  '';
+};
+
+services.openssh = {
+  enable = true;
+  passwordAuthentication = false;
 };
 
 environment.systemPackages = with pkgs; [
@@ -135,7 +136,7 @@ programs = {
     '';
     shellAliases = {
       cl = "clear";
-      l  = "ls -alh";
+      l = "ls -alh";
       ll = "ls -al";
       ls = "ls --color=tty";
       mem = "ps -e -orss=,user=,args= | sort -b -k1,1n";
@@ -144,14 +145,12 @@ programs = {
       s="sudo systemctl";
       st="sudo systemctl status";
       u="systemctl --user";
+      ut="systemctl --user status";
       j="sudo journalctl -u";
 
       nixos-clean="sudo nix-collect-garbage -d";
       nixos-history="sudo nix-env --list-generations --profile /nix/var/nix/profiles/system";
       nixos-rollback="sudo nixos-rebuild switch --rollback";
-      nixos-update="sudo nix-channel --update";
-      nixos-upgrade="sudo nixos-rebuild switch";
-      nixos-upstream="sudo nix-channel --list";
     };
   };
   gnupg.agent.pinentryFlavor = "curses";