From 9bb93507cce33dddacb49873d881be59cb552d5d Mon Sep 17 00:00:00 2001
From: Alexandre LUCAZEAU <lucazeau.alexandre@gmail.com>
Date: Sun, 23 Jul 2023 18:05:54 +0200
Subject: [PATCH] =?UTF-8?q?=09modifi=C3=A9=C2=A0:=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20configs/i3config=20=09modifi=C3=A9=C2=A0:=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20home.nix=20=09modifi=C3=A9=C2=A0:=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20packages.nix=20=09modifi=C3=A9=C2=A0:=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20starship.nix=20=09modifi=C3=A9=C2=A0:=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20../nixos/configuration.nix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hosts/d2nix/home-manager/configs/i3config |  2 +-
 hosts/d2nix/home-manager/home.nix         |  2 +-
 hosts/d2nix/home-manager/packages.nix     |  4 ++
 hosts/d2nix/home-manager/starship.nix     | 67 ++++++++++++++++++++++-
 hosts/d2nix/nixos/configuration.nix       |  5 +-
 5 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/hosts/d2nix/home-manager/configs/i3config b/hosts/d2nix/home-manager/configs/i3config
index a4b0d82..aa2dc32 100644
--- a/hosts/d2nix/home-manager/configs/i3config
+++ b/hosts/d2nix/home-manager/configs/i3config
@@ -18,7 +18,7 @@ client.focused_inactive   $gray2   $gray2   #FFFFFF   #000000
 client.unfocused          $gray2   $gray2   #FFFFFF   #000000
 
 # Police de caracteres pour les titres des fenetres. ISO 10646 = Unicode
-font pango:Hack 10
+font pango:iosevka 10
 
 # wallpaper
 exec --no-startup-id feh --bg-scale /home/alexandre/images/SF.jpg
diff --git a/hosts/d2nix/home-manager/home.nix b/hosts/d2nix/home-manager/home.nix
index ec0117e..561c51b 100644
--- a/hosts/d2nix/home-manager/home.nix
+++ b/hosts/d2nix/home-manager/home.nix
@@ -6,11 +6,11 @@
     ./variables.nix
     ./starship.nix
     ./i3status.nix
+    ./dunst.nix
     ./himalaya.nix
     ../../../modules/tmux.nix
     ../../../modules/emacs.nix
     ../../../modules/neovim.nix
-    ../../../modules/kdeconnect.nix
   ];
   home.stateVersion = "23.05";
   home.username = "alexandre";
diff --git a/hosts/d2nix/home-manager/packages.nix b/hosts/d2nix/home-manager/packages.nix
index f9a078b..15f5a21 100644
--- a/hosts/d2nix/home-manager/packages.nix
+++ b/hosts/d2nix/home-manager/packages.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
     home-manager
+    spaceFM
     jq
     nextcloud-client
     libreoffice
@@ -35,5 +36,8 @@
     guake
     graphviz
     kdeconnect
+    openssl
+    openvpn
+    feh
   ];
 }
diff --git a/hosts/d2nix/home-manager/starship.nix b/hosts/d2nix/home-manager/starship.nix
index af67018..41cd772 100644
--- a/hosts/d2nix/home-manager/starship.nix
+++ b/hosts/d2nix/home-manager/starship.nix
@@ -1,11 +1,72 @@
 { config, pkgs, ... }:
 {
   programs.starship = {
-    enable = true;
     enableFishIntegration = true;
+    enable = true;
     # Configuration écrite dans ~/.config/starship.toml
+    settings = {
+    add_newline = false;
+    format = "$shlvl$shell$username$hostname$nix_shell$git_branch$git_commit$git_state$git_status$directory$jobs$cmd_duration$character";
+    shlvl = {
+      disabled = false;
+      symbol = "ﰬ";
+      style = "bright-red bold";
+    };
+    shell = {
+      disabled = false;
+      format = "$indicator";
+      fish_indicator = "";
+      bash_indicator = "[BASH](bright-white) ";
+      zsh_indicator = "[ZSH](bright-white) ";
+    };
+    username = {
+      style_user = "bright-white bold";
+      style_root = "bright-red bold";
+    };
+    hostname = {
+      style = "bright-green bold";
+      ssh_only = true;
+    };
+    nix_shell = {
+      symbol = "";
+      format = "[$symbol$name]($style) ";
+      style = "bright-purple bold";
+    };
+    git_branch = {
+      only_attached = true;
+      format = "[$symbol$branch]($style) ";
+      symbol = "שׂ";
+      style = "bright-yellow bold";
+    };
+    git_commit = {
+      only_detached = true;
+      format = "[ﰖ$hash]($style) ";
+      style = "bright-yellow bold";
+    };
+    git_state = {
+      style = "bright-purple bold";
+    };
+    git_status = {
+      style = "bright-green bold";
+    };
+    directory = {
+      read_only = " ";
+      truncation_length = 0;
+    };
+    cmd_duration = {
+      format = "[$duration]($style) ";
+      style = "bright-blue";
+    };
+    jobs = {
+      style = "bright-green bold";
+    };
+    character = {
+      success_symbol = "[\\$](bright-green bold)";
+      error_symbol = "[\\$](bright-red bold)";
+    };
   };
-  xdg.configFile = {
-  "starship.toml" .source = ./configs/starship.toml;
   };
+  #xdg.configFile = {
+  #"starship.toml" .source = ./configs/starship.toml;
+  #};
 }
diff --git a/hosts/d2nix/nixos/configuration.nix b/hosts/d2nix/nixos/configuration.nix
index 3d8209a..9a081ef 100644
--- a/hosts/d2nix/nixos/configuration.nix
+++ b/hosts/d2nix/nixos/configuration.nix
@@ -13,7 +13,7 @@
       ./network.nix
       modules/common.nix
       modules/smtp.nix
-      modules/powermanagement.nix
+#      modules/powermanagement.nix
 
     ];
 
@@ -84,6 +84,7 @@
       setXAuthLocation = true;   
       forwardX11 = true;
     };
+    dconf.enable=true;
   };
   # Enable sound.
    sound.enable = true;
@@ -103,6 +104,8 @@
 
    environment.systemPackages = with pkgs; [
     google-fonts
+    gnome.adwaita-icon-theme
+    networkmanagerapplet
   ];
 
   environment.variables.EDITOR = "nvim";