From c7fdc18c0c85037f689a3a3b87f8c4572c36f176 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 22 Oct 2018 19:16:50 +0200 Subject: [PATCH 1/4] Correctifs maj 18.09 --- systems/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/common.nix b/systems/common.nix index c159b2a..4a6f57b 100644 --- a/systems/common.nix +++ b/systems/common.nix @@ -62,7 +62,7 @@ users.defaultUserShell = pkgs.zsh; programs.zsh = { enable = true; - enableAutosuggestions = true; + autosuggestions.enable = true; enableCompletion = true; syntaxHighlighting.enable = true; interactiveShellInit = '' From 06551f28c5e3c57114e6c3b09f756df74ee78496 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 22 Oct 2018 19:17:09 +0200 Subject: [PATCH 2/4] maj site musique --- pkgs/site-musique/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/site-musique/default.nix b/pkgs/site-musique/default.nix index 7629ec9..fc0f5d7 100644 --- a/pkgs/site-musique/default.nix +++ b/pkgs/site-musique/default.nix @@ -1,14 +1,12 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { - name= "site-musique-${version}"; - version = "1.0.0"; + name= "site-musique"; - src = fetchFromGitHub { - owner = "nyanloutre"; - repo = "site-musique"; - rev = "42ffbfa85422f0d3e98e842ca702e07cb20be0c0"; - sha256 = "1ndfwg6rpkm2hn5naw0c91l6zbpcd011irs8imchqzbj4m2i7wgm"; + src = fetchgit { + url = "https://gitlab.com/nyanloutre/site-musique.git"; + rev = "78e5d570534d528cdf19c44332cd2c929f6fa861"; + sha256 = "0rv1il85gxvi4d6yal8ac7q9jjz0w0ghmklbwzpd3p04v34y1rpd"; }; installPhase = '' From eb21ced47317ce77dc17fdcd301b7d45a0c7ce61 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 22 Oct 2018 19:17:48 +0200 Subject: [PATCH 3/4] Utilisation d'un fork perso de nixpkgs --- overlays/unstable_pkgs.nix | 2 -- systems/LoutreOS/configuration.nix | 3 --- 2 files changed, 5 deletions(-) diff --git a/overlays/unstable_pkgs.nix b/overlays/unstable_pkgs.nix index 631005b..09e3e5c 100644 --- a/overlays/unstable_pkgs.nix +++ b/overlays/unstable_pkgs.nix @@ -4,8 +4,6 @@ let in { unstable-pkgs = unstable; - jackett = unstable.jackett; radarr = unstable.radarr; sonarr = unstable.sonarr; - emby = unstable.emby; } diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index 88634e8..c5002c7 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -52,8 +52,5 @@ security.sudo.wheelNeedsPassword = false; - system.autoUpgrade.enable = true; - systemd.services.nixos-upgrade.path = with pkgs; [ gzip gnutar xz.bin config.nix.package.out ]; - system.stateVersion = "18.03"; } From 8b0022fc254601d597781153cf1f0bc7246fe425 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 22 Oct 2018 20:01:01 +0200 Subject: [PATCH 4/4] Migration fork nixpkgs --- overlays/unstable_pkgs.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/overlays/unstable_pkgs.nix b/overlays/unstable_pkgs.nix index 09e3e5c..175f7b5 100644 --- a/overlays/unstable_pkgs.nix +++ b/overlays/unstable_pkgs.nix @@ -4,6 +4,4 @@ let in { unstable-pkgs = unstable; - radarr = unstable.radarr; - sonarr = unstable.sonarr; }