Compare commits

..

10 Commits

11 changed files with 30 additions and 17 deletions

View File

@@ -24,11 +24,17 @@ clean-log:
full-auto: submodules-update upgrade clean optimise full-auto: submodules-update upgrade clean optimise
@date @date
list-installed-packages:
@# source : https://functor.tokyo/blog/2018-02-20-show-packages-installed-on-nixos
@# https://www.domenkozar.com/2014/01/02/getting-started-with-nix-package-manager/
@#nixos-option environment.systemPackages
nixos-option environment.systemPackages | head -2 | tail -1 | sed -e 's/ /\n/g' | cut -d- -f2- | sort | uniq| sed -e 's/"$$//'
optimise: optimise:
$(TIME) nix-store --optimise $(TIME) nix optimise-store
rebuild-build: 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 $(TIME) time nixos-rebuild build --fallback --show-trace
rebuild-switch: rebuild-switch:
@@ -51,7 +57,7 @@ store-repair:
$(TIME) nix-store --verify --check-contents --repair $(TIME) nix-store --verify --check-contents --repair
upgrade: 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 $(TIME) nixos-rebuild switch --upgrade --fallback --show-trace
##--------- Commandes spécifiques pour NixOS -- Opérations non courantes ##--------- Commandes spécifiques pour NixOS -- Opérations non courantes
@@ -106,3 +112,6 @@ tmpfs-umount:
tmpfs-destroy: tmpfs-umount tmpfs-destroy: tmpfs-umount
rmdir /mnt/tmpfs rmdir /mnt/tmpfs
##- Test awesome
test-awesome:
Xephyr :5 & sleep 1; DISPLAY=:5 awesome

View File

@@ -39,6 +39,7 @@ mkIf currentMachine.profiles.isDesktopEnvironment {
fira # police créée pour Firefox fira # police créée pour Firefox
fira-code # idem fira-mono + ligatures pour la programmation fira-code # idem fira-mono + ligatures pour la programmation
fira-mono # dérivée de fira en monospace fira-mono # dérivée de fira en monospace
font-awesome_5 # Jeux de police, utilisé avec Latex
hack-font # police monospace créée explicitement pour coder hack-font # police monospace créée explicitement pour coder
hasklig # police dérivée de source-code-pro mais avec des ligatures hasklig # police dérivée de source-code-pro mais avec des ligatures
]; ];

View File

@@ -13,6 +13,6 @@ mkIf (flags.developpement-haskell && flags.graphical) {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
] ++ (with pkgs.haskellPackages; [ ] ++ (with pkgs.haskellPackages; [
# Haskell lib # Haskell lib
threadscope # visualisation des threads (<bidule>.eventlog) #threadscope # visualisation des threads (<bidule>.eventlog)
]); ]);
} }

View File

@@ -12,9 +12,9 @@ mkIf (flags.radio && flags.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
## GUI ## GUI
gqrx # GUI gqrx # GUI
#gnuradio # Software Defined Radio (SDR) software gnuradio # Software Defined Radio (SDR) software
gnuradio-with-packages gnuradio-with-packages # Software Defined Radio (SDR) software
## A Trier ## A Trier
# #

View File

@@ -19,8 +19,9 @@ mkIf flags.developpement-haskell {
] ++ (with pkgs.haskellPackages; [ ] ++ (with pkgs.haskellPackages; [
# Haskell lib # Haskell lib
autoproc # ? procmail autoproc # ? procmail
darcs # gestionnaire de version éponyme #brittany # formatteur de code
ghc-mod # outil d'analyse de code haskell utilisé par IDE #darcs # gestionnaire de version éponyme
#ghc-mod # outil d'analyse de code haskell utilisé par IDE
hindent # indentation code hindent # indentation code
hlint # qualite de code, analyse statique de code + astuces & bonnes pratiques hlint # qualite de code, analyse statique de code + astuces & bonnes pratiques
#postgrest # mapper HTTP <-> PostgreSQL #postgrest # mapper HTTP <-> PostgreSQL
@@ -29,7 +30,7 @@ mkIf flags.developpement-haskell {
turtle # genre shell-scripting turtle # genre shell-scripting
# Application perso # Application perso
hahp #hahp
pandoc-filter-graphviz # filtre pour utiliser graphviz à partir de pandoc pandoc-filter-graphviz # filtre pour utiliser graphviz à partir de pandoc
]); ]);
} }

View File

@@ -12,7 +12,7 @@ in
nix.buildCores = 0; nix.buildCores = 0;
# The NixOS release to be compatible with for stateful data such as databases. # 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) # 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; system.copySystemConfiguration = true;
@@ -27,7 +27,7 @@ in
boot.cleanTmpDir = true; boot.cleanTmpDir = true;
# Activation des pages de manuel # Activation des pages de manuel
programs.man.enable = true; documentation.man.enable = true;
# Paquets # Paquets

View File

@@ -33,7 +33,7 @@ mkIf true {
SUBSYSTEM=="usb", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="2838", GROUP="audio", MODE="0666", SYMLINK+="rtl_sdr" 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; [ environment.systemPackages = with pkgs; [
libu2f-host libu2f-host

View File

@@ -13,7 +13,7 @@ mkIf flags.docker {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Ecosystème Docker # Ecosystème Docker
docker docker
python36Packages.docker_compose docker-compose
]; ];
virtualisation.docker.enable = true; virtualisation.docker.enable = true;

View File

@@ -18,9 +18,8 @@ mkIf flags.nixos-manual {
# Services # Services
## documentation sur ctrl + alt + F8 ## documentation sur ctrl + alt + F8
services.nixosManual = { documentation.nixos = {
enable = true; enable = true;
showManual = true;
}; };
# Réseau # Réseau

View File

@@ -26,6 +26,9 @@ mkIf true {
# Use kernel sandbox mechanisms where possible in unprivilegied processes # Use kernel sandbox mechanisms where possible in unprivilegied processes
# Systrace on OpenBSD, Seccomp on Linux, seatbelt on MacOSX/Darwin, rlimit elsewhere. # Systrace on OpenBSD, Seccomp on Linux, seatbelt on MacOSX/Darwin, rlimit elsewhere.
UsePrivilegeSeparation sandbox UsePrivilegeSeparation sandbox
# Permet de gérer le nombre de connexions multiplexées en simultané
MaxSessions 200
''; '';
}; };
} }

View File

@@ -33,7 +33,7 @@ mkIf true {
gnupg opensc pcsctools libu2f-host yubikey-personalization gnupg opensc pcsctools libu2f-host yubikey-personalization
]; ];
security.pam.enableU2F = true; security.pam.u2f.enable = true;
/*users.extraUsers.joko = { /*users.extraUsers.joko = {
isNormalUser = true; isNormalUser = true;