diff --git a/Makefile b/Makefile index 2729856..ec1dd5c 100644 --- a/Makefile +++ b/Makefile @@ -25,10 +25,10 @@ full-auto: submodules-update upgrade clean optimise @date optimise: - $(TIME) nix-store --optimise + $(TIME) nix optimise-store rebuild-build: - nix-channel --add https://nixos.org/channels/nixos-18.03 nixos + nix-channel --add https://nixos.org/channels/nixos-19.03 nixos $(TIME) time nixos-rebuild build --fallback --show-trace rebuild-switch: @@ -51,7 +51,7 @@ store-repair: $(TIME) nix-store --verify --check-contents --repair upgrade: - nix-channel --add https://nixos.org/channels/nixos-18.03 nixos + nix-channel --add https://nixos.org/channels/nixos-19.03 nixos $(TIME) nixos-rebuild switch --upgrade --fallback --show-trace ##--------- Commandes spécifiques pour NixOS -- Opérations non courantes diff --git a/applications/graphical/developpement-haskell.nix b/applications/graphical/developpement-haskell.nix index 353322b..3257559 100644 --- a/applications/graphical/developpement-haskell.nix +++ b/applications/graphical/developpement-haskell.nix @@ -13,6 +13,6 @@ mkIf (flags.developpement-haskell && flags.graphical) { environment.systemPackages = with pkgs; [ ] ++ (with pkgs.haskellPackages; [ # Haskell lib - threadscope # visualisation des threads (.eventlog) + #threadscope # visualisation des threads (.eventlog) ]); } diff --git a/applications/terminal/developpement-haskell.nix b/applications/terminal/developpement-haskell.nix index fee92d8..ca2d451 100644 --- a/applications/terminal/developpement-haskell.nix +++ b/applications/terminal/developpement-haskell.nix @@ -19,7 +19,7 @@ mkIf flags.developpement-haskell { ] ++ (with pkgs.haskellPackages; [ # Haskell lib autoproc # ? procmail - brittany # formatteur de code + #brittany # formatteur de code darcs # gestionnaire de version éponyme #ghc-mod # outil d'analyse de code haskell utilisé par IDE hindent # indentation code diff --git a/configuration/environment.nix b/configuration/environment.nix index d20e764..8425cd6 100644 --- a/configuration/environment.nix +++ b/configuration/environment.nix @@ -12,7 +12,7 @@ in nix.buildCores = 0; # The NixOS release to be compatible with for stateful data such as databases. - system.stateVersion = "18.03"; + system.stateVersion = "19.03"; # copies the NixOS configuration file (usually /etc/nixos/configuration.nix) and links it from the resulting system (getting to /run/current-system/configuration.nix) system.copySystemConfiguration = true; @@ -27,7 +27,7 @@ in boot.cleanTmpDir = true; # Activation des pages de manuel - programs.man.enable = true; + documentation.man.enable = true; # Paquets diff --git a/configuration/u2f.nix b/configuration/u2f.nix index 7898217..a52b369 100644 --- a/configuration/u2f.nix +++ b/configuration/u2f.nix @@ -33,7 +33,7 @@ mkIf true { SUBSYSTEM=="usb", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="2838", GROUP="audio", MODE="0666", SYMLINK+="rtl_sdr" ''; - security.pam.enableU2F = true; + security.pam.u2f.enable = true; environment.systemPackages = with pkgs; [ libu2f-host diff --git a/services/docker.nix b/services/docker.nix index 9663f89..95b96b4 100644 --- a/services/docker.nix +++ b/services/docker.nix @@ -13,7 +13,7 @@ mkIf flags.docker { environment.systemPackages = with pkgs; [ # Ecosystème Docker docker - python36Packages.docker_compose + docker-compose ]; virtualisation.docker.enable = true; diff --git a/services/yubikey.nix b/services/yubikey.nix index 2f786d7..3ca6d30 100644 --- a/services/yubikey.nix +++ b/services/yubikey.nix @@ -33,7 +33,7 @@ mkIf true { gnupg opensc pcsctools libu2f-host yubikey-personalization ]; - security.pam.enableU2F = true; + security.pam.u2f.enable = true; /*users.extraUsers.joko = { isNormalUser = true;