Commit 6c5f419d7d4e

@@ -1,28 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.profiles.fish;
-in
-{
-  options = {
-    profiles.fish = {
-      enable = mkOption {
-        default = false;
-        description = "Enable fish profile";
-        type = types.bool;
-      };
-    };
-  };
-  config = mkIf cfg.enable {
-    programs.fish = {
-      enable = true;
-      promptInit = ''
-        source /etc/fish/functions/fish_prompt.fish
-        source /etc/fish/functions/fish_right_prompt.fish
-      '';
-    };
-    environment.etc."fish/functions/fish_prompt.fish".source = ./assets/fish/fish_prompt.fish;
-    environment.etc."fish/functions/fish_right_prompt.fish".source = ./assets/fish/fish_right_prompt.fish;
-  };
-}

@@ -1,92 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  sources = import ../../nix/sources.nix;
-  cfg = config.profiles.nix-config;
-in
-{
-  options = {
-    profiles.nix-config = {
-      enable = mkOption {
-        default = true;
-        description = "Enable nix-config profile";
-        type = types.bool;
-      };
-      gcDates = mkOption {
-        default = "weekly";
-        description = "Specification (in the format described by systemd.time(7)) of the time at which the garbage collector will run. ";
-        type = types.str;
-      };
-      olderThan = mkOption {
-        default = "15d";
-        description = "Number of day to keep when garbage collect";
-        type = types.str;
-      };
-      buildCores = mkOption {
-        type = types.int;
-        default = 2;
-        example = 4;
-        description = ''
-          Maximum number of concurrent tasks during one build.
-        '';
-      };
-      localCaches = mkOption {
-        default = [ "http://nix.cache.home" ];
-        description = "List of local nix caches";
-        type = types.listOf types.str;
-      };
-    };
-  };
-  config = mkIf cfg.enable {
-    nix = {
-      buildCores = cfg.buildCores;
-      useSandbox = true;
-      gc = {
-        automatic = true;
-        dates = cfg.gcDates;
-        options = "--delete-older-than ${cfg.olderThan}";
-      };
-      nixPath = [
-        "nixpkgs=${sources.nixos}"
-        "nixos-config=/etc/nixos/configuration.nix"
-        "nixpkgs-overlays=/etc/nixos/overlays/compat"
-      ];
-      # if hydra is down, don't wait forever
-      extraOptions = ''
-        connect-timeout = 20
-        build-cores = 0
-        keep-outputs = true
-        keep-derivations = true
-      '';
-      binaryCaches = cfg.localCaches ++ [
-        "https://cache.nixos.org/"
-        "https://r-ryantm.cachix.org"
-        "https://vdemeester.cachix.org"
-        "https://shortbrain.cachix.org"
-      ];
-      binaryCachePublicKeys = [
-        "r-ryantm.cachix.org-1:gkUbLkouDAyvBdpBX0JOdIiD2/DP1ldF3Z3Y6Gqcc4c="
-        "vdemeester.cachix.org-1:uCECG6so7v1rs77c5NFz2dCePwd+PGNeZ6E5DrkT7F0="
-        "shortbrain.cachix.org-1:dqXcXzM0yXs3eo9ChmMfmob93eemwNyhTx7wCR4IjeQ="
-        "mic92.cachix.org-1:gi8IhgiT3CYZnJsaW7fxznzTkMUOn1RY4GmXdT/nXYQ="
-      ];
-      trustedUsers = [ "root" "vincent" ];
-    };
-    nixpkgs = {
-      overlays = [
-        (import ../../overlays/sbr.nix)
-        (import ../../overlays/unstable.nix)
-        (import ../../nix).emacs
-      ];
-      config = {
-        allowUnfree = true;
-        packageOverrides = pkgs: {
-          nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
-            inherit pkgs;
-          };
-        };
-      };
-    };
-  };
-}

