home

commit 877502be1c22f7c60ee77026dbba41b4735c825f
parent 0f8940281b981c5522b7d561fb782fc65d57f16c
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Tue,  6 Jul 2021 18:55:27 +0200

users: try to fix home-manager manPages problem...

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
users/root/default.nix
 | 
9
++++++++-
M
users/vincent/core/default.nix
 | 
2
+-
M
users/vincent/core/git.nix
 | 
2
+-
M
users/vincent/default.nix
 | 
5
+++++
M
users/vincent/desktop/default.nix
 | 
24
++++++++++++------------

5 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/users/root/default.nix b/users/root/default.nix
@@ -5,6 +5,13 @@ with lib; {
     shell = mkIf config.programs.zsh.enable pkgs.zsh;
   };
   home-manager.users.root = lib.mkMerge (
-    [ (import ../vincent/core) ]
+    [
+      (import ../vincent/core/zsh.nix)
+      (import ./home.nix)
+    ]
+    ++ optionals (versionOlder config.system.nixos.release "21.11") [{
+      # FIXME manpages are broken on 21.05 and home-manager (for some reason..)
+      manual.manpages.enable = false;
+    }]
   );
 }
diff --git a/users/vincent/core/default.nix b/users/vincent/core/default.nix
@@ -15,7 +15,7 @@
   ];
 
   home = {
-    stateVersion = "20.03";
+    stateVersion = "21.05";
     packages = with pkgs; [
       enchive
       entr
diff --git a/users/vincent/core/git.nix b/users/vincent/core/git.nix
@@ -70,7 +70,7 @@ in
     ];
     extraConfig = {
       core = {
-        editor = "${pkgs.emacs}/bin/emacsclient -t";
+        #editor = "${pkgs.emacs}/bin/emacsclient -t";
       };
       color = {
         status = "auto";
diff --git a/users/vincent/default.nix b/users/vincent/default.nix
@@ -15,6 +15,7 @@ let
   isContainersEnabled = if hasConfigVirtualizationContainers then config.virtualisation.containers.enable else false;
 in
 {
+  warnings = if (versionAtLeast config.system.nixos.release "21.11") then [ ] else [ "NixOS release: ${config.system.nixos.release}" ];
   users.users.vincent = {
     createHome = true;
     uid = 1000;
@@ -97,5 +98,9 @@ in
         home.file.".local/share/applications/redhat-vpn.desktop".source = ./redhat/redhat-vpn.desktop;
         home.packages = with pkgs; [ gnome3.zenity oathToolkit ];
       }]
+      ++ optionals (versionOlder config.system.nixos.release "21.11") [{
+        # FIXME manpages are broken on 21.05 and home-manager (for some reason..)
+        manual.manpages.enable = false;
+      }]
     );
 }
diff --git a/users/vincent/desktop/default.nix b/users/vincent/desktop/default.nix
@@ -48,20 +48,20 @@
   xdg.configFile."xorg/modletters.compose".source = ./xorg/modletters.compose;
 
   /*
-  xdg.configFile."nr/desktop" = {
+    xdg.configFile."nr/desktop" = {
     text = builtins.toJSON [
-      { cmd = "peek"; }
-      { cmd = "shutter"; }
-      { cmd = "station"; }
-      { cmd = "dmenu"; }
-      { cmd = "sxiv"; }
-      { cmd = "screenkey"; }
-      { cmd = "gimp"; }
-      { cmd = "update-desktop-database"; pkg = "desktop-file-utils"; chan = "unstable"; }
-      { cmd = "lgogdownloader"; chan = "unstable"; }
-      { cmd = "xev"; pkg = "xorg.xev"; }
+    { cmd = "peek"; }
+    { cmd = "shutter"; }
+    { cmd = "station"; }
+    { cmd = "dmenu"; }
+    { cmd = "sxiv"; }
+    { cmd = "screenkey"; }
+    { cmd = "gimp"; }
+    { cmd = "update-desktop-database"; pkg = "desktop-file-utils"; chan = "unstable"; }
+    { cmd = "lgogdownloader"; chan = "unstable"; }
+    { cmd = "xev"; pkg = "xorg.xev"; }
     ];
     onChange = "${pkgs.my.nr}/bin/nr desktop";
-  };
+    };
   */
 }