home

commit 2daa1fc22f4d8f38c29be2fcbbddd1e2b01f60d2
parent 59f7dda2598fe34d2ec57aff1d5f02c15963dbc3
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Fri,  7 May 2021 14:05:17 +0200

flake: make flakes build…

… by disabling some configuration. Next step will be to port current
profiles, hosts in flakes.

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

Diffstat:
M
systems/modules/profiles/default.flake.nix
 | 
1
+
M
systems/modules/profiles/home.flake.nix
 | 
4
++--
M
users/vincent/default.flake.nix
 | 
2
+-
M
users/vincent/home.nix
 | 
50
++++++++++++++++++++++++++------------------------

4 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/systems/modules/profiles/default.flake.nix b/systems/modules/profiles/default.flake.nix
@@ -7,6 +7,7 @@
     ./base.flake.nix
     ./home.flake.nix
     ./laptop.flake.nix
+    ./redhat.nix
     # ./desktop.flake.nix
     # FIXME: vpn, server, builder, …
   ];
diff --git a/systems/modules/profiles/home.flake.nix b/systems/modules/profiles/home.flake.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.home;
+  cfg = config.profiles.home;
 
   secretPath = ../../secrets/machines.nix;
   secretCondition = (builtins.pathExists secretPath);
@@ -9,7 +9,7 @@ let
 in
 {
   options = {
-    modules.home = {
+    profiles.home = {
       enable = mkEnableOption "home configuration";
     };
   };
diff --git a/users/vincent/default.flake.nix b/users/vincent/default.flake.nix
@@ -25,7 +25,7 @@ in
       #++ optionals config.profiles.scanning.enable [ "lp" "scanner" ]
       ++ optionals config.networking.networkmanager.enable [ "networkmanager" ]
       ++ optionals config.virtualisation.docker.enable [ "docker" ]
-      ++ optionals config.virtualisation.buildkitd.enable [ "buildkit" ]
+      #++ optionals config.virtualisation.buildkitd.enable [ "buildkit" ]
       ++ optionals config.virtualisation.libvirtd.enable [ "libvirtd" ];
     shell = mkIf config.programs.zsh.enable pkgs.zsh;
     isNormalUser = true;
diff --git a/users/vincent/home.nix b/users/vincent/home.nix
@@ -3,41 +3,43 @@ let
   inherit (lib) mkIf;
 in
 {
-  profiles = {
+  /*
+    modules = {
     desktop = {
-      i3.enable = true;
-      browsers = {
-        default = "firefox";
-        firefox.enable = true;
-      };
-      term = {
-        default = "alacritty";
-        alacritty.enable = true;
-      };
+    i3.enable = true;
+    browsers = {
+    default = "firefox";
+    firefox.enable = true;
+    };
+    term = {
+    default = "alacritty";
+    alacritty.enable = true;
+    };
     };
     editors = {
-      default = "emacs";
-      emacs.enable = true;
-      vim.enable = true;
-      # vscode.enable = false;
+    default = "emacs";
+    emacs.enable = true;
+    vim.enable = true;
+    # vscode.enable = false;
     };
     dev = {
-      go.enable = true;
-      python.enable = true;
+    go.enable = true;
+    python.enable = true;
     };
     hardware = {
-      ergodox.enable = true;
+    ergodox.enable = true;
     };
     shell = {
-      git.enable = true;
-      gnupg.enable = true;
-      direnv.enable = true;
-      tmux.enable = true;
-      zsh.enable = true;
+    git.enable = true;
+    gnupg.enable = true;
+    direnv.enable = true;
+    tmux.enable = true;
+    zsh.enable = true;
     };
-  };
+    };
+  */
   home.packages = with pkgs; [ htop ];
-  xsession.windowManager.i3 = mkIf nixosConfig.profiles.desktop.enable {
+  xsession.windowManager.i3 = mkIf nixosConfig.modules.desktop.enable {
     package = pkgs.i3-gaps;
     enable = true;
   };