From afb4a57b252b0bcaf2b32851b63e538f655d6fb4 Mon Sep 17 00:00:00 2001
From: Quentin Boyer <quentin+dev@familleboyer.net>
Date: Wed, 14 Jul 2021 12:20:13 +0200
Subject: [PATCH] update

---
 graphical.nix           | 45 +++++++++++++++++++++++++++++++++--------
 home.nix                | 44 +++++++++++++++++++++++++---------------
 nixos/configuration.nix | 28 +++++++++++++++++++------
 nixos/localcfg.nix      |  8 +++++++-
 4 files changed, 94 insertions(+), 31 deletions(-)

diff --git a/graphical.nix b/graphical.nix
index a302e8f..b14f20c 100644
--- a/graphical.nix
+++ b/graphical.nix
@@ -1,25 +1,48 @@
 { pkgs, config, ... }:
 
-let 
-	localinfo = import ./localinfo.nix;
+let
+  localinfo = import ./localinfo.nix;
 in
 {
   home.packages = with pkgs; [
     bitwarden
-    firefox-wayland
+    #firefox-wayland
     thunderbird
-	element-desktop
+    element-desktop
     (discord.override { nss = pkgs.nss; })
     spotify
     signal-desktop
-	libreoffice-fresh
+    libreoffice-fresh
 
     sway
+    xdg_utils
   ];
 
+  gtk = {
+    enable = true;
+    font = {
+      name = "DejaVu Sans";
+    };
+    theme = {
+      package = pkgs.gnome.gnome_themes_standard;
+      name = "Adwaita";
+    };
+  };
+
+  programs.firefox = {
+    enable = true;
+    package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
+      forceWayland = true;
+      extraPolicies = {
+        ExtensionSettings = { };
+      };
+    };
+  };
+
   home.sessionVariables = {
-	MOZ_ENABLE_WAYLAND = "1";
-	XDG_CURRENT_DESKTOP = "sway";
+    MOZ_ENABLE_WAYLAND = "1";
+    XDG_CURRENT_DESKTOP = "sway";
+    BROWSER = "firefox";
   };
 
   programs = {
@@ -151,7 +174,7 @@ in
           ws10 = "";
         in
         {
-          "Print" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.wl-clipboard}/bin/wl-copy";
+          "Print" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png";
           "${mod}+Shift+semicolon" = "kill";
           "${mod}+e" = "exec ${menu}";
           "${mod}+Return" = "exec ${terminal}";
@@ -216,3 +239,9 @@ in
     };
   };
 }
+
+
+
+
+
+
diff --git a/home.nix b/home.nix
index 4c5c658..6c0cbbf 100644
--- a/home.nix
+++ b/home.nix
@@ -32,18 +32,7 @@ in
     bitwarden-cli
     rustup
     neovim-nightly
-    (rsPlatform.buildRustPackage rec {
-      pname = "rust-analyzer";
-      version = "2021-06-21";
-      src = fetchFromGitHub {
-        owner = "rust-analyzer";
-        repo = "rust-analyzer";
-        rev = version;
-        sha256 = "1rm1cij2rc1g7cpdhlkd7zlkqcpwwmlzr1w8qfgjyfb9zi56bglw";
-      };
-      cargoSha256 = "00592sa69sz5f4wi0hdsxgmfmc4yifbyzb839p5jrc9ycxy07073";
-      doCheck = false;
-    })
+    rust-analyzer
     clang-tools
     nodePackages.vscode-json-languageserver
     nodePackages.bash-language-server
@@ -64,11 +53,32 @@ in
     rsync
     fd
     niv
-	bintools
-	httpie
-	sqlx-cli
+    bintools
+    httpie
+    sqlx-cli
+
+    /* (rsPlatform.buildRustPackage rec {
+      pname = "lists_cli";
+      version = "0.1.0";
+      src = fetchFromGitHub {
+      owner = "traxys";
+      repo = "lists";
+      rev = "2b5a1bb";
+      sha256 = "0ma6j96p109sra78cr00bdkyb9c7a9mg6v2vhzy7dpnz2zmr1h93";
+      };
+      cargoSha256 = "18w9xirik80f91fd805xjqvifvpgdsna6y9vwgfq621b8v7xjrkv";
+      }) */
   ];
 
+  services = {
+    syncthing = {
+      enable = true;
+      tray = {
+        enable = true;
+      };
+    };
+  };
+
   programs = {
     home-manager = {
       enable = true;
@@ -145,7 +155,7 @@ in
         screenRegion = "${pkgs.slurp}/bin/slurp | ${pkgs.grim}/bin/grim -g - ";
         py3 = "nix-shell -p python3 python3.pkgs.matplotlib --run python3";
         ssh = "kitty +kitten ssh";
-		ns = "nix-shell";
+        ns = "nix-shell";
       };
     };
   };
@@ -190,3 +200,5 @@ in
 
 
 
+
+
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 6edbd02..a1ab1f4 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -36,16 +36,27 @@
     };
     localtime.enable = true;
     fwupd.enable = true;
-	postgresql = {
-		enable = true;
-	};
+    postgresql = {
+      enable = true;
+    };
   };
   programs.adb.enable = true;
+  programs.dconf.enable = true;
 
   fonts.enableDefaultFonts = true;
-  fonts.fonts = with pkgs; [
-    (nerdfonts.override { fonts = [ "Hack" ]; })
-  ];
+  fonts = {
+    fonts = with pkgs; [
+      (nerdfonts.override { fonts = [ "Hack" ]; })
+      dejavu_fonts
+    ];
+    fontconfig = {
+      defaultFonts = {
+        serif = [ "DejaVu" ];
+        sansSerif = [ "DejaVu Sans" ];
+        monospace = [ "Hack" ];
+      };
+    };
+  };
 
   networking.networkmanager.enable = true;
 
@@ -65,3 +76,8 @@
   system.stateVersion = "21.05"; # Did you read the comment?
 }
 
+
+
+
+
+
diff --git a/nixos/localcfg.nix b/nixos/localcfg.nix
index 918a37e..5260b10 100644
--- a/nixos/localcfg.nix
+++ b/nixos/localcfg.nix
@@ -62,13 +62,18 @@ in
     uid = 1000;
     isNormalUser = true;
     home = "/home/traxys";
-    extraGroups = [ "wheel" "networkmanager" "adbusers"];
+    extraGroups = [ "wheel" "networkmanager" "adbusers" ];
     shell = pkgs.zsh;
   };
 
   # Set your time zone.
   time.timeZone = "Europe/Paris";
 
+  services.printing = {
+    enable = true;
+	drivers = [pkgs.hplip];
+  };
+
   hardware.opengl = {
     enable = true;
   };
@@ -83,3 +88,4 @@ in
 
 
 
+