patate: fix mountpoints

diff --git a/homes.nix b/homes.nix
index 423bd8b05d786d53043701d10d6ff35e211b2591..41cb1dee831538d2426f18a0fa04e92708fa52d5 100644 (file)
--- a/homes.nix
+++ b/homes.nix
@@ -5,14 +5,13 @@ with builtins;
 {
 nixpkgs.overlays = import <nixpkgs-overlays>;
 imports = [
-  (./homes + "/julm.nix")
-  homes/softwares.nix
+  (./homes + "/" + getEnv "USER" + ".nix")
+  #homes/softwares.nix
   #homes/options.nix
 ];
 config = {
   home.stateVersion = lib.mkDefault "20.09";
   home.username = lib.mkDefault (getEnv "USER");
   home.homeDirectory = lib.mkDefault "/home/${config.home.username}";
-  #programs.home-manager.enable = false; # Installed by NixOS
 };
 }

diff --git a/homes/sevy.nix b/homes/sevy.nix
index e19797854c93268567a35611c6c1a16a962d39b9..073105ef54fc286c7eee5b96f7e2cd3111637bbc 100644 (file)
--- a/homes/sevy.nix
+++ b/homes/sevy.nix
@@ -11,12 +11,14 @@ programs.git.enable = true;
 programs.git.package = pkgs.gitMinimal;
 programs.gpg.enable = true;
 programs.htop.enable = true;
+programs.home-manager.enable = true;
 programs.ssh.enable = true;
 programs.vim.enable = true;
 home.file.".profile".text = ''
   # Tell XFCE to not start ssh-agent
-  ! command -v xfconf-query >/dev/null ||
-  xfconf-query -c xfce4-session -p /startup/ssh-agent/enabled -n -t bool -s false
+  if command -v xfconf-query >/dev/null && test ''${DISPLAY:+set}; then
+    xfconf-query -c xfce4-session -p /startup/ssh-agent/enabled -n -t bool -s false
+  fi
 '';
 services.gpg-agent.enable = true;
 services.redshift.enable = config.host.desktop;
@@ -45,6 +47,7 @@ home.packages = [
   pkgs.ffmpeg
   pkgs.file
   pkgs.git-crypt
+  pkgs.go-mtpfs
   pkgs.gnumake
   pkgs.gvfs
   #pkgs.haskell.packages.ghc865.zerobin

diff --git a/homes/softwares/xmonad.nix b/homes/softwares/xmonad.nix
index c817877175b752ee6990f47f8f7bcfd13a5e5ee2..d35b7c860404fed1e7ea288da58e16b162605670 100644 (file)
--- a/homes/softwares/xmonad.nix
+++ b/homes/softwares/xmonad.nix
@@ -1,6 +1,7 @@
 { pkgs, lib, config, ... }:
 {
-home.file = lib.optionalAttrs config.xsession.windowManager.xmonad.enable {
+config = lib.mkIf config.xsession.windowManager.xmonad.enable {
+home.file = {
   ".xmonad/xmobar.hs".source = xmonad/xmobar.hs;
 };
 xsession = {
@@ -19,7 +20,7 @@ xsession = {
     config = xmonad/xmonad.hs;
   };
 };
-home.packages = lib.mkIf config.xsession.windowManager.xmonad.enable [
+home.packages = [
   pkgs.acpilight
   pkgs.gmrun
   pkgs.light
@@ -37,4 +38,5 @@ home.packages = lib.mkIf config.xsession.windowManager.xmonad.enable [
   pkgs.xsecurelock
   pkgs.xss-lock
 ];
+};
 }

diff --git a/hosts/patate/hardware.nix b/hosts/patate/hardware.nix
index fb4160c241509f45b6d28a22752d809ffc57c4eb..38858cb1014c719a059ff3c69ba78c98a331ce1b 100644 (file)
--- a/hosts/patate/hardware.nix
+++ b/hosts/patate/hardware.nix
@@ -151,7 +151,7 @@ fileSystems."/nix" =
   { device = "${hostName}/nix";
     fsType = "zfs";
   };
-fileSystems."/home" =
+fileSystems."/home/sevy" =
   { device = "${hostName}/home";
     fsType = "zfs";
   };
@@ -159,6 +159,14 @@ fileSystems."/home/sevy/Documents" =
   { device = "${hostName}/home/documents";
     fsType = "zfs";
   };
+fileSystems."/home/sevy/Images" =
+  { device = "${hostName}/home/Images";
+    fsType = "zfs";
+  };
+fileSystems."/home/sevy/Vidéos" =
+  { device = "${hostName}/home/Videos";
+    fsType = "zfs";
+  };
 fileSystems."/var" =
   { device = "${hostName}/var";
     fsType = "zfs";

diff --git a/install b/install
index d4a0240682c62fd4cd102d83a6bb8e15acfc883a..73a137c94c987f7a701119714598d3e2d73fe70e 100755 (executable)
--- a/install
+++ b/install
@@ -1,3 +1,3 @@
 #!/bin/sh -eux
-sudo nixos-rebuild switch --flake . "$@"
+sudo nixos-rebuild switch --flake "${0%/*}"/ "$@"
 sudo nix-env --delete-generations +2 --profile /nix/var/nix/profiles/system