Commit f916a4ff966c

@@ -1,258 +0,0 @@
-# name: lambda
-function __fish_basename -d 'basically basename, but faster'
-    string replace -r '^.*/' '' -- $argv
-end
-
-function __fish_dirname -d 'basically dirname, but faster'
-    string replace -r '/[^/]+/?$' '' -- $argv
-end
-
-
-function __fish_prompt_status -S -a last_status -d 'Display flags for non-zero-exit status, root user, and background jobs'
-    set -l nonzero
-    set -l superuser
-    set -l bg_jobs
-
-    # Last exit was nonzero
-    [ $last_status -ne 0 ]
-    and set nonzero 1
-
-    # If superuser (uid == 0)
-    #
-    # Note that iff the current user is root and '/' is not writeable by root this
-    # will be wrong. But I can't think of a single reason that would happen, and
-    # it is literally 99.5% faster to check it this way, so that's a tradeoff I'm
-    # willing to make.
-    [ -w / ]
-    and [ (id -u) -eq 0 ]
-    and set superuser 1
-
-    # Jobs display
-    jobs -p >/dev/null
-    and set bg_jobs 1
-
-    if [ "$nonzero" ]
-        set_color red
-        echo -n '! '
-        set_color normal
-    end
-
-    if [ "$superuser" ]
-        set_color red
-        echo -n '$ '
-        set_color normal
-    end
-
-    if [ "$bg_jobs" ]
-        set_color gray
-        echo -n '% '
-        set_color normal
-    end
-end
-
-function __fish_prompt_user -S -d 'Display current user and hostname'
-    [ -n "$SSH_CLIENT" ]
-    and set -l display_user_hostname
-
-    if set -q display_user_hostname
-        set -l IFS .
-        hostname | read -l hostname __
-        echo -ns (whoami) '@' $hostname
-    end
-end
-
-function __fish_git_project_dir
-    set -l git_dir (command git rev-parse --git-dir ^/dev/null)
-    or return
-
-    pushd $git_dir
-    set git_dir $PWD
-    popd
-
-    switch $PWD/
-        case $git_dir/\*
-            # Nothing works quite right if we're inside the git dir
-            # TODO: fix the underlying issues then re-enable the stuff below
-
-            # # if we're inside the git dir, sweet. just return that.
-            # set -l toplevel (command git rev-parse --show-toplevel ^/dev/null)
-            # if [ "$toplevel" ]
-            #   switch $git_dir/
-            #     case $toplevel/\*
-            #       echo $git_dir
-            #   end
-            # end
-            return
-    end
-
-    set -l project_dir (__fish_dirname $git_dir)
-
-    switch $PWD/
-        case $project_dir/\*
-            echo $project_dir
-            return
-    end
-
-    set project_dir (command git rev-parse --show-toplevel ^/dev/null)
-    switch $PWD/
-        case $project_dir/\*
-            echo $project_dir
-    end
-end
-
-function __fish_git_ahead -S -d 'Print the ahead/behind state for the current branch'
-    set -l ahead 0
-    set -l behind 0
-    for line in (command git rev-list --left-right '@{upstream}...HEAD' ^/dev/null)
-        switch "$line"
-            case '>*'
-                if [ $behind -eq 1 ]
-                    echo '±'
-                    return
-                end
-                set ahead 1
-            case '<*'
-                if [ $ahead -eq 1 ]
-                    echo "±"
-                    return
-                end
-                set behind 1
-        end
-    end
-
-    if [ $ahead -eq 1 ]
-        echo "+"
-    else if [ $behind -eq 1 ]
-        echo "-"
-    end
-end
-
-function __fish_git_branch -S -d 'Get the current git branch (or commitish)'
-    set -l ref (command git symbolic-ref HEAD ^/dev/null)
-    and begin
-        string replace 'refs/heads/' "" $ref
-        and return
-    end
-
-    set -l tag (command git describe --tags --exact-match ^/dev/null)
-    and echo "tag:$tag"
-    and return
-
-    set -l branch (command git show-ref --head -s --abbrev | head -n1 ^/dev/null)
-    echo "detached:$branch"
-end
-
-function __fish_prompt_git -S -a current_dir -d 'Display the actula git state'
-    set -l dirty ''
-    set -l show_dirty (command git config --bool bash.showDirtyState ^/dev/null)
-    if [ "$show_dirty" != 'false' ]
-        set dirty (command git diff --no-ext-diff --quiet --exit-code ^/dev/null; or echo -n "*")
-    end
-
-    set -l staged (command git diff --cached --no-ext-diff --quiet --exit-code ^/dev/null; or echo -n "~")
-    set -l stashed (command git rev-parse --verify --quiet refs/stash >/dev/null; and echo -n '$')
-    set -l ahead (__fish_git_ahead)
-
-    set -l new ''
-    set -l show_untracked (command git config --bool bash.showUntrackedFiles ^/dev/null)
-    if [ "$show_untracked" != 'false' ]
-        set new (command git ls-files --other --exclude-standard --directory --no-empty-directory ^/dev/null)
-        if [ "$new" ]
-            set new "…"
-        end
-    end
-
-    set -l flags "$dirty$staged$stashed$ahead$new"
-    [ "$flags" ]
-    and set flags ":$flags"
-
-    __fish_path_segment $current_dir
-
-    set_color green
-    echo -n '{'
-    echo -ns (__fish_git_branch) $flags ''
-    echo -n '}'
-    set_color normal
-
-    set -l project_pwd (command git rev-parse --show-prefix ^/dev/null | string trim --right --chars=/)
-
-    if [ "$project_pwd" ]
-        set_color brblack
-        echo -n "/$project_pwd"
-        set_color normal
-    end
-end
-
-function __fish_prompt_dir -S -d 'Display a shortened form of the current directory'
-    __fish_path_segment "$PWD"
-end
-
-function __fish_path_segment -S -a current_dir -d 'Display a shortened form of a directory'
-    set -l directory
-    set -l parent
-
-    switch "$current_dir"
-        case /
-            set directory '/'
-        case "$HOME"
-            set directory '~'
-        case '*'
-            set parent (__fish_pretty_parent "$current_dir")
-            set directory (__fish_basename "$current_dir")
-    end
-
-    set_color white
-    echo -n $parent
-    set_color --bold
-    echo -ns $directory ''
-    set_color normal
-end
-
-function __fish_pretty_parent -S -a current_dir -d 'Print a parent directory, shortened to fit the prompt'
-    set -q fish_prompt_pwd_dir_length
-    or set -l fish_prompt_pwd_dir_length 1
-
-    # Replace $HOME with ~
-    set -l real_home ~
-    set -l parent_dir (string replace -r '^'"$real_home"'($|/)' '~$1' (__fish_dirname $current_dir))
-
-    # Must check whether `$parent_dir = /` if using native dirname
-    if [ -z "$parent_dir" ]
-        echo -n /
-        return
-    end
-
-    if [ $fish_prompt_pwd_dir_length -eq 0 ]
-        echo -n "$parent_dir/"
-        return
-    end
-
-    string replace -ar '(\.?[^/]{'"$fish_prompt_pwd_dir_length"'})[^/]*/' '$1/' "$parent_dir/"
-end
-
-# TODO: handle envs (nix-shell, virtualenv, ...)
-
-function fish_prompt -d 'vde-lambda, a fish theme optimized for me :D'
-    if test $TERM = "dumb"
-        echo "\$ "
-        return 0
-    end
-    # Save the last status for later
-    set -l last_status $status
-
-    __fish_prompt_status $last_status
-    __fish_prompt_user
-
-    # vcs
-    set -l git_root (__fish_git_project_dir)
-
-    if [ "$git_root" ]
-        __fish_prompt_git $git_root
-    else
-        __fish_prompt_dir
-    end
-
-    set_color --bold brblack
-    echo -n " λ "
-    set_color normal
-end