@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 let
-  sources = import ../nix/sources.nix;
+  sources = import ../../nix/sources.nix;
 in
 {
   imports = [

@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 let
-  sources = import ../nix/sources.nix;
+  sources = import ../../nix/sources.nix;
 in
 {
   imports = [

@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 let
-  sources = import ../nix/sources.nix;
+  sources = import ../../nix/sources.nix;
 in
 {
   imports = [

@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 let
-  sources = import ../nix/sources.nix;
+  sources = import ../../nix/sources.nix;
 in
 {
   imports = [ (sources.nixos-hardware + "/lenovo/thinkpad") ];

@@ -1,6 +1,6 @@
 {
   imports = [
-    (import ../../nix).home-manager
+    (import ../../../nix).home-manager
     ./home-manager.nix
     ./nix.nix
     ./nur.nix

@@ -83,10 +83,10 @@ in
 
     nixpkgs = {
       overlays = [
-        (import ../../overlays/mkSecret.nix)
-        (import ../../overlays/sbr.nix)
-        (import ../../overlays/unstable.nix)
-        (import ../../nix).emacs
+        (import ../../../overlays/mkSecret.nix)
+        (import ../../../overlays/sbr.nix)
+        (import ../../../overlays/unstable.nix)
+        (import ../../../nix).emacs
       ];
       config = {
         allowUnfree = true;
@@ -95,7 +95,7 @@ in
     system = {
       extraSystemBuilderCmds = ''
         ln -sv ${pkgs.path} $out/nixpkgs
-        ln -sv ${../../overlays} $out/overlays
+        ln -sv ${../../../overlays} $out/overlays
       '';
 
       stateVersion = "20.03";

@@ -13,7 +13,7 @@ in
   config = mkIf cfg.enable {
     nixpkgs.config = {
       packageOverrides = pkgs: {
-        nur = (import ../../nix).nur { inherit pkgs; };
+        nur = (import ../../../nix).nur { inherit pkgs; };
       };
     };
   };

@@ -8,7 +8,6 @@
     ./desktop.nix
     ./dev.nix
     ./docker.nix
-    ./fish.nix
     ./gaming.nix
     ./git.nix
     ./home.nix

@@ -3,7 +3,7 @@
 with lib;
 let
   cfg = config.profiles.mail;
-  secretPath = ../../secrets/machines.nix;
+  secretPath = ../../../secrets/machines.nix;
   secretCondition = (builtins.pathExists secretPath);
 in
 {
@@ -17,7 +17,7 @@ in
     };
   };
   config = mkIf (cfg.enable && secretCondition) {
-    environment.etc."msmtprc".source = pkgs.mkSecret ../../secrets/msmtprc;
+    environment.etc."msmtprc".source = pkgs.mkSecret ../../../secrets/msmtprc;
     environment.systemPackages = with pkgs; [ msmtp ];
   };
 }

@@ -34,7 +34,7 @@ in
   };
   config = mkIf (cfg.arm || cfg.aarch64) {
     nixpkgs = {
-      overlays = [ (import ../../overlays/qemu/default.nix) ];
+      overlays = [ (import ../../../overlays/qemu/default.nix) ];
     };
     boot.binfmt.registrations =
       optionalAttrs cfg.arm { inherit arm; }

@@ -3,7 +3,7 @@
 with lib;
 let
   cfg = config.profiles.users;
-  secretPath = ../../secrets/machines.nix;
+  secretPath = ../../../secrets/machines.nix;
   secretCondition = (builtins.pathExists secretPath);
 
   isAuthorized = p: builtins.isAttrs p && p.authorized or false;
@@ -51,7 +51,7 @@ in
     }
     (
       mkIf secretCondition {
-        programs.ssh.extraConfig = with import ../../secrets/machines.nix; ''
+        programs.ssh.extraConfig = with import ../../../secrets/machines.nix; ''
           Host kerkouane kerkouane.sbr.pm
             Hostname kerkouane.sbr.pm
             Port ${toString ssh.kerkouane.port}

@@ -4,7 +4,7 @@ with lib;
 let
   cfg = config.profiles.wireguard.server;
 
-  secretPath = ../../secrets/machines.nix;
+  secretPath = ../../../secrets/machines.nix;
   secretCondition = (builtins.pathExists secretPath);
   allowedIPs = lists.optionals secretCondition (import secretPath).wireguard.kerkouane.allowedIPs;
   listenPort = if secretCondition then (import secretPath).wg.listenPort else 0;

@@ -1,7 +1,6 @@
 {
   imports = [
     ./crc.nix
-    # Remove "nixos" from here
     ./podman.nix
   ];
 }

@@ -14,8 +14,8 @@ let
 in
 {
   imports = [
-    ../hardware/thinkpad-x220.nix
-    ../modules
+    ./hardware/thinkpad-x220.nix
+    ./modules
     (import ../users).vincent
     (import ../users).root
   ];

@@ -16,7 +16,7 @@ in
 {
   imports = [
     (sources.nixos + "/nixos/modules/profiles/qemu-guest.nix")
-    ../modules
+    ./modules
     (import ../users).vincent
     (import ../users).root
   ]

@@ -14,8 +14,8 @@ let
 in
 {
   imports = [
-    ../hardware/gigabyte-brix.nix
-    ../modules
+    ./hardware/gigabyte-brix.nix
+    ./modules
     (import ../users).vincent
     (import ../users).root
   ];

@@ -14,8 +14,8 @@ let
 in
 {
   imports = [
-    ../hardware/gigabyte-brix.nix
-    ../modules
+    ./hardware/gigabyte-brix.nix
+    ./modules
     (import ../users).vincent
     (import ../users).root
   ];

@@ -14,8 +14,8 @@ let
 in
 {
   imports = [
-    ../hardware/lenovo-p50.nix
-    ../modules
+    ./hardware/lenovo-p50.nix
+    ./modules
     (import ../users).vincent
     (import ../users).root
   ];