@@ -1,30 +0,0 @@
-function __fish_prompt_nix_shell
-    [ -z "$IN_NIX_SHELL" ]
-    and return
-    set_color yellow
-    echo -n -s '🄪  '
-    set_color normal
-end
-
-# ⏍ ⧆ ⌗ ⧉
-function __fish_prompt_direnv
-    [ -z "$DIRENV_DIR" ]
-    and return
-    set_color yellow
-    echo -n -s '⧉ '
-    set_color normal
-end
-
-function __fish_prompt_virtualenv
-    [ -z "$VIRTUAL_ENV" ]
-    and return
-    set_color green
-    echo -ns 'venv:' (basename "$VIRTUAL_ENV") ' '
-    set_color normal
-end
-
-function fish_right_prompt
-    __fish_prompt_direnv
-    __fish_prompt_nix_shell
-    __fish_prompt_virtualenv
-end

@@ -1,1 +0,0 @@
-set -gx GOPATH $HOME

@@ -1,2 +0,0 @@
-# default key sequence: Ctrl+s
-bind \cs sudope

@@ -1,54 +0,0 @@
-function sudope -d "Quickly toggle sudo prefix"
-
-    # Save the current command line and cursor position.
-    set -l command_buffer (commandline)
-    set -l cursor_position (commandline -C)
-
-    # If the command line is empty, pull the last command from history.
-    if test -z "$command_buffer"
-        set command_buffer $history[1]
-    end
-
-    # Parse the command line (first line only).
-    set -l command_parts (string match -ir '^(\s*)(sudo(\s+|$))?(.*)' $command_buffer[1])
-
-    # Handle multiline commands with extra care.
-    set -l command_lines_count (count $command_buffer)
-    test $command_lines_count -gt 1
-    and set -l command_rest $command_buffer[2..$command_lines_count]
-
-    switch (count $command_parts)
-        case 3
-            # No "sudo".
-
-            # Add "sudo" to the beginning of the command, after any leading whitespace (if present).
-            commandline -r (string join \n (string join '' $command_parts[2] 'sudo ' $command_parts[3]) $command_rest)
-
-            # Push the cursor position ahead if necessary (+5 for 'sudo ').
-            test $cursor_position -ge (string length -- "$command_parts[2]")
-            and set cursor_position (math $cursor_position+5)
-
-            # Place the cursor where it was (or where it should be).
-            commandline -C $cursor_position
-
-        case 5
-            # "sudo" is present in the beginning of the command.
-
-            # Remove "sudo", leave any leading whitespace (if present).
-            commandline -r (string join \n (string join '' $command_parts[2 5]) $command_rest)
-
-            # Push the cursor position back if appropriate ('sudo' and whitespace).
-            set -l lead_length (string length -- "$command_parts[2]")
-            set -l sudo_length (string length -- "$command_parts[3]")
-            if test $cursor_position -ge (math $lead_length+$sudo_length)
-                # The cursor was after "sudo".
-                set cursor_position (math $cursor_position-$sudo_length)
-            else if test $cursor_position -ge $lead_length
-                # The cursor was somewhere on "sudo".
-                set cursor_position $lead_length
-            end
-
-            # Place the cursor where it was (or where it should be).
-            commandline -C -- $cursor_position
-    end
-end

@@ -1,1 +0,0 @@
-../../../users/vincent/core/git
\ No newline at end of file

@@ -1,1 +0,0 @@
-/home/vincent/src/home/users/vincent/dev/mr/lib.mr
\ No newline at end of file

@@ -1,1 +0,0 @@
-/home/vincent/src/home/users/vincent/dev/mr/src.github.mr
\ No newline at end of file

@@ -1,1 +0,0 @@
-/home/vincent/src/home/users/vincent/dev/mr/src.github.openshift.mr
\ No newline at end of file

@@ -1,1 +0,0 @@
-/home/vincent/src/home/users/vincent/dev/mr/src.knative.dev.mr
\ No newline at end of file

@@ -1,1 +0,0 @@
-/home/vincent/src/home/users/vincent/dev/mr/src.mr
\ No newline at end of file

@@ -1,1 +0,0 @@
-/home/vincent/src/home/users/vincent/dev/mr/src.pkgs.devel.redhat.mr
\ No newline at end of file

@@ -1,1 +0,0 @@
-../../../users/vincent/core/tmux
\ No newline at end of file

@@ -1,1 +0,0 @@
-../../../users/vincent/core/xorg
\ No newline at end of file

@@ -1,1 +0,0 @@
-../../../users/vincent/core/zsh
\ No newline at end of file

@@ -1,14 +0,0 @@
-{
-  mkdir = ''mkdir --parents --verbose'';
-  rm = ''rm --interactive'';
-  cp = ''cp --interactive'';
-  mv = ''mv --interactive'';
-  gcd = ''cd (git root)'';
-  ls = ''exa'';
-  ll = ''exa --long'';
-  la = ''exa --all'';
-  l = ''exa --long --all --header'';
-  t = ''exa --tree --level=2'';
-  wget = ''wget -c'';
-  map = ''xargs -n1'';
-}

@@ -1,56 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.profiles.audio;
-in
-{
-  options = {
-    profiles.audio = {
-      enable = mkEnableOption "Enable audio profile";
-      shairport-sync = mkEnableOption "Enable shairport-sync";
-      mpd = {
-        enable = mkEnableOption "Enable mpd";
-        musicDir = mkOption {
-          description = "Data where to find the music for mpd";
-          type = types.str;
-        };
-      };
-    };
-  };
-  config = mkIf cfg.enable (mkMerge [
-    {
-      services.shairport-sync.enable = cfg.shairport-sync;
-    }
-    (
-      mkIf cfg.mpd.enable {
-        services.mpd = {
-          enable = true;
-          musicDirectory = cfg.mpd.musicDir;
-          network.listenAddress = "any";
-          extraConfig = ''
-            audio_output {
-              type    "pulse"
-              name    "Local MPD"
-            }
-          '';
-        };
-        services.mpdris2 = {
-          enable = true;
-          mpd.host = "127.0.0.1";
-        };
-        home.packages = with pkgs; [
-          mpc_cli
-          ncmpcpp
-        ];
-      }
-    )
-    (
-      mkIf (cfg.mpd.enable && config.profiles.desktop.enable) {
-        home.packages = with pkgs; [
-          ario
-        ];
-      }
-    )
-  ]);
-}

@@ -1,23 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-let
-  cfg = config.profiles.bash;
-in
-{
-  options = {
-    profiles.bash = {
-      enable = mkOption {
-        default = true;
-        description = "Enable bash profile and configuration";
-        type = types.bool;
-      };
-    };
-  };
-  config = mkIf cfg.enable {
-    programs.bash = {
-      enable = true;
-      shellAliases = import ./aliases.shell.nix;
-    };
-  };
-}

@@ -1,40 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.profiles.containers;
-in
-{
-  options = {
-    profiles.containers = {
-      enable = mkEnableOption "Enable containers profile";
-      podman = mkOption {
-        default = true;
-        description = "Enable podman tools";
-        type = types.bool;
-      };
-      docker = mkEnableOption "Enable docker tools";
-    };
-  };
-  config = mkIf cfg.enable {
-    profiles.docker.enable = cfg.docker;
-    programs.podman.enable = cfg.podman;
-    home.packages = with pkgs; [
-      nur.repos.mic92.cntr
-      my.ko
-      my.yak
-      skopeo
-    ];
-    home.file."bin/kontain.me" = {
-      text = ''
-        #!${pkgs.stdenv.shell}
-        command -v docker >/dev/null && {
-          docker run -ti --rm kontain.me/ko/$@
-        } || {
-          podman run -ti --rm kontain.me/ko/$@
-        }
-      '';
-      executable = true;
-    };
-  };
-}

@@ -1,32 +1,32 @@
 {
   imports = [
     # Remove "nixos" from here
-    ./avahi.nixos.nix
-    ./base.nixos.nix
-    ./buildkit.nixos.nix
-    ./containerd.nixos.nix
-    ./desktop.nixos.nix
-    ./dev.nixos.nix
-    ./docker.nixos.nix
-    ./fish.nixos.nix
-    ./gaming.nixos.nix
-    ./git.nixos.nix
-    ./home.nixos.nix
-    ./i18n.nixos.nix
-    ./ipfs.nixos.nix
-    ./laptop.nixos.nix
-    ./mail.nixos.nix
-    ./nix-auto-update.nixos.nix
-    ./printing.nixos.nix
-    ./pulseaudio.nixos.nix
-    ./qemu.nixos.nix
-    ./scanning.nixos.nix
-    ./ssh.nixos.nix
-    ./syncthing.nixos.nix
-    ./users.nixos.nix
-    ./virtualization.nixos.nix
-    ./wireguard.server.nixos.nix
-    ./yubikey.nixos.nix
-    ./zsh.nixos.nix
+    ./avahi.nix
+    ./base.nix
+    ./buildkit.nix
+    ./containerd.nix
+    ./desktop.nix
+    ./dev.nix
+    ./docker.nix
+    ./fish.nix
+    ./gaming.nix
+    ./git.nix
+    ./home.nix
+    ./i18n.nix
+    ./ipfs.nix
+    ./laptop.nix
+    ./mail.nix
+    ./nix-auto-update.nix
+    ./printing.nix
+    ./pulseaudio.nix
+    ./qemu.nix
+    ./scanning.nix
+    ./ssh.nix
+    ./syncthing.nix
+    ./users.nix
+    ./virtualization.nix
+    ./wireguard.server.nix
+    ./yubikey.nix
+    ./zsh.nix
   ];
 }

@@ -3,119 +3,207 @@
 with lib;
 let
   cfg = config.profiles.desktop;
-  dim-screen = pkgs.writeScript "dim-sreen.sh" ''
-    #!${pkgs.stdenv.shell}
-    export PATH=${lib.getBin pkgs.xlibs.xbacklight}/bin:$PATH
-    trap "exit 0" INT TERM
-    trap "kill \$(jobs -p); xbacklight -steps 1 -set $(xbacklight -get);" EXIT
-    xbacklight -time 5000 -steps 400 -set 0 &
-    sleep 2147483647 &
-    wait
-  '';
 in
 {
   options = {
     profiles.desktop = {
-      enable = mkEnableOption "Enable desktop profile";
-      lockCmd = mkOption {
-        default = "-n ${dim-screen} -- ${pkgs.i3lock-color}/bin/i3lock-color -c 666666";
-        description = "Lock command to use";
-        type = types.str;
+      enable = mkOption {
+        default = false;
+        description = "Enable desktop profile";
+        type = types.bool;
       };
-      xsession = {
-        enable = mkOption {
-          default = true;
-          description = "Enable xsession managed";
-          type = types.bool;
-        };
-        i3 = mkOption {
-          default = true;
-          description = "Enable i3 managed window manager";
-          type = types.bool;
-        };
+      avahi = mkOption {
+        default = true;
+        description = "Enable avahi  with the desktop profile";
+        type = types.bool;
+      };
+      pulseaudio = mkOption {
+        default = true;
+        description = "Enable pulseaudio with the desktop profile";
+        type = types.bool;
+      };
+      flatpak = mkOption {
+        default = true;
+        description = "Enable flatpak with the desktop profile";
+        type = types.bool;
+      };
+      syncthing = mkOption {
+        default = true;
+        description = "Enable syncthing with the desktop profile";
+        type = types.bool;
+      };
+      scanning = mkOption {
+        default = true;
+        description = "Enable scanning with the desktop profile";
+        type = types.bool;
+      };
+      printing = mkOption {
+        default = true;
+        description = "Enable printing with the desktop profile";
+        type = types.bool;
+      };
+      networkmanager = mkOption {
+        default = true;
+        description = "Enable networkmanager with the desktop profile";
+        type = types.bool;
+      };
+      autoLogin = mkOption {
+        default = false;
+        description = "Enable auto login";
+        type = types.bool;
       };
     };
   };
   config = mkIf cfg.enable {
-    home.sessionVariables = { WEBKIT_DISABLE_COMPOSITING_MODE = 1; };
-    profiles.gpg.enable = true;
-    profiles.emacs.capture = true;
-    xsession = mkIf cfg.xsession.enable {
-      enable = true;
-      initExtra = ''
-        ${pkgs.xlibs.xmodmap}/bin/xmodmap ${config.home.homeDirectory}.Xmodmap &
-      '';
-      pointerCursor = {
-        package = pkgs.vanilla-dmz;
-        name = "Vanilla-DMZ";
-      };
+    profiles.avahi.enable = cfg.avahi;
+    profiles.printing.enable = cfg.printing;
+    profiles.pulseaudio.enable = cfg.pulseaudio;
+    profiles.scanning.enable = cfg.scanning;
+    profiles.syncthing.enable = cfg.syncthing;
+
+    boot = {
+      tmpOnTmpfs = true;
+      plymouth.enable = true;
     };
-    home.keyboard = mkIf cfg.xsession.enable {
-      layout = "fr(bepo),fr";
-      variant = "oss";
-      options = [ "grp:menu_toggle" "grp_led:caps" "compose:caps" ];
-    };
-    gtk = {
-      enable = true;
-      iconTheme = {
-        name = "Arc";
-        package = pkgs.arc-icon-theme;
-      };
-      theme = {
-        name = "Arc";
-        package = pkgs.arc-theme;
-      };
-    };
-    services = {
-      redshift = {
-        enable = true;
-        brightness = { day = "1"; night = "0.9"; };
-        latitude = "48.3";
-        longitude = "7.5";
-        tray = true;
-      };
-    };
-    home.file.".XCompose".source = ./assets/xorg/XCompose;
-    home.file.".Xmodmap".source = ./assets/xorg/Xmodmap;
-    xdg.configFile."xorg/emoji.compose".source = ./assets/xorg/emoji.compose;
-    xdg.configFile."xorg/parens.compose".source = ./assets/xorg/parens.compose;
-    xdg.configFile."xorg/modletters.compose".source = ./assets/xorg/modletters.compose;
-    xdg.configFile."user-dirs.dirs".source = ./assets/xorg/user-dirs.dirs;
-    xdg.configFile."nr/desktop" = {
-      text = builtins.toJSON [
-        { cmd = "surf"; }
-        { cmd = "next"; }
-        { cmd = "xclip"; }
-        { cmd = "dmenu"; }
-        { cmd = "sxiv"; }
-        { cmd = "screenkey"; }
-        { cmd = "gimp"; }
-        { cmd = "virt-manager"; pkg = "virtmanager"; }
-        { cmd = "update-desktop-database"; pkg = "desktop-file-utils"; chan = "unstable"; }
-        { cmd = "lgogdownloader"; chan = "unstable"; }
-        { cmd = "xev"; pkg = "xorg.xev"; }
+
+    hardware.bluetooth.enable = true;
+
+    networking.networkmanager = {
+      enable = cfg.networkmanager;
+      unmanaged = [
+        "interface-name:ve-*"
+        "interface-name:veth*"
+        "interface-name:wg0"
+        "interface-name:docker0"
+        "interface-name:virbr*"
       ];
-      onChange = "${pkgs.my.nr}/bin/nr desktop";
+      packages = with pkgs; [ networkmanager-openvpn ];
     };
-    programs = {
-      firefox.enable = true;
+
+    programs.dconf.enable = true;
+    xdg.portal.enable = cfg.flatpak;
+
+    services = {
+      flatpak.enable = cfg.flatpak;
+      dbus.packages = [ pkgs.gnome3.dconf ];
+      xserver = {
+        enable = true;
+        enableTCP = false;
+        windowManager.twm.enable = true;
+        libinput.enable = true;
+        synaptics.enable = false;
+        layout = "fr(bepo),fr";
+        xkbVariant = "oss";
+        xkbOptions = "grp:menu_toggle,grp_led:caps,compose:caps";
+        inputClassSections = [
+          ''
+            Identifier      "TypeMatrix"
+            MatchIsKeyboard "on"
+            MatchVendor     "TypeMatrix.com"
+            MatchProduct    "USB Keyboard"
+            Driver          "evdev"
+            Option          "XbkModel"      "tm2030USB"
+            Option          "XkbLayout"     "fr"
+            Option          "XkbVariant"    "bepo"
+          ''
+          ''
+            Identifier      "ErgoDox"
+            #MatchVendor     "ErgoDox_EZ"
+            #MatchProduct    "ErgoDox_EZ"
+            MatchIsKeyboard "on"
+            MatchUSBID      "feed:1307"
+            Driver          "evdev"
+            Option          "XkbLayout"     "fr"
+            Option          "XkbVariant"    "bepo"
+          ''
+        ];
+        displayManager = {
+          # defaultSession = "none+i3";
+          lightdm = {
+            enable = true;
+            autoLogin = {
+              enable = true;
+              user = "vincent";
+            };
+          };
+        };
+      };
     };
-    profiles.i3.enable = cfg.xsession.i3;
-    home.packages = with pkgs; [
-      aspell
-      aspellDicts.en
-      aspellDicts.fr
-      #etBook
-      gnome3.defaultIconTheme
-      gnome3.gnome_themes_standard
-      keybase
-      mpv
-      pass
-      peco
-      profile-sync-daemon
-      xdg-user-dirs
-      xdg_utils
-      xsel
+    fonts = {
+      enableFontDir = true;
+      enableGhostscriptFonts = true;
+      fonts = with pkgs; [
+        corefonts
+        dejavu_fonts
+        emojione
+        feh
+        fira
+        fira-code
+        fira-code-symbols
+        fira-mono
+        hasklig
+        inconsolata
+        iosevka
+        noto-fonts
+        noto-fonts-cjk
+        noto-fonts-emoji
+        noto-fonts-extra
+        overpass
+        symbola
+        source-code-pro
+        twemoji-color-font
+        ubuntu_font_family
+        unifont
+      ];
+    };
+
+    # Polkit.
+    security.polkit.extraConfig = ''
+      polkit.addRule(function(action, subject) {
+      if ((action.id == "org.freedesktop.udisks2.filesystem-mount-system" ||
+      action.id == "org.freedesktop.udisks2.encrypted-unlock-system"
+      ) &&
+      subject.local && subject.active && subject.isInGroup("users")) {
+      return polkit.Result.YES;
+      }
+      var YES = polkit.Result.YES;
+      var permission = {
+      // required for udisks1:
+      "org.freedesktop.udisks.filesystem-mount": YES,
+      "org.freedesktop.udisks.luks-unlock": YES,
+      "org.freedesktop.udisks.drive-eject": YES,
+      "org.freedesktop.udisks.drive-detach": YES,
+      // required for udisks2:
+      "org.freedesktop.udisks2.filesystem-mount": YES,
+      "org.freedesktop.udisks2.encrypted-unlock": YES,
+      "org.freedesktop.udisks2.eject-media": YES,
+      "org.freedesktop.udisks2.power-off-drive": YES,
+      // required for udisks2 if using udiskie from another seat (e.g. systemd):
+      "org.freedesktop.udisks2.filesystem-mount-other-seat": YES,
+      "org.freedesktop.udisks2.filesystem-unmount-others": YES,
+      "org.freedesktop.udisks2.encrypted-unlock-other-seat": YES,
+      "org.freedesktop.udisks2.eject-media-other-seat": YES,
+      "org.freedesktop.udisks2.power-off-drive-other-seat": YES
+      };
+      if (subject.isInGroup("wheel")) {
+      return permission[action.id];
+      }
+      });
+    '';
+
+    environment.systemPackages = with pkgs; [
+      cryptsetup
+      xlibs.xmodmap
+      xorg.xbacklight
+      xorg.xdpyinfo
+      xorg.xhost
+      xorg.xinit
+      xss-lock
+      xorg.xmessage
+      unzip
+      gnupg
+      pinentry
+      inxi
     ];
   };
 }

@@ -1,209 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.profiles.desktop;
-in
-{
-  options = {
-    profiles.desktop = {
-      enable = mkOption {
-        default = false;
-        description = "Enable desktop profile";
-        type = types.bool;
-      };
-      avahi = mkOption {
-        default = true;
-        description = "Enable avahi  with the desktop profile";
-        type = types.bool;
-      };
-      pulseaudio = mkOption {
-        default = true;
-        description = "Enable pulseaudio with the desktop profile";
-        type = types.bool;
-      };
-      flatpak = mkOption {
-        default = true;
-        description = "Enable flatpak with the desktop profile";
-        type = types.bool;
-      };
-      syncthing = mkOption {
-        default = true;
-        description = "Enable syncthing with the desktop profile";
-        type = types.bool;
-      };
-      scanning = mkOption {
-        default = true;
-        description = "Enable scanning with the desktop profile";
-        type = types.bool;
-      };
-      printing = mkOption {
-        default = true;
-        description = "Enable printing with the desktop profile";
-        type = types.bool;
-      };
-      networkmanager = mkOption {
-        default = true;
-        description = "Enable networkmanager with the desktop profile";
-        type = types.bool;
-      };
-      autoLogin = mkOption {
-        default = false;
-        description = "Enable auto login";
-        type = types.bool;
-      };
-    };
-  };
-  config = mkIf cfg.enable {
-    profiles.avahi.enable = cfg.avahi;
-    profiles.printing.enable = cfg.printing;
-    profiles.pulseaudio.enable = cfg.pulseaudio;
-    profiles.scanning.enable = cfg.scanning;
-    profiles.syncthing.enable = cfg.syncthing;
-
-    boot = {
-      tmpOnTmpfs = true;
-      plymouth.enable = true;
-    };
-
-    hardware.bluetooth.enable = true;
-
-    networking.networkmanager = {
-      enable = cfg.networkmanager;
-      unmanaged = [
-        "interface-name:ve-*"
-        "interface-name:veth*"
-        "interface-name:wg0"
-        "interface-name:docker0"
-        "interface-name:virbr*"
-      ];
-      packages = with pkgs; [ networkmanager-openvpn ];
-    };
-
-    programs.dconf.enable = true;
-    xdg.portal.enable = cfg.flatpak;
-
-    services = {
-      flatpak.enable = cfg.flatpak;
-      dbus.packages = [ pkgs.gnome3.dconf ];
-      xserver = {
-        enable = true;
-        enableTCP = false;
-        windowManager.twm.enable = true;
-        libinput.enable = true;
-        synaptics.enable = false;
-        layout = "fr(bepo),fr";
-        xkbVariant = "oss";
-        xkbOptions = "grp:menu_toggle,grp_led:caps,compose:caps";
-        inputClassSections = [
-          ''
-            Identifier      "TypeMatrix"
-            MatchIsKeyboard "on"
-            MatchVendor     "TypeMatrix.com"
-            MatchProduct    "USB Keyboard"
-            Driver          "evdev"
-            Option          "XbkModel"      "tm2030USB"
-            Option          "XkbLayout"     "fr"
-            Option          "XkbVariant"    "bepo"
-          ''
-          ''
-            Identifier      "ErgoDox"
-            #MatchVendor     "ErgoDox_EZ"
-            #MatchProduct    "ErgoDox_EZ"
-            MatchIsKeyboard "on"
-            MatchUSBID      "feed:1307"
-            Driver          "evdev"
-            Option          "XkbLayout"     "fr"
-            Option          "XkbVariant"    "bepo"
-          ''
-        ];
-        displayManager = {
-          # defaultSession = "none+i3";
-          lightdm = {
-            enable = true;
-            autoLogin = {
-              enable = true;
-              user = "vincent";
-            };
-          };
-        };
-      };
-    };
-    fonts = {
-      enableFontDir = true;
-      enableGhostscriptFonts = true;
-      fonts = with pkgs; [
-        corefonts
-        dejavu_fonts
-        emojione
-        feh
-        fira
-        fira-code
-        fira-code-symbols
-        fira-mono
-        hasklig
-        inconsolata
-        iosevka
-        noto-fonts
-        noto-fonts-cjk
-        noto-fonts-emoji
-        noto-fonts-extra
-        overpass
-        symbola
-        source-code-pro
-        twemoji-color-font
-        ubuntu_font_family
-        unifont
-      ];
-    };
-
-    # Polkit.
-    security.polkit.extraConfig = ''
-      polkit.addRule(function(action, subject) {
-      if ((action.id == "org.freedesktop.udisks2.filesystem-mount-system" ||
-      action.id == "org.freedesktop.udisks2.encrypted-unlock-system"
-      ) &&
-      subject.local && subject.active && subject.isInGroup("users")) {
-      return polkit.Result.YES;
-      }
-      var YES = polkit.Result.YES;
-      var permission = {
-      // required for udisks1:
-      "org.freedesktop.udisks.filesystem-mount": YES,
-      "org.freedesktop.udisks.luks-unlock": YES,
-      "org.freedesktop.udisks.drive-eject": YES,
-      "org.freedesktop.udisks.drive-detach": YES,
-      // required for udisks2:
-      "org.freedesktop.udisks2.filesystem-mount": YES,
-      "org.freedesktop.udisks2.encrypted-unlock": YES,
-      "org.freedesktop.udisks2.eject-media": YES,
-      "org.freedesktop.udisks2.power-off-drive": YES,
-      // required for udisks2 if using udiskie from another seat (e.g. systemd):
-      "org.freedesktop.udisks2.filesystem-mount-other-seat": YES,
-      "org.freedesktop.udisks2.filesystem-unmount-others": YES,
-      "org.freedesktop.udisks2.encrypted-unlock-other-seat": YES,
-      "org.freedesktop.udisks2.eject-media-other-seat": YES,
-      "org.freedesktop.udisks2.power-off-drive-other-seat": YES
-      };
-      if (subject.isInGroup("wheel")) {
-      return permission[action.id];
-      }
-      });
-    '';
-
-    environment.systemPackages = with pkgs; [
-      cryptsetup
-      xlibs.xmodmap
-      xorg.xbacklight
-      xorg.xdpyinfo
-      xorg.xhost
-      xorg.xinit
-      xss-lock
-      xorg.xmessage
-      unzip
-      gnupg
-      pinentry
-      inxi
-    ];
-  };
-}

@@ -1,61 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.profiles.dev.go;
-in
-{
-  options = {
-    profiles.dev.go = {
-      enable = mkEnableOption "Enable go development profile";
-    };
-  };
-  config = mkIf cfg.enable (mkMerge [
-    {
-      home.sessionVariables = {
-        GOPATH = "${config.home.homeDirectory}";
-      };
-      profiles.dev.enable = true;
-      home.packages = with pkgs; [
-        gcc
-        go
-        godef
-        golangci-lint
-        golint
-        gopkgs
-        go-outline
-        go-symbols
-        delve
-        goimports
-        # vendoring tools
-        dep
-        # misc
-        protobuf
-        my.protobuild
-        my.ram
-        my.sec
-        my.esc
-        my.yaspell
-      ];
-      xdg.configFile."nr/go" = {
-        text = builtins.toJSON [
-          { cmd = "pprof"; chan = "unstable"; }
-          { cmd = "vndr"; chan = "unstable"; }
-          { cmd = "go2nix"; }
-          { cmd = "dep2nix"; }
-        ];
-        onChange = "${pkgs.my.nr}/bin/nr go";
-      };
-    }
-    (
-      mkIf config.profiles.fish.enable {
-        xdg.configFile."fish/conf.d/go.fish".source = ./assets/fish/go.fish;
-        programs.fish.shellAbbrs = {
-          got = "go test -v";
-          gob = "go build -v";
-          gol = "golangci-lint run";
-        };
-      }
-    )
-  ]);
-}

@@ -1,21 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.profiles.dev.haskell;
-in
-{
-  options = {
-    profiles.dev.haskell = {
-      enable = mkEnableOption "Enable haskell development profile";
-    };
-  };
-  config = mkIf cfg.enable {
-    profiles.dev.enable = true;
-    home.packages = with pkgs; [
-      ghc
-      stack
-      hlint
-    ];
-  };
-}

@@ -1,33 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.profiles.dev.java;
-in
-{
-  options = {
-    profiles.dev.java = {
-      enable = mkEnableOption "Enable java development profile";
-      javaPackage = mkOption {
-        default = pkgs.jdk;
-        description = "Java package to use";
-        type = types.package;
-      };
-      idea = mkEnableOption "Install intellij idea";
-    };
-  };
-  config = mkIf cfg.enable (mkMerge [
-    {
-      profiles.dev.enable = true;
-      home.packages = with pkgs; [
-        cfg.javaPackage
-        gradle
-      ];
-    }
-    (
-      mkIf cfg.idea {
-        home.packages = with pkgs; [ jetbrains.idea-ultimate ];
-      }
-    )
-  ]);
-}

@@ -1,31 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.profiles.dev.js;
-in
-{
-  options = {
-    profiles.dev.js = {
-      enable = mkEnableOption "Enable js development profile";
-    };
-  };
-  config = mkIf cfg.enable (mkMerge [
-    {
-      home.file.".npmrc".text = ''
-        prefix = ${config.home.homeDirectory}/.local/npm
-      '';
-      home.packages = with pkgs; [
-        nodejs-10_x
-        yarn
-      ];
-    }
-    (
-      mkIf config.profiles.fish.enable {
-        xdg.configFile."fish/conf.d/js.fish".text = ''
-          set -gx PATH ${config.home.homeDirectory}/.local/npm/bin $PATH
-        '';
-      }
-    )
-  ]);
-}

@@ -1,19 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.profiles.dev.lisp;
-in
-{
-  options = {
-    profiles.dev.lisp = {
-      enable = mkEnableOption "Enable lisp development profile";
-    };
-  };
-  config = mkIf cfg.enable {
-    home-packages = with pkgs; [
-      sbcl
-      asdf
-    ];
-  };
-}

@@ -7,48 +7,21 @@ in
 {
   options = {
     profiles.dev = {
-      enable = mkEnableOption "Enable development profile";
+      enable = mkOption {
+        default = false;
+        description = "Enable dev profile";
+        type = types.bool;
+      };
     };
   };
-  config = mkIf cfg.enable (mkMerge [
-    {
-      profiles.git.enable = true;
-      profiles.emacs.enable = true;
-      home.file.".ignore".text = ''
-        *.swp
-        *~
-        **/VENDOR-LICENSE
-      '';
-      xdg.configFile."mr".source = ./assets/lib.mr;
-      home.file."src/.mrconfig".source = ./assets/src.mr;
-      home.file."src/knative.dev/.mrconfig".source = ./assets/src.knative.dev.mr;
-      home.file."src/github.com/.mrconfig".source = ./assets/src.github.mr;
-      home.file."src/github.com/openshift/.mrconfig".source = ./assets/src.github.openshift.mr;
-      home.file."src/pkgs.devel.redhat.com/.mrconfig".source = ./assets/src.pkgs.devel.redhat.mr;
-      home.packages = with pkgs;
-        [
-          binutils
-          cmake
-          fswatch
-          gnumake
-          jq
-          mercurial
-          shfmt
-        ];
-      xdg.configFile."nr/dev" = {
-        text = builtins.toJSON [
-          { cmd = "yq"; }
-          { cmd = "lnav"; }
-          { cmd = "miniserve"; }
-          { cmd = "licensor"; }
-          { cmd = "nix-review"; }
-          { cmd = "yamllint"; pkg = "python37Packages.yamllint"; }
-          { cmd = "nix-prefetch-git"; pkg = "nix-prefetch-scripts"; }
-          { cmd = "nix-prefetch-hg"; pkg = "nix-prefetch-scripts"; }
-          { cmd = "http"; pkg = "httpie"; }
-        ];
-        onChange = "${pkgs.my.nr}/bin/nr dev";
-      };
-    }
-  ]);
+  config = mkIf cfg.enable {
+    profiles.git.enable = true;
+    environment.systemPackages = with pkgs; [
+      git
+      tig
+      grc
+      ripgrep
+      gnumake
+    ];
+  };
 }

@@ -1,27 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.profiles.dev;
-in
-{
-  options = {
-    profiles.dev = {
-      enable = mkOption {
-        default = false;
-        description = "Enable dev profile";
-        type = types.bool;
-      };
-    };
-  };
-  config = mkIf cfg.enable {
-    profiles.git.enable = true;
-    environment.systemPackages = with pkgs; [
-      git
-      tig
-      grc
-      ripgrep
-      gnumake
-    ];
-  };
-}

@@ -1,23 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.profiles.dev.python;
-in
-{
-  options = {
-    profiles.dev.python = {
-      enable = mkEnableOption "Enable python development profile";
-    };
-  };
-  config = mkIf cfg.enable {
-    profiles.dev.enable = true;
-    home.packages = with pkgs; [
-      python3
-      python36Packages.virtualenv
-      python36Packages.pip-tools
-      python36Packages.tox
-      pipenv
-    ];
-  };
-}

@@ -1,29 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.profiles.dev.rust;
-in
-{
-  options = {
-    profiles.dev.rust = {
-      enable = mkEnableOption "Enable rust development profile";
-    };
-  };
-  config = mkIf cfg.enable (mkMerge [
-    {
-      profiles.dev.enable = true;
-      home.packages = with pkgs; [
-        gcc
-        rustup
-      ];
-    }
-    (
-      mkIf config.profiles.emacs.enable {
-        home.packages = with pkgs; [
-          rustracer
-        ];
-      }
-    )
-  ]);
-}

@@ -1,49 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-let
-  cfg = config.profiles.direnv;
-in
-{
-  options = {
-    profiles.direnv = {
-      enable = mkOption {
-        default = true;
-        description = "Enable direnv profile and configuration";
-        type = types.bool;
-      };
-    };
-  };
-  config = mkIf cfg.enable (mkMerge [
-    {
-      programs.direnv = {
-        enable = true;
-        config = {
-          whitelist = {
-            prefix = [
-              "${config.home.homeDirectory}/src/github.com/knative"
-              "${config.home.homeDirectory}/src/github.com/openshift"
-              "${config.home.homeDirectory}/src/github.com/tektoncd"
-              "${config.home.homeDirectory}/src/github.com/vdemeester"
-            ];
-          };
-        };
-      };
-    }
-    (
-      mkIf config.profiles.fish.enable {
-        programs.direnv.enableFishIntegration = true;
-      }
-    )
-    (
-      mkIf config.profiles.zsh.enable {
-        programs.direnv.enableZshIntegration = true;
-      }
-    )
-    (
-      mkIf config.profiles.bash.enable {
-        programs.direnv.enableBashIntegration = true;
-      }
-    )
-  ]);
-}

@@ -7,25 +7,37 @@ in
 {
   options = {
     profiles.docker = {
-      enable = mkEnableOption "Enable docker profile";
+      enable = mkOption {
+        default = false;
+        description = "Enable docker profile";
+        type = types.bool;
+      };
+      package = mkOption {
+        default = pkgs.docker-edge;
+        description = "docker package to be used";
+        type = types.package;
+      };
+      runcPackage = mkOption {
+        default = pkgs.runc;
+        description = "runc package to be used";
+        type = types.package;
+      };
     };
   };
-  config = mkIf cfg.enable (mkMerge [
-    {
-      home.packages = with pkgs; [
-        docker
-        docker-machine
-        docker-machine-kvm
-        docker-machine-kvm2
-        docker-compose
-      ];
-    }
-    (
-      mkIf config.profiles.fish.enable {
-        xdg.configFile."fish/conf.d/docker.fish".text = ''
-          # set -gx DOCKER_BUILDKIT 1
-        '';
-      }
-    )
-  ]);
+  config = mkIf cfg.enable {
+    profiles.containerd.enable = true;
+    virtualisation = {
+      docker = {
+        enable = true;
+        package = cfg.package;
+        liveRestore = false;
+        storageDriver = "overlay2";
+        extraOptions = "--experimental --add-runtime docker-runc=${cfg.runcPackage}/bin/runc --default-runtime=docker-runc --containerd=/run/containerd/containerd.sock";
+      };
+    };
+    environment.etc."docker/daemon.json".text = ''
+      {"features":{"buildkit": true}, "insecure-registries": ["172.30.0.0/16", "192.168.12.0/16", "massimo.home:5000", "r.svc.home:5000", "r.svc.home" ]}
+    '';
+    networking.firewall.trustedInterfaces = [ "docker0" ];
+  };
 }

@@ -1,43 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.profiles.docker;
-in
-{
-  options = {
-    profiles.docker = {
-      enable = mkOption {
-        default = false;
-        description = "Enable docker profile";
-        type = types.bool;
-      };
-      package = mkOption {
-        default = pkgs.docker-edge;
-        description = "docker package to be used";
-        type = types.package;
-      };
-      runcPackage = mkOption {
-        default = pkgs.runc;
-        description = "runc package to be used";
-        type = types.package;
-      };
-    };
-  };
-  config = mkIf cfg.enable {
-    profiles.containerd.enable = true;
-    virtualisation = {
-      docker = {
-        enable = true;
-        package = cfg.package;
-        liveRestore = false;
-        storageDriver = "overlay2";
-        extraOptions = "--experimental --add-runtime docker-runc=${cfg.runcPackage}/bin/runc --default-runtime=docker-runc --containerd=/run/containerd/containerd.sock";
-      };
-    };
-    environment.etc."docker/daemon.json".text = ''
-      {"features":{"buildkit": true}, "insecure-registries": ["172.30.0.0/16", "192.168.12.0/16", "massimo.home:5000", "r.svc.home:5000", "r.svc.home" ]}
-    '';
-    networking.firewall.trustedInterfaces = [ "docker0" ];
-  };
-}

@@ -1,189 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.profiles.emacs;
-  capture = pkgs.writeScriptBin "capture" ''
-    #!${pkgs.stdenv.shell}
-    emacsclient -s /run/user/1000/emacs/org -n -F '((name . "capture") (width . 150) (height . 90))' -e '(org-capture)'
-  '';
-  myEmacs = pkgs.emacs27.override { inherit (pkgs) imagemagick; withXwidgets = cfg.withXwidgets; };
-in
-{
-  options = {
-    profiles.emacs = {
-      enable = mkEnableOption "Enable emacs profile";
-      capture = mkEnableOption "Enable capture script(s)";
-      daemonService = mkOption {
-        default = true;
-        description = "Enable emacs daemon service";
-        type = types.bool;
-      };
-      withXwidgets = mkEnableOption "Enable Xwidgets in emacs build";
-      texlive = mkOption {
-        default = true;
-        description = "Enable Texlive";
-        type = types.bool;
-      };
-    };
-  };
-  config = mkIf cfg.enable (mkMerge [
-    {
-      home.file.".local/share/applications/org-protocol.desktop".source = ./assets/xorg/org-protocol.desktop;
-      home.file.".local/share/applications/ec.desktop".source = ./assets/xorg/ec.desktop;
-      home.file.".local/share/applications/capture.desktop".source = ./assets/xorg/capture.desktop;
-      home.packages = with pkgs; [
-        ditaa
-        graphviz
-        pandoc
-        zip
-        hunspell
-        hunspellDicts.en_US-large
-        hunspellDicts.en_GB-ize
-        hunspellDicts.fr-any
-        nixpkgs-fmt
-      ];
-      home.sessionVariables = {
-        EDITOR = "et";
-        ALTERNATE_EDITOR = "et";
-      };
-      programs.emacs = {
-        enable = true;
-        package = myEmacs;
-        extraPackages = epkgs: with epkgs; [
-          ace-window
-          aggressive-indent
-          async
-          avy
-          bbdb
-          beginend
-          pkgs.bookmark-plus
-          company
-          company-emoji
-          company-go
-          dash
-          delight
-          dired-collapse
-          dired-git-info
-          dired-quick-sort
-          dired-narrow
-          dired-rsync
-          pkgs.dired-plus
-          direnv
-          dockerfile-mode
-          easy-kill
-          esup
-          expand-region
-          flycheck
-          flycheck-golangci-lint
-          git-annex
-          git-commit
-          gitattributes-mode
-          gitconfig-mode
-          gitignore-mode
-          github-review
-          goto-last-change
-          hardhat
-          helpful
-          highlight
-          highlight-indentation
-          highlight-numbers
-          ibuffer-vc
-          icomplete-vertical
-          iedit
-          json-mode
-          markdown-mode
-          mpdel
-          multiple-cursors
-          nixpkgs-fmt
-          no-littering
-          ob-async
-          ob-go
-          ob-http
-          orderless
-          orgit
-          org-plus-contrib
-          org-capture-pop-frame
-          org-gcal
-          org-ql
-          org-ref
-          org-super-agenda
-          org-web-tools
-          ox-pandoc
-          pandoc-mode
-          projectile
-          projectile-ripgrep
-          pdf-tools
-          python-mode
-          rainbow-delimiters
-          rainbow-mode
-          region-bindings-mode
-          ripgrep
-          rg
-          try
-          visual-fill-column
-          visual-regexp
-          web-mode
-          wgrep
-          with-editor
-          xterm-color
-          yaml-mode
-          darkroom
-          eshell-prompt-extras
-          esh-autosuggest
-          flimenu
-          forge
-          go-mode
-          magit
-          magit-annex
-          magit-popup
-          magit-todos
-          minions
-          moody
-          mwim
-          nix-buffer
-          nix-mode
-          org-super-agenda
-          org-tree-slide
-          shr-tag-pre-highlight
-          ssh-config-mode
-          smartparens
-          symbol-overlay
-          undo-tree
-          use-package
-          # Highly experimental
-          vterm
-          gotest
-        ];
-      };
-    }
-    (
-      mkIf config.profiles.emacs.capture {
-        home.packages = with pkgs; [ wmctrl capture ];
-      }
-    )
-    (
-      mkIf config.services.gpg-agent.enable {
-        #services.gpg-agent.extraConfig = ''
-        #  allow-emacs-pinentry
-        #'';
-      }
-    )
-    (
-      mkIf cfg.texlive {
-        home.packages = with pkgs; [ texlive.combined.scheme-full ];
-      }
-    )
-    (
-      mkIf cfg.daemonService {
-        services.emacs-server = {
-          enable = true;
-          package = myEmacs;
-          name = "org";
-          shell = pkgs.zsh + "/bin/zsh -i -c";
-          extraOptions = "--dump-file=${config.home.homeDirectory}/.config/emacs/emacs.pdmp";
-        };
-      }
-    )
-  ]);
-}

@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.profiles.finances;
-in
-{
-  options = {
-    profiles.finances = {
-      enable = mkEnableOption "Enable fincances profile";
-    };
-  };
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [ ledger ];
-  };
-}

@@ -9,7 +9,7 @@ in
     profiles.fish = {
       enable = mkOption {
         default = false;
-        description = "Enable fish program and configurations";
+        description = "Enable fish profile";
         type = types.bool;
       };
     };
@@ -17,41 +17,12 @@ in
   config = mkIf cfg.enable {
     programs.fish = {
       enable = true;
-      shellAliases = import ./aliases.shell.nix;
-      shellInit = ''
-        # emacs ansi-term support
-        if test -n "$EMACS"
-          set -x TERM eterm-color
-
-          # this function may be required
-          function fish_title
-            true
-          end
-        end
+      promptInit = ''
+        source /etc/fish/functions/fish_prompt.fish
+        source /etc/fish/functions/fish_right_prompt.fish
       '';
     };
-    xdg.configFile."fish/conf.d/sudope.fish".source = ./assets/fish/sudope.fish;
-    xdg.configFile."fish/functions/sudope.fish".source = ./assets/fish/sudope.function.fish;
-    xdg.configFile."fish/functions/fish_prompt.fish".source = ./assets/fish/fish_prompt.fish;
-    xdg.configFile."fish/functions/fish_right_prompt.fish".source = ./assets/fish/fish_right_prompt.fish;
-    xdg.configFile."nr/default" = {
-      text = builtins.toJSON [
-        { cmd = "ncdu"; }
-        { cmd = "sshfs"; }
-        { cmd = "gotop"; }
-        { cmd = "pandoc"; }
-        { cmd = "nix-review"; }
-        { cmd = "lspci"; pkg = "pciutils"; }
-        { cmd = "lsusb"; pkg = "usbutils"; }
-        { cmd = "9"; pkg = "plan9port"; }
-        { cmd = "wakeonlan"; pkg = "python36Packages.wakeonlan"; }
-        { cmd = "beet"; pkg = "beets"; }
-        { cmd = "http"; pkg = "httpie"; }
-        { cmd = "nix-prefetch-git"; pkg = "nix-prefetch-scripts"; }
-        { cmd = "nix-prefetch-hg"; pkg = "nix-prefetch-scripts"; }
-        { cmd = "op"; pkg = "_1password"; chan = "unstable"; }
-      ];
-      onChange = "${pkgs.my.nr}/bin/nr default";
-    };
+    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;
   };
 }