From aa7d44af039a855b797eb5483915cfeda894711b Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sun, 24 Apr 2016 09:37:31 +0200 Subject: [PATCH 01/56] commit initial --- .gitignore | 11 +++++++++++ desktop.nix | 12 ++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 .gitignore create mode 100644 desktop.nix diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..95a6d7d --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +# Vim : +## swap +[._]*.s[a-w][a-z] +[._]s[a-w][a-z] +## session +Session.vim +## temporary +.netrwhist +*~ +## auto-generated tag files +tags diff --git a/desktop.nix b/desktop.nix new file mode 100644 index 0000000..8a50db6 --- /dev/null +++ b/desktop.nix @@ -0,0 +1,12 @@ +{ config, libs, pkgs, ... }: + +{ + # Enable the X11 windowing system. + services.xserver = { + enable = true; + layout = "fr"; + xkbOptions = "eurosign:e"; + displayManager.lightdm.enable = true; + windowManager.awesome.enable = true; + }; +} From 4e3ec6c71fe50dfde334af937890175aa1803ae5 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sun, 24 Apr 2016 10:00:46 +0200 Subject: [PATCH 02/56] ajout de tous les logiciels en vrac --- desktop.nix | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/desktop.nix b/desktop.nix index 8a50db6..be49f6b 100644 --- a/desktop.nix +++ b/desktop.nix @@ -1,6 +1,147 @@ { config, libs, pkgs, ... }: { + imports = [ + ]; + + environment.systemPackages = with pkgs; [ + alsaUtils + arp-scan + aspell + audacity + awesome + bashCompletion + beep + bind + byobu + cargo + chromium + clawsMail + cloc + cmus + cowsay + cpupower + curlftpfs + dhcpcd + dia + docker + easytag + espeak + filezilla + fira + firefox + freemind + fritzing + gimp + git + git-cola + gitAndTools.tig + gnome3.seahorse + gnumeric + gnupg21 + gnuplot + gparted + gpm + graphviz + grub2 + htop + idea.idea-community + inkscape + inotify-tools + iotop + iperf + iptraf-ng + jekyll + josm + kde4.digikam + kde4.kdepim + kde5.okular + kde5.quasselClient + kicad + lightdm + linuxPackages.virtualbox + linuxPackages.virtualboxGuestAdditions + lm_sensors + logrotate + lshw + lsof + lyx + lz4 + lzop + mcomix + meld + mercurial + mtr + mumble + mutt + ncdu + nfs-utils + nload + nmap + ntfs3g + ntp + openssh + openvpn + p7zip + pandoc + paprefs + pass + pavucontrol + pdfpc + pgadmin + picard + pidgin + postfix + powerline-fonts + powertop + pwgen + python27Packages.docker_compose + python27Packages.turses + python35Packages.ansible2 + python35Packages.glances + qpdfview + quagga + qucs + rustPlatform.rustc + sakura + samba + slock + smplayer + spaceFM + sqlitebrowser + sshfsFuse + stack + subversion + syslogng + taskwarrior + telnet + texLiveFull + thunderbird + tinc + transmission_gtk + transmission_remote_gtk + tree + ubuntu_font_family + udevil + unbound + unetbootin + usbutils + vbindiff + vifm + viking + vim + vlc + vorbis-tools + vsftpd + whois + wireshark + wmname + xorg.xorgserver + xrandr + yubikey-personalization-gui + zim + ]; + # Enable the X11 windowing system. services.xserver = { enable = true; From 6e73a026ca71fbe833e85209b156017496022f6c Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sun, 24 Apr 2016 10:11:18 +0200 Subject: [PATCH 03/56] =?UTF-8?q?premi=C3=A8re=20passe=20d'=C3=A9cr=C3=AAm?= =?UTF-8?q?age?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop.nix | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/desktop.nix b/desktop.nix index be49f6b..8e37c0e 100644 --- a/desktop.nix +++ b/desktop.nix @@ -5,30 +5,23 @@ ]; environment.systemPackages = with pkgs; [ - alsaUtils arp-scan aspell audacity - awesome - bashCompletion beep bind - byobu cargo chromium clawsMail cloc cmus cowsay - cpupower curlftpfs - dhcpcd dia docker easytag espeak filezilla - fira firefox freemind fritzing @@ -43,8 +36,6 @@ gparted gpm graphviz - grub2 - htop idea.idea-community inkscape inotify-tools @@ -58,11 +49,9 @@ kde5.okular kde5.quasselClient kicad - lightdm linuxPackages.virtualbox linuxPackages.virtualboxGuestAdditions lm_sensors - logrotate lshw lsof lyx @@ -74,13 +63,11 @@ mtr mumble mutt - ncdu nfs-utils nload nmap ntfs3g ntp - openssh openvpn p7zip pandoc @@ -112,7 +99,6 @@ sshfsFuse stack subversion - syslogng taskwarrior telnet texLiveFull @@ -120,8 +106,6 @@ tinc transmission_gtk transmission_remote_gtk - tree - ubuntu_font_family udevil unbound unetbootin @@ -136,8 +120,6 @@ whois wireshark wmname - xorg.xorgserver - xrandr yubikey-personalization-gui zim ]; From fb1ac16d95e88f504bccffe7a022bc7cc493702f Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sun, 24 Apr 2016 10:16:26 +0200 Subject: [PATCH 04/56] =?UTF-8?q?probl=C3=A8me=20avec=20ansible=20et=20pyt?= =?UTF-8?q?hon=203.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop.nix b/desktop.nix index 8e37c0e..c7d00ce 100644 --- a/desktop.nix +++ b/desktop.nix @@ -84,7 +84,7 @@ pwgen python27Packages.docker_compose python27Packages.turses - python35Packages.ansible2 + python27Packages.ansible2 python35Packages.glances qpdfview quagga From fc2c49b15d4fefa684a4d33209b0c5621097f01d Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sun, 24 Apr 2016 11:50:44 +0200 Subject: [PATCH 05/56] =?UTF-8?q?probl=C3=A8me=20pour=20glances=20avec=20p?= =?UTF-8?q?ython=203.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop.nix b/desktop.nix index c7d00ce..19986a8 100644 --- a/desktop.nix +++ b/desktop.nix @@ -85,7 +85,7 @@ python27Packages.docker_compose python27Packages.turses python27Packages.ansible2 - python35Packages.glances + python27Packages.glances qpdfview quagga qucs From cfcaaf15099cdf9263efdeeb9fe76954a7a3e5dd Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Wed, 4 May 2016 11:21:20 +0200 Subject: [PATCH 06/56] =?UTF-8?q?gnupg=20d=C3=A9j=C3=A0=20d=C3=A9fini=20da?= =?UTF-8?q?ns=20template-base?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/desktop.nix b/desktop.nix index 19986a8..e8b6309 100644 --- a/desktop.nix +++ b/desktop.nix @@ -31,7 +31,6 @@ gitAndTools.tig gnome3.seahorse gnumeric - gnupg21 gnuplot gparted gpm From dac301ae6c9de2a307018cc45a47a0b46317ce7b Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Wed, 4 May 2016 11:21:40 +0200 Subject: [PATCH 07/56] activation de l'agent gnupg au lieu de l'agent ssh (incompatibles) --- desktop.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/desktop.nix b/desktop.nix index e8b6309..8c8be7e 100644 --- a/desktop.nix +++ b/desktop.nix @@ -130,5 +130,7 @@ xkbOptions = "eurosign:e"; displayManager.lightdm.enable = true; windowManager.awesome.enable = true; + startGnuPGAgent = true; + startOpenSSHAgent = false; # pas compatible avec l'agent GnuPG }; } From fbf0ddfbaea8954bac994c3ab7a22534653ddde9 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Wed, 4 May 2016 14:51:26 +0200 Subject: [PATCH 08/56] =?UTF-8?q?paquets=20d=C3=A9j=C3=A0=20pr=C3=A9sents?= =?UTF-8?q?=20dans=20template-base?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/desktop.nix b/desktop.nix index 8c8be7e..a3fbbaf 100644 --- a/desktop.nix +++ b/desktop.nix @@ -9,7 +9,6 @@ aspell audacity beep - bind cargo chromium clawsMail @@ -26,9 +25,7 @@ freemind fritzing gimp - git git-cola - gitAndTools.tig gnome3.seahorse gnumeric gnuplot @@ -59,16 +56,13 @@ mcomix meld mercurial - mtr mumble mutt nfs-utils nload - nmap ntfs3g ntp openvpn - p7zip pandoc paprefs pass From 1a4277af748f41b973d5ad4d86a3076573748bfb Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Wed, 4 May 2016 14:51:55 +0200 Subject: [PATCH 09/56] installation de freecad --- desktop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop.nix b/desktop.nix index a3fbbaf..3d1e981 100644 --- a/desktop.nix +++ b/desktop.nix @@ -22,6 +22,7 @@ espeak filezilla firefox + freecad freemind fritzing gimp From 669be9860881a5114ce9ba49f3393e40b271c1d1 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Wed, 4 May 2016 16:21:14 +0200 Subject: [PATCH 10/56] activation du plugin html sur claws-mail --- desktop.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/desktop.nix b/desktop.nix index 3d1e981..d5c1e20 100644 --- a/desktop.nix +++ b/desktop.nix @@ -118,6 +118,10 @@ zim ]; + nixpkgs.config.packageOverrides = pkgs: { + clawsMail = pkgs.clawsMail.override { enablePluginFancy = true; }; + }; + # Enable the X11 windowing system. services.xserver = { enable = true; From d9a03c14454465d30e63d52dd78e28c5111f4fe5 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Wed, 4 May 2016 21:53:26 +0200 Subject: [PATCH 11/56] activation de pulseaudio --- desktop.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/desktop.nix b/desktop.nix index d5c1e20..52c7524 100644 --- a/desktop.nix +++ b/desktop.nix @@ -120,6 +120,7 @@ nixpkgs.config.packageOverrides = pkgs: { clawsMail = pkgs.clawsMail.override { enablePluginFancy = true; }; + mumble = pkgs.mumble.override { pulseSupport = true; }; }; # Enable the X11 windowing system. @@ -132,4 +133,10 @@ startGnuPGAgent = true; startOpenSSHAgent = false; # pas compatible avec l'agent GnuPG }; + + hardware.pulseaudio = { + enable = true; + support32Bit = true; + }; + environment.etc."pulse/daemon.conf".text = "flat-volumes = no"; } From ba1325557765129db285c798aac7aeb402ae7c13 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Wed, 4 May 2016 21:58:37 +0200 Subject: [PATCH 12/56] =?UTF-8?q?d=C3=A9but=20classement=20des=20paquets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop.nix | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/desktop.nix b/desktop.nix index 52c7524..98522cb 100644 --- a/desktop.nix +++ b/desktop.nix @@ -5,20 +5,32 @@ ]; environment.systemPackages = with pkgs; [ + # network toolbox arp-scan - aspell + iperf + iptraf-ng + nload + openvpn + quagga + telnet + tinc + + # Multimedia audacity beep + cmus + easytag + kde4.digikam + + aspell cargo chromium clawsMail cloc - cmus cowsay curlftpfs dia docker - easytag espeak filezilla firefox @@ -37,12 +49,8 @@ inkscape inotify-tools iotop - iperf - iptraf-ng jekyll josm - kde4.digikam - kde4.kdepim kde5.okular kde5.quasselClient kicad @@ -60,10 +68,8 @@ mumble mutt nfs-utils - nload ntfs3g ntp - openvpn pandoc paprefs pass @@ -81,7 +87,6 @@ python27Packages.ansible2 python27Packages.glances qpdfview - quagga qucs rustPlatform.rustc sakura @@ -94,10 +99,8 @@ stack subversion taskwarrior - telnet texLiveFull thunderbird - tinc transmission_gtk transmission_remote_gtk udevil From fb068f2efaba473aca055b97ddf31d01e2c79ad0 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 5 May 2016 00:36:56 +0200 Subject: [PATCH 13/56] =?UTF-8?q?am=C3=A9liorations=20pour=20les=20"marble?= =?UTF-8?q?=20mouse"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/desktop.nix b/desktop.nix index 98522cb..596a056 100644 --- a/desktop.nix +++ b/desktop.nix @@ -135,6 +135,30 @@ windowManager.awesome.enable = true; startGnuPGAgent = true; startOpenSSHAgent = false; # pas compatible avec l'agent GnuPG + inputClassSections = ['' + Identifier "Marble Mouse" + MatchProduct "Logitech USB Trackball" + MatchIsPointer "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" + # Physical button #s: A b D - - - - B C b = A & D simultaneously; - = no button + #Option "ButtonMapping" "1 8 3 4 5 6 7 2 2" # For right-hand placement + #Option "ButtonMapping" "3 8 1 4 5 6 7 2 2" # For left-hand placement + + # EmulateWheel refers to emulating a mouse wheel using Marble Mouse trackball. + Option "EmulateWheel" "true" + Option "EmulateWheelButton" "8" # Factory default; use "9" for left-side placement. + + # EmulateWheelInertia specifies how far (in pixels) the pointer must move to + # generate button press/release events in wheel emulation mode. + Option "EmulateWheelInertia" "10" # Factory default: 50 + + Option "ZAxisMapping" "4 5" + Option "XAxisMapping" "6 7" # Disable this for vertical-only scrolling. + # Emulate3Buttons refers to the act of pressing buttons A and D + # simultaneously to emulate a middle-click or wheel click. + Option "Emulate3Buttons" "true" # Factory default. + '']; }; hardware.pulseaudio = { From c85389b633f95ec66a522d36435237759fcc0ab8 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 5 May 2016 02:01:18 +0200 Subject: [PATCH 14/56] installation de ghc --- desktop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop.nix b/desktop.nix index 596a056..a59781f 100644 --- a/desktop.nix +++ b/desktop.nix @@ -37,6 +37,7 @@ freecad freemind fritzing + ghc gimp git-cola gnome3.seahorse From 745bcf876a2e4fb39eb5d114af8fa7c636fb9e4c Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 5 May 2016 02:01:41 +0200 Subject: [PATCH 15/56] installation de urbanterror --- desktop.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/desktop.nix b/desktop.nix index a59781f..354fbb2 100644 --- a/desktop.nix +++ b/desktop.nix @@ -107,6 +107,7 @@ udevil unbound unetbootin + urbanterror usbutils vbindiff vifm @@ -167,4 +168,5 @@ support32Bit = true; }; environment.etc."pulse/daemon.conf".text = "flat-volumes = no"; + nixpkgs.config.allowUnfree = true; } From d1114b05483f0fd00a4fe5d78093aab2a3f96a4d Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 5 May 2016 02:32:33 +0200 Subject: [PATCH 16/56] tri, suite --- desktop.nix | 95 ++++++++++++++++++++++++++++------------------------- 1 file changed, 51 insertions(+), 44 deletions(-) diff --git a/desktop.nix b/desktop.nix index 354fbb2..fd4e684 100644 --- a/desktop.nix +++ b/desktop.nix @@ -14,6 +14,8 @@ quagga telnet tinc + whois + wireshark # Multimedia audacity @@ -21,87 +23,98 @@ cmus easytag kde4.digikam + gimp + inkscape + paprefs + pavucontrol + picard + smplayer + vlc + vorbis-tools - aspell - cargo + # Clients Internet chromium clawsMail + firefox + kde5.quasselClient + mutt + mumble + pidgin + python27Packages.turses + thunderbird + + # Bureautique + aspell + dia + freemind + gnumeric + graphviz + kde5.okular + lyx + mcomix + pandoc + pdfpc + qpdfview + texLiveFull + zim + + # Développement + cargo cloc + ghc + git-cola + idea.idea-community + mercurial + meld + rustPlatform.rustc + stack + subversion + + # CAO + freecad + fritzing + kicad + qucs + cowsay curlftpfs - dia docker espeak filezilla - firefox - freecad - freemind - fritzing - ghc - gimp - git-cola gnome3.seahorse - gnumeric gnuplot gparted gpm - graphviz - idea.idea-community - inkscape inotify-tools iotop jekyll josm - kde5.okular - kde5.quasselClient - kicad linuxPackages.virtualbox linuxPackages.virtualboxGuestAdditions lm_sensors lshw lsof - lyx lz4 lzop - mcomix - meld - mercurial - mumble - mutt nfs-utils ntfs3g ntp - pandoc - paprefs pass - pavucontrol - pdfpc pgadmin - picard - pidgin postfix powerline-fonts powertop pwgen python27Packages.docker_compose - python27Packages.turses python27Packages.ansible2 python27Packages.glances - qpdfview - qucs - rustPlatform.rustc sakura samba slock - smplayer spaceFM sqlitebrowser sshfsFuse - stack - subversion taskwarrior - texLiveFull - thunderbird transmission_gtk transmission_remote_gtk udevil @@ -112,15 +125,9 @@ vbindiff vifm viking - vim - vlc - vorbis-tools vsftpd - whois - wireshark wmname yubikey-personalization-gui - zim ]; nixpkgs.config.packageOverrides = pkgs: { From 171ccd1559023bb5387471f5a645a3584b191432 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sun, 8 May 2016 18:34:01 +0200 Subject: [PATCH 17/56] =?UTF-8?q?d=C3=A9coupage=20des=20applications=20d?= =?UTF-8?q?=C3=A9j=C3=A0=20class=C3=A9es=20dans=20diff=C3=A9rents=20fichie?= =?UTF-8?q?rs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-bureautique.nix | 23 ++++++++++++ app-cao.nix | 14 ++++++++ app-client-internet.nix | 20 +++++++++++ app-dev.nix | 20 +++++++++++ app-multimedia.nix | 23 ++++++++++++ app-network.nix | 20 +++++++++++ desktop.nix | 77 ++++------------------------------------- 7 files changed, 126 insertions(+), 71 deletions(-) create mode 100644 app-bureautique.nix create mode 100644 app-cao.nix create mode 100644 app-client-internet.nix create mode 100644 app-dev.nix create mode 100644 app-multimedia.nix create mode 100644 app-network.nix diff --git a/app-bureautique.nix b/app-bureautique.nix new file mode 100644 index 0000000..4e76fe2 --- /dev/null +++ b/app-bureautique.nix @@ -0,0 +1,23 @@ +{ config, libs, pkgs, ... }: + +{ + imports = [ + ]; + + environment.systemPackages = with pkgs; [ + # Bureautique + aspell + dia + freemind + gnumeric + graphviz + kde5.okular + lyx + mcomix + pandoc + pdfpc + qpdfview + texLiveFull + zim + ]; +} diff --git a/app-cao.nix b/app-cao.nix new file mode 100644 index 0000000..385d7b4 --- /dev/null +++ b/app-cao.nix @@ -0,0 +1,14 @@ +{ config, libs, pkgs, ... }: + +{ + imports = [ + ]; + + environment.systemPackages = with pkgs; [ + # CAO + freecad + fritzing + kicad + qucs + ]; +} diff --git a/app-client-internet.nix b/app-client-internet.nix new file mode 100644 index 0000000..6c7ac55 --- /dev/null +++ b/app-client-internet.nix @@ -0,0 +1,20 @@ +{ config, libs, pkgs, ... }: + +{ + imports = [ + ]; + + environment.systemPackages = with pkgs; [ + # Clients Internet + chromium + clawsMail + firefox + kde5.quasselClient + mutt + mumble + pidgin + python27Packages.turses + thunderbird + ]; +} + diff --git a/app-dev.nix b/app-dev.nix new file mode 100644 index 0000000..1f589df --- /dev/null +++ b/app-dev.nix @@ -0,0 +1,20 @@ +{ config, libs, pkgs, ... }: + +{ + imports = [ + ]; + + environment.systemPackages = with pkgs; [ + # Développement + cargo + cloc + ghc + git-cola + idea.idea-community + mercurial + meld + rustPlatform.rustc + stack + subversion + ]; +} diff --git a/app-multimedia.nix b/app-multimedia.nix new file mode 100644 index 0000000..00d2879 --- /dev/null +++ b/app-multimedia.nix @@ -0,0 +1,23 @@ +{ config, libs, pkgs, ... }: + +{ + imports = [ + ]; + + environment.systemPackages = with pkgs; [ + # Multimedia + audacity + beep + cmus + easytag + kde4.digikam + gimp + inkscape + paprefs + pavucontrol + picard + smplayer + vlc + vorbis-tools + ]; +} diff --git a/app-network.nix b/app-network.nix new file mode 100644 index 0000000..524c0e5 --- /dev/null +++ b/app-network.nix @@ -0,0 +1,20 @@ +{ config, libs, pkgs, ... }: + +{ + imports = [ + ]; + + environment.systemPackages = with pkgs; [ + # network toolbox + arp-scan + iperf + iptraf-ng + nload + openvpn + quagga + telnet + tinc + whois + wireshark + ]; +} diff --git a/desktop.nix b/desktop.nix index fd4e684..14d1c92 100644 --- a/desktop.nix +++ b/desktop.nix @@ -2,80 +2,15 @@ { imports = [ + ./app-bureautique.nix + ./app-cao.nix + ./app-client-internet.nix + ./app-dev.nix + ./app-multimedia.nix + ./app-network.nix ]; environment.systemPackages = with pkgs; [ - # network toolbox - arp-scan - iperf - iptraf-ng - nload - openvpn - quagga - telnet - tinc - whois - wireshark - - # Multimedia - audacity - beep - cmus - easytag - kde4.digikam - gimp - inkscape - paprefs - pavucontrol - picard - smplayer - vlc - vorbis-tools - - # Clients Internet - chromium - clawsMail - firefox - kde5.quasselClient - mutt - mumble - pidgin - python27Packages.turses - thunderbird - - # Bureautique - aspell - dia - freemind - gnumeric - graphviz - kde5.okular - lyx - mcomix - pandoc - pdfpc - qpdfview - texLiveFull - zim - - # Développement - cargo - cloc - ghc - git-cola - idea.idea-community - mercurial - meld - rustPlatform.rustc - stack - subversion - - # CAO - freecad - fritzing - kicad - qucs - cowsay curlftpfs docker From 59a545f3abefc90526da4152a559efb6352fd625 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sun, 8 May 2016 18:57:48 +0200 Subject: [PATCH 18/56] =?UTF-8?q?d=C3=A9placement=20paquet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-client-internet.nix | 1 + app-network.nix | 1 + desktop.nix | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-client-internet.nix b/app-client-internet.nix index 6c7ac55..9e55697 100644 --- a/app-client-internet.nix +++ b/app-client-internet.nix @@ -8,6 +8,7 @@ # Clients Internet chromium clawsMail + filezilla firefox kde5.quasselClient mutt diff --git a/app-network.nix b/app-network.nix index 524c0e5..5c64122 100644 --- a/app-network.nix +++ b/app-network.nix @@ -14,6 +14,7 @@ quagga telnet tinc + vsftpd whois wireshark ]; diff --git a/desktop.nix b/desktop.nix index 14d1c92..9742c19 100644 --- a/desktop.nix +++ b/desktop.nix @@ -15,7 +15,6 @@ curlftpfs docker espeak - filezilla gnome3.seahorse gnuplot gparted @@ -60,7 +59,6 @@ vbindiff vifm viking - vsftpd wmname yubikey-personalization-gui ]; From bec1c4b84d5d042f800addcbd0d19f4dea2f68ed Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sun, 8 May 2016 18:58:12 +0200 Subject: [PATCH 19/56] =?UTF-8?q?ajout=20d'une=20liste=20adminsys=20+=20d?= =?UTF-8?q?=C3=A9placement=20de=20paquets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-adminsys.nix | 24 ++++++++++++++++++++++++ desktop.nix | 29 ++++++++--------------------- 2 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 app-adminsys.nix diff --git a/app-adminsys.nix b/app-adminsys.nix new file mode 100644 index 0000000..bf54f3b --- /dev/null +++ b/app-adminsys.nix @@ -0,0 +1,24 @@ +{ config, libs, pkgs, ... }: + +{ + imports = [ + ]; + + environment.systemPackages = with pkgs; [ + # Adminsys + gparted + iotop + lm_sensors + lshw + lsof + nfs-utils + ntfs3g + ntp + powerline-fonts + powertop + python27Packages.docker_compose + python27Packages.ansible2 + python27Packages.glances + usbutils + ]; +} diff --git a/desktop.nix b/desktop.nix index 9742c19..2ceee89 100644 --- a/desktop.nix +++ b/desktop.nix @@ -1,13 +1,14 @@ { config, libs, pkgs, ... }: { - imports = [ - ./app-bureautique.nix - ./app-cao.nix - ./app-client-internet.nix - ./app-dev.nix - ./app-multimedia.nix - ./app-network.nix + imports = [ # applications : + ./app-adminsys.nix # pour gérer le système dans son ensemble et les services + ./app-bureautique.nix # dédiée à la bureautique (traitement de texte, dessin, ...) + ./app-cao.nix # de conception assisté par ordinateur & modélisation + ./app-client-internet.nix # pour accéder & utiliser des ressources par le réseau + ./app-dev.nix # utilisée pour développer des programmes/scripts + ./app-multimedia.nix # pour gérer le son, l'image et la vidéo + ./app-network.nix # de gestion, de diagnostique & surveillance réseau ]; environment.systemPackages = with pkgs; [ @@ -17,31 +18,18 @@ espeak gnome3.seahorse gnuplot - gparted gpm inotify-tools - iotop jekyll josm linuxPackages.virtualbox linuxPackages.virtualboxGuestAdditions - lm_sensors - lshw - lsof lz4 lzop - nfs-utils - ntfs3g - ntp pass pgadmin postfix - powerline-fonts - powertop pwgen - python27Packages.docker_compose - python27Packages.ansible2 - python27Packages.glances sakura samba slock @@ -55,7 +43,6 @@ unbound unetbootin urbanterror - usbutils vbindiff vifm viking From af3faefeeef0aa00b344e34f1771d07b55f8c0ed Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sun, 8 May 2016 18:58:36 +0200 Subject: [PATCH 20/56] =?UTF-8?q?ajout=20editeur=20de=20texte=20graphique?= =?UTF-8?q?=20(pas=20vocation=20=C3=A0=20remplacer=20vim)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-bureautique.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/app-bureautique.nix b/app-bureautique.nix index 4e76fe2..c02e176 100644 --- a/app-bureautique.nix +++ b/app-bureautique.nix @@ -18,6 +18,7 @@ pdfpc qpdfview texLiveFull + textadept # un éditeur de texte facile pour copier-coller graphique zim ]; } From 1991c00fe8afbf2af5cb49b8d1bf09f66fe7444b Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sun, 8 May 2016 22:00:35 +0200 Subject: [PATCH 21/56] ajout de message d'erreur de slock --- desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop.nix b/desktop.nix index 2ceee89..cea3108 100644 --- a/desktop.nix +++ b/desktop.nix @@ -32,7 +32,7 @@ pwgen sakura samba - slock + slock # cannot disable the out-of-memory killer for this process (make sure to suid or sgid slock) --> en root spaceFM sqlitebrowser sshfsFuse From 63108b20779197021f0e15d5276516df24bf6670 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 10 May 2016 14:27:44 +0200 Subject: [PATCH 22/56] ajout de gource & gcc --- app-dev.nix | 3 +++ desktop.nix | 1 + 2 files changed, 4 insertions(+) diff --git a/app-dev.nix b/app-dev.nix index 1f589df..f6adbec 100644 --- a/app-dev.nix +++ b/app-dev.nix @@ -16,5 +16,8 @@ rustPlatform.rustc stack subversion + + # visualisation + gource ]; } diff --git a/desktop.nix b/desktop.nix index cea3108..07ff465 100644 --- a/desktop.nix +++ b/desktop.nix @@ -16,6 +16,7 @@ curlftpfs docker espeak + gcc # pour les appels depuis les scripts gnome3.seahorse gnuplot gpm From e40206c116907a90a2714e56330df2c5518a3d87 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 17 May 2016 14:06:34 +0200 Subject: [PATCH 23/56] manipulation du presse papier depuis la console --- desktop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop.nix b/desktop.nix index 07ff465..44d7d54 100644 --- a/desktop.nix +++ b/desktop.nix @@ -48,6 +48,7 @@ vifm viking wmname + xclip # manipulation du clipboard X depuis la console yubikey-personalization-gui ]; From e60fd00c4750fd7b96502b91e3ceb4e91469ffa1 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 17 May 2016 17:06:11 +0200 Subject: [PATCH 24/56] =?UTF-8?q?ajout=20de=20cat=C3=A9gories=20&=20commen?= =?UTF-8?q?taires=20dans=20les=20fichiers=20nix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-adminsys.nix | 10 +++++++--- app-bureautique.nix | 8 ++++++-- app-cao.nix | 4 ++-- app-client-internet.nix | 17 ++++++++++++----- app-dev.nix | 22 +++++++++++++++------- app-jeux.nix | 11 +++++++++++ app-multimedia.nix | 24 +++++++++++++++--------- app-network.nix | 18 ++++++++++++------ app-securite.nix | 15 +++++++++++++++ desktop.nix | 17 +++-------------- 10 files changed, 98 insertions(+), 48 deletions(-) create mode 100644 app-jeux.nix create mode 100644 app-securite.nix diff --git a/app-adminsys.nix b/app-adminsys.nix index bf54f3b..437f7c4 100644 --- a/app-adminsys.nix +++ b/app-adminsys.nix @@ -6,13 +6,10 @@ environment.systemPackages = with pkgs; [ # Adminsys - gparted iotop lm_sensors lshw lsof - nfs-utils - ntfs3g ntp powerline-fonts powertop @@ -20,5 +17,12 @@ python27Packages.ansible2 python27Packages.glances usbutils + + # Systeme de fichier + curlftpfs + gparted + nfs-utils + ntfs3g + sshfsFuse ]; } diff --git a/app-bureautique.nix b/app-bureautique.nix index c02e176..45eec07 100644 --- a/app-bureautique.nix +++ b/app-bureautique.nix @@ -10,15 +10,19 @@ dia freemind gnumeric - graphviz kde5.okular lyx mcomix - pandoc pdfpc qpdfview texLiveFull textadept # un éditeur de texte facile pour copier-coller graphique zim + + ## Convertisseurs (texte -> ) + gnuplot + graphviz + jekyll + pandoc ]; } diff --git a/app-cao.nix b/app-cao.nix index 385d7b4..d73ea5a 100644 --- a/app-cao.nix +++ b/app-cao.nix @@ -6,8 +6,8 @@ environment.systemPackages = with pkgs; [ # CAO - freecad - fritzing + freecad # modélisation de pièces en 3D + fritzing # schéma de câblages "jolis" kicad qucs ]; diff --git a/app-client-internet.nix b/app-client-internet.nix index 9e55697..3698f98 100644 --- a/app-client-internet.nix +++ b/app-client-internet.nix @@ -6,16 +6,23 @@ environment.systemPackages = with pkgs; [ # Clients Internet + + ## Navigateur & Réseaux sociaux chromium - clawsMail - filezilla firefox + python27Packages.turses # client twitter en ncurse + + ## Mail & Discussion (texte, audio) + clawsMail kde5.quasselClient - mutt mumble + mutt pidgin - python27Packages.turses thunderbird + + # Transfert de fichier + filezilla + transmission_gtk + transmission_remote_gtk ]; } - diff --git a/app-dev.nix b/app-dev.nix index f6adbec..d723ed5 100644 --- a/app-dev.nix +++ b/app-dev.nix @@ -6,18 +6,26 @@ environment.systemPackages = with pkgs; [ # Développement - cargo cloc - ghc - git-cola idea.idea-community + + ## Gestion des sources + # git # déjà présent dans "base" + git-cola mercurial - meld - rustPlatform.rustc - stack subversion - # visualisation + ## Haskell + ghc + stack + + ## Rust + cargo # récupération des dépendances + compilation projet rust + rustPlatform.rustc + + ## Visualisation & outils de diff gource + meld + vbindiff # diff de fichier hexadecimaux avec vim ]; } diff --git a/app-jeux.nix b/app-jeux.nix new file mode 100644 index 0000000..917da3b --- /dev/null +++ b/app-jeux.nix @@ -0,0 +1,11 @@ +{ config, libs, pkgs, ... }: + +{ + imports = [ + ]; + + environment.systemPackages = with pkgs; [ + # Jeux + urbanterror + ]; +} diff --git a/app-multimedia.nix b/app-multimedia.nix index 00d2879..4236fe3 100644 --- a/app-multimedia.nix +++ b/app-multimedia.nix @@ -6,18 +6,24 @@ environment.systemPackages = with pkgs; [ # Multimedia - audacity + picard + smplayer + + ## Audio + audacity # montage audio beep - cmus + cmus # lecteur audio console easytag - kde4.digikam + paprefs # préferences pulseaudio + pavucontrol # mixer pulseaudio + vorbis-tools + + ## Video + vlc + + ## Photo & Dessin vectoriel gimp + kde4.digikam inkscape - paprefs - pavucontrol - picard - smplayer - vlc - vorbis-tools ]; } diff --git a/app-network.nix b/app-network.nix index 5c64122..c430363 100644 --- a/app-network.nix +++ b/app-network.nix @@ -5,17 +5,23 @@ ]; environment.systemPackages = with pkgs; [ - # network toolbox - arp-scan + # Outils réseau iperf iptraf-ng nload - openvpn - quagga telnet - tinc vsftpd - whois + + ## Diagnostic + arp-scan wireshark + whois + + ## Routage + quagga + + ## Tunnel + openvpn + tinc ]; } diff --git a/app-securite.nix b/app-securite.nix new file mode 100644 index 0000000..c480829 --- /dev/null +++ b/app-securite.nix @@ -0,0 +1,15 @@ +{ config, libs, pkgs, ... }: + +{ + imports = [ + ]; + + environment.systemPackages = with pkgs; [ + # Securité + gnome3.seahorse + pass + pwgen + slock # cannot disable the out-of-memory killer for this process (make sure to suid or sgid slock) --> en root + yubikey-personalization-gui + ]; +} diff --git a/desktop.nix b/desktop.nix index 44d7d54..cae7cf4 100644 --- a/desktop.nix +++ b/desktop.nix @@ -8,48 +8,37 @@ ./app-client-internet.nix # pour accéder & utiliser des ressources par le réseau ./app-dev.nix # utilisée pour développer des programmes/scripts ./app-multimedia.nix # pour gérer le son, l'image et la vidéo - ./app-network.nix # de gestion, de diagnostique & surveillance réseau + ./app-network.nix # de gestion, de diagnostique & surveillance réseau + ./app-jeux.nix # permettant de jouer ;) + ./app-securite.nix # relatives à la sécurité (chiffrement, gpg, mots de passe, ...) ]; environment.systemPackages = with pkgs; [ cowsay - curlftpfs docker espeak gcc # pour les appels depuis les scripts - gnome3.seahorse - gnuplot gpm inotify-tools - jekyll josm linuxPackages.virtualbox linuxPackages.virtualboxGuestAdditions lz4 lzop - pass pgadmin postfix - pwgen sakura samba - slock # cannot disable the out-of-memory killer for this process (make sure to suid or sgid slock) --> en root spaceFM sqlitebrowser - sshfsFuse taskwarrior - transmission_gtk - transmission_remote_gtk udevil unbound unetbootin - urbanterror - vbindiff vifm viking wmname xclip # manipulation du clipboard X depuis la console - yubikey-personalization-gui ]; nixpkgs.config.packageOverrides = pkgs: { From 2479e9f72ba3d60d407c349c6fdbef32d88cf217 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 17 May 2016 17:55:53 +0200 Subject: [PATCH 25/56] ordre alphabetique --- desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop.nix b/desktop.nix index cae7cf4..a3d742d 100644 --- a/desktop.nix +++ b/desktop.nix @@ -7,9 +7,9 @@ ./app-cao.nix # de conception assisté par ordinateur & modélisation ./app-client-internet.nix # pour accéder & utiliser des ressources par le réseau ./app-dev.nix # utilisée pour développer des programmes/scripts + ./app-jeux.nix # permettant de jouer ;) ./app-multimedia.nix # pour gérer le son, l'image et la vidéo ./app-network.nix # de gestion, de diagnostique & surveillance réseau - ./app-jeux.nix # permettant de jouer ;) ./app-securite.nix # relatives à la sécurité (chiffrement, gpg, mots de passe, ...) ]; From 47b69d9e850e25682ee8db9b3d425918e475b128 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 17 May 2016 18:28:48 +0200 Subject: [PATCH 26/56] =?UTF-8?q?les=20jeux=20ne=20sont=20install=C3=A9s?= =?UTF-8?q?=20seulement=20si=20n=C3=A9cessaire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-jeux.nix => activation-manuelle/app-jeux.nix | 0 desktop.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename app-jeux.nix => activation-manuelle/app-jeux.nix (100%) diff --git a/app-jeux.nix b/activation-manuelle/app-jeux.nix similarity index 100% rename from app-jeux.nix rename to activation-manuelle/app-jeux.nix diff --git a/desktop.nix b/desktop.nix index a3d742d..45aa64e 100644 --- a/desktop.nix +++ b/desktop.nix @@ -2,12 +2,12 @@ { imports = [ # applications : + #./activation-manuelle/app-jeux.nix # permettant de jouer ;) ./app-adminsys.nix # pour gérer le système dans son ensemble et les services ./app-bureautique.nix # dédiée à la bureautique (traitement de texte, dessin, ...) ./app-cao.nix # de conception assisté par ordinateur & modélisation ./app-client-internet.nix # pour accéder & utiliser des ressources par le réseau ./app-dev.nix # utilisée pour développer des programmes/scripts - ./app-jeux.nix # permettant de jouer ;) ./app-multimedia.nix # pour gérer le son, l'image et la vidéo ./app-network.nix # de gestion, de diagnostique & surveillance réseau ./app-securite.nix # relatives à la sécurité (chiffrement, gpg, mots de passe, ...) From 3e5540a9e6689e00f857db67fe1d9d0b9830023b Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Thu, 19 May 2016 20:33:59 +0200 Subject: [PATCH 27/56] ajout du dictionnaire FR pour aspell --- app-bureautique.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-bureautique.nix b/app-bureautique.nix index 45eec07..51a73e5 100644 --- a/app-bureautique.nix +++ b/app-bureautique.nix @@ -6,7 +6,7 @@ environment.systemPackages = with pkgs; [ # Bureautique - aspell + aspell aspellDicts.fr dia freemind gnumeric From fff3b94beb376fcbf7b3ba0743e5db20c61f257b Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sat, 21 May 2016 13:11:19 +0200 Subject: [PATCH 28/56] ajout de commentaires --- app-adminsys.nix | 2 +- app-bureautique.nix | 32 +++++++++++++++++++------------- app-dev.nix | 2 +- app-multimedia.nix | 14 +++++++------- app-network.nix | 2 +- app-securite.nix | 10 +++++----- 6 files changed, 34 insertions(+), 28 deletions(-) diff --git a/app-adminsys.nix b/app-adminsys.nix index 437f7c4..343091e 100644 --- a/app-adminsys.nix +++ b/app-adminsys.nix @@ -13,8 +13,8 @@ ntp powerline-fonts powertop - python27Packages.docker_compose python27Packages.ansible2 + python27Packages.docker_compose python27Packages.glances usbutils diff --git a/app-bureautique.nix b/app-bureautique.nix index 51a73e5..7029de1 100644 --- a/app-bureautique.nix +++ b/app-bureautique.nix @@ -8,21 +8,27 @@ # Bureautique aspell aspellDicts.fr dia - freemind gnumeric - kde5.okular - lyx - mcomix - pdfpc - qpdfview - texLiveFull - textadept # un éditeur de texte facile pour copier-coller graphique - zim - + + ## Cartes mentales + freemind + + ## Editeur de texte + lyx # surcouche WISIWIM à LaTeX + textadept # un éditeur de texte facile pour copier-coller graphique + zim # outil de prise de notes, wiki de bureau + + ## Visionneuse + kde5.okular # pdf + mcomix # livres (cbr, liste d'images), gestion d'une bibliothèque + pdfpc # pdf + qpdfview # pdf + ## Convertisseurs (texte -> ) - gnuplot - graphviz - jekyll + gnuplot # générateur de graphes à partir de données numériques + graphviz # dot, neato : traçage de graphes (carré, rond) + jekyll # générateur statique de site web pandoc + texLiveFull # distribution LaTeX ]; } diff --git a/app-dev.nix b/app-dev.nix index d723ed5..654b079 100644 --- a/app-dev.nix +++ b/app-dev.nix @@ -10,7 +10,7 @@ idea.idea-community ## Gestion des sources - # git # déjà présent dans "base" + # git # déjà présent dans "base" git-cola mercurial subversion diff --git a/app-multimedia.nix b/app-multimedia.nix index 4236fe3..3a6bc72 100644 --- a/app-multimedia.nix +++ b/app-multimedia.nix @@ -7,23 +7,23 @@ environment.systemPackages = with pkgs; [ # Multimedia picard - smplayer ## Audio audacity # montage audio beep cmus # lecteur audio console - easytag + easytag # gestion des métadonnées des fichiers musicaux paprefs # préferences pulseaudio pavucontrol # mixer pulseaudio - vorbis-tools + vorbis-tools # codec ## Video - vlc + smplayer # lecteur vidéo + vlc # lecteur vidéo ## Photo & Dessin vectoriel - gimp - kde4.digikam - inkscape + gimp # logiciel d'édition/montage/retouche photo + kde4.digikam # gestionnaire de bibliothèque de photo + inkscape # édition d'image vectorielle (svg & autre) ]; } diff --git a/app-network.nix b/app-network.nix index c430363..fb49b6b 100644 --- a/app-network.nix +++ b/app-network.nix @@ -5,7 +5,7 @@ ]; environment.systemPackages = with pkgs; [ - # Outils réseau + # Outils réseau iperf iptraf-ng nload diff --git a/app-securite.nix b/app-securite.nix index c480829..4fe7ebd 100644 --- a/app-securite.nix +++ b/app-securite.nix @@ -6,10 +6,10 @@ environment.systemPackages = with pkgs; [ # Securité - gnome3.seahorse - pass - pwgen - slock # cannot disable the out-of-memory killer for this process (make sure to suid or sgid slock) --> en root - yubikey-personalization-gui + gnome3.seahorse # gestionnaire graphique de clef GPG + pass # gestionnaire de mots de passe + pwgen # générateur de mots de passe + slock # vérouiller l''écran. "cannot disable the out-of-memory killer for this process (make sure to suid or sgid slock)" --> en root + yubikey-personalization-gui # utilisation de la clef Yubikey ]; } From 00a4fb4e16e146cd03051a0a032d97b42707b382 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sun, 22 May 2016 15:59:04 +0200 Subject: [PATCH 29/56] =?UTF-8?q?docker=20est=20plac=C3=A9=20dans=20une=20?= =?UTF-8?q?expression=20manuelle=20avec=20activation=20du=20service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- activation-manuelle/app-docker.nix | 14 ++++++++++++++ app-adminsys.nix | 1 - desktop.nix | 1 - 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 activation-manuelle/app-docker.nix diff --git a/activation-manuelle/app-docker.nix b/activation-manuelle/app-docker.nix new file mode 100644 index 0000000..89ed4e6 --- /dev/null +++ b/activation-manuelle/app-docker.nix @@ -0,0 +1,14 @@ +{ config, libs, pkgs, ... }: + +{ + imports = [ + ]; + + environment.systemPackages = with pkgs; [ + # Ecosystème Docker + docker + python27Packages.docker_compose + ]; + + virtualisation.docker.enable = true; +} diff --git a/app-adminsys.nix b/app-adminsys.nix index 343091e..85f5c1d 100644 --- a/app-adminsys.nix +++ b/app-adminsys.nix @@ -14,7 +14,6 @@ powerline-fonts powertop python27Packages.ansible2 - python27Packages.docker_compose python27Packages.glances usbutils diff --git a/desktop.nix b/desktop.nix index 45aa64e..fbc06a3 100644 --- a/desktop.nix +++ b/desktop.nix @@ -15,7 +15,6 @@ environment.systemPackages = with pkgs; [ cowsay - docker espeak gcc # pour les appels depuis les scripts gpm From 024227a2f1b5670f46aa2e3f3926ef93de53d2e8 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sat, 28 May 2016 15:44:16 +0200 Subject: [PATCH 30/56] ajout paquet photo --- app-multimedia.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app-multimedia.nix b/app-multimedia.nix index 3a6bc72..90bd406 100644 --- a/app-multimedia.nix +++ b/app-multimedia.nix @@ -23,7 +23,11 @@ ## Photo & Dessin vectoriel gimp # logiciel d'édition/montage/retouche photo - kde4.digikam # gestionnaire de bibliothèque de photo inkscape # édition d'image vectorielle (svg & autre) + imagemagick # modification image en CLI + rawtherapee # développemen de photos en RAW + + ### TEST d'outil de gestion de catalogue de photos + kde4.digikam # gestionnaire de bibliothèque de photo ]; } From b5316cc8186ad4e118ce7692f5e2724e0c9f8107 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Wed, 1 Jun 2016 10:57:07 +0200 Subject: [PATCH 31/56] =?UTF-8?q?logiciel=20de=20capture=20d'=C3=A9cran?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-multimedia.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/app-multimedia.nix b/app-multimedia.nix index 90bd406..2e82a49 100644 --- a/app-multimedia.nix +++ b/app-multimedia.nix @@ -25,6 +25,7 @@ gimp # logiciel d'édition/montage/retouche photo inkscape # édition d'image vectorielle (svg & autre) imagemagick # modification image en CLI + kde4.ksnapshot rawtherapee # développemen de photos en RAW ### TEST d'outil de gestion de catalogue de photos From ae328bb742d23202d8ddc47f4aa5e3f37a252ebe Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Wed, 1 Jun 2016 11:00:08 +0200 Subject: [PATCH 32/56] activation de povray pour freecad + commentaires --- app-cao.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app-cao.nix b/app-cao.nix index d73ea5a..46ccfa0 100644 --- a/app-cao.nix +++ b/app-cao.nix @@ -8,7 +8,8 @@ # CAO freecad # modélisation de pièces en 3D fritzing # schéma de câblages "jolis" - kicad - qucs + kicad # ensemble d'outils de conception électronique + povray # Rendu tracé de rayon, utilisé dans freecad + qucs # simulateur de circuits électroniques ]; } From e8d0ccd4839a1d2e12bd83ba1a2cbd3a584aa695 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Fri, 3 Jun 2016 15:21:20 +0200 Subject: [PATCH 33/56] =?UTF-8?q?ajout=20d'une=20expression=20laptop=20ins?= =?UTF-8?q?pir=C3=A9e=20de=20la=20conf=20de=20latitude?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- activation-manuelle/laptop.nix | 22 ++++++++++++++++++++++ desktop.nix | 4 +++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 activation-manuelle/laptop.nix diff --git a/activation-manuelle/laptop.nix b/activation-manuelle/laptop.nix new file mode 100644 index 0000000..3c8cc3a --- /dev/null +++ b/activation-manuelle/laptop.nix @@ -0,0 +1,22 @@ +{ config, libs, pkgs, ... }: + +{ + # Paquets spécifiques pour un ordinateur portable + + networking = { + wireless.enable = true; # Enables wireless support via wpa_supplicant + networkmanager.enable = true; # Activation d'un gestionnaire de réseau + }; + + hardware.bluetooth.enable = true;. + + environment.systemPackages = with pkgs;[ + networkmanagerapplet + ]; + + services.xserver.synaptics = { + enable = true; + twoFingerScroll = true; + }; + +} diff --git a/desktop.nix b/desktop.nix index fbc06a3..7958b7c 100644 --- a/desktop.nix +++ b/desktop.nix @@ -2,7 +2,9 @@ { imports = [ # applications : - #./activation-manuelle/app-jeux.nix # permettant de jouer ;) + #./activation-manuelle/app-docker.nix # pour activer docker + #./activation-manuelle/app-jeux.nix # permettant de jouer ;) + #./activation-manuelle/laptop.nix # appli & configuration adaptée pour un PC portable ./app-adminsys.nix # pour gérer le système dans son ensemble et les services ./app-bureautique.nix # dédiée à la bureautique (traitement de texte, dessin, ...) ./app-cao.nix # de conception assisté par ordinateur & modélisation From 10f7efd252446b87d9c76d7a6339328826993495 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 9 Jun 2016 15:35:18 +0200 Subject: [PATCH 34/56] fix typo --- activation-manuelle/laptop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activation-manuelle/laptop.nix b/activation-manuelle/laptop.nix index 3c8cc3a..9761c8f 100644 --- a/activation-manuelle/laptop.nix +++ b/activation-manuelle/laptop.nix @@ -8,7 +8,7 @@ networkmanager.enable = true; # Activation d'un gestionnaire de réseau }; - hardware.bluetooth.enable = true;. + hardware.bluetooth.enable = true; environment.systemPackages = with pkgs;[ networkmanagerapplet From 4a68e71a1d33a828deb59cdf4718406fc1ad6c96 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 9 Jun 2016 15:58:40 +0200 Subject: [PATCH 35/56] =?UTF-8?q?ajustement=20pour=20que=20=C3=A7a=20compi?= =?UTF-8?q?le?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- activation-manuelle/laptop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activation-manuelle/laptop.nix b/activation-manuelle/laptop.nix index 9761c8f..7988253 100644 --- a/activation-manuelle/laptop.nix +++ b/activation-manuelle/laptop.nix @@ -4,7 +4,7 @@ # Paquets spécifiques pour un ordinateur portable networking = { - wireless.enable = true; # Enables wireless support via wpa_supplicant + #wireless.enable = true; # Enables wireless support via wpa_supplicant networkmanager.enable = true; # Activation d'un gestionnaire de réseau }; From dee3648f70e694e7ffd77475ea13d5dc71eaedf8 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 9 Jun 2016 16:32:08 +0200 Subject: [PATCH 36/56] =?UTF-8?q?allowUnfree=20d=C3=A9plac=C3=A9=20dans=20?= =?UTF-8?q?base?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/desktop.nix b/desktop.nix index 7958b7c..a2970ba 100644 --- a/desktop.nix +++ b/desktop.nix @@ -87,5 +87,4 @@ support32Bit = true; }; environment.etc."pulse/daemon.conf".text = "flat-volumes = no"; - nixpkgs.config.allowUnfree = true; } From 0ad1b1038c3f0332fb2b2d863fca18edbdd3efa2 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 9 Jun 2016 17:12:09 +0200 Subject: [PATCH 37/56] virtualbox en activation manuelle --- activation-manuelle/app-virtualbox.nix | 14 ++++++++++++++ desktop.nix | 2 -- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 activation-manuelle/app-virtualbox.nix diff --git a/activation-manuelle/app-virtualbox.nix b/activation-manuelle/app-virtualbox.nix new file mode 100644 index 0000000..96053b0 --- /dev/null +++ b/activation-manuelle/app-virtualbox.nix @@ -0,0 +1,14 @@ +{ config, libs, pkgs, ... }: + +{ + imports = [ + ]; + + environment.systemPackages = with pkgs; [ + linuxPackages.virtualbox + linuxPackages.virtualboxGuestAdditions + ]; + + virtualisation.virtualbox.host.enable = true; + +} diff --git a/desktop.nix b/desktop.nix index a2970ba..22fa1ae 100644 --- a/desktop.nix +++ b/desktop.nix @@ -22,8 +22,6 @@ gpm inotify-tools josm - linuxPackages.virtualbox - linuxPackages.virtualboxGuestAdditions lz4 lzop pgadmin From a27a1c5aed807601126921238eea2772549b1728 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Mon, 13 Jun 2016 00:43:55 +0200 Subject: [PATCH 38/56] =?UTF-8?q?ajout=20th=C3=A8me=20d'icone=20pour=20spa?= =?UTF-8?q?ceFM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/desktop.nix b/desktop.nix index 22fa1ae..1e358b3 100644 --- a/desktop.nix +++ b/desktop.nix @@ -19,7 +19,8 @@ cowsay espeak gcc # pour les appels depuis les scripts - gpm + gpm # prise en charge de la souris en console + gnome.gnome_icon_theme # thème d'icone - semble fonctionner avec spaceFM inotify-tools josm lz4 @@ -28,7 +29,7 @@ postfix sakura samba - spaceFM + spaceFM # gestionnaire de fichiers sqlitebrowser taskwarrior udevil From d5ef35906b2c688166fd3734393f82a36edd3c4c Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Mon, 13 Jun 2016 00:56:44 +0200 Subject: [PATCH 39/56] =?UTF-8?q?la=20prise=20en=20charge=20de=20la=20sour?= =?UTF-8?q?is=20en=20console=20est=20migr=C3=A9e=20de=20desktop=20=C3=A0?= =?UTF-8?q?=20base?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/desktop.nix b/desktop.nix index 1e358b3..df4e28d 100644 --- a/desktop.nix +++ b/desktop.nix @@ -19,7 +19,6 @@ cowsay espeak gcc # pour les appels depuis les scripts - gpm # prise en charge de la souris en console gnome.gnome_icon_theme # thème d'icone - semble fonctionner avec spaceFM inotify-tools josm From 5e470017d61eb376abd86e4101263a38dc9be4ad Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Mon, 13 Jun 2016 01:38:10 +0200 Subject: [PATCH 40/56] =?UTF-8?q?suite=20du=20classement=20dans=20cat?= =?UTF-8?q?=C3=A9gories?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-adminsys.nix | 12 +++++++++++- app-dev.nix | 3 +++ desktop.nix | 13 ++++--------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/app-adminsys.nix b/app-adminsys.nix index 85f5c1d..97b99a9 100644 --- a/app-adminsys.nix +++ b/app-adminsys.nix @@ -17,11 +17,21 @@ python27Packages.glances usbutils + # DNS + unbound + + # Compression + lz4 + + # Mail + postfix + # Systeme de fichier curlftpfs gparted + inotify-tools nfs-utils ntfs3g - sshfsFuse + sshfsFuse ]; } diff --git a/app-dev.nix b/app-dev.nix index 654b079..058a3d3 100644 --- a/app-dev.nix +++ b/app-dev.nix @@ -5,6 +5,9 @@ ]; environment.systemPackages = with pkgs; [ + # Base de données + pgadmin + # Développement cloc idea.idea-community diff --git a/desktop.nix b/desktop.nix index df4e28d..356fa32 100644 --- a/desktop.nix +++ b/desktop.nix @@ -20,24 +20,19 @@ espeak gcc # pour les appels depuis les scripts gnome.gnome_icon_theme # thème d'icone - semble fonctionner avec spaceFM - inotify-tools josm - lz4 lzop - pgadmin - postfix - sakura + sakura # terminal samba spaceFM # gestionnaire de fichiers sqlitebrowser - taskwarrior + taskwarrior # gestionnaire de tâches en console udevil - unbound unetbootin vifm - viking + viking # analyse de topo, gestion de données GPS wmname - xclip # manipulation du clipboard X depuis la console + xclip # manipulation du clipboard X depuis la console ]; nixpkgs.config.packageOverrides = pkgs: { From b816211833e6395ac2337f33e997a53ab5a77fb5 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sat, 25 Jun 2016 14:26:18 +0200 Subject: [PATCH 41/56] ajout des ports pour iperf --- app-network.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app-network.nix b/app-network.nix index fb49b6b..6c98a49 100644 --- a/app-network.nix +++ b/app-network.nix @@ -24,4 +24,7 @@ openvpn tinc ]; + + networking.firewall.allowedTCPPorts = [5201]; # iperf + networking.firewall.allowedUDPPorts = [5201]; # iperf } From 28f91e53278b871091dc73c5b6a445b7a27bc797 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sat, 9 Jul 2016 18:40:12 +0200 Subject: [PATCH 42/56] =?UTF-8?q?d=C3=A9placement=20des=20app=20g=C3=A9ogr?= =?UTF-8?q?aphiques=20dans=20un=20fichier=20=C3=A0=20part?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-adminsys.nix | 6 +++++- app-cao.nix | 5 ++++- app-geo.nix | 12 ++++++++++++ app-multimedia.nix | 1 + desktop.nix | 11 ++++------- 5 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 app-geo.nix diff --git a/app-adminsys.nix b/app-adminsys.nix index 97b99a9..81ea625 100644 --- a/app-adminsys.nix +++ b/app-adminsys.nix @@ -22,6 +22,7 @@ # Compression lz4 + lzop # Mail postfix @@ -32,6 +33,9 @@ inotify-tools nfs-utils ntfs3g - sshfsFuse + sshfsFuse + + # + unetbootin # création de clefs USB bootables ]; } diff --git a/app-cao.nix b/app-cao.nix index 46ccfa0..8519a89 100644 --- a/app-cao.nix +++ b/app-cao.nix @@ -6,10 +6,13 @@ environment.systemPackages = with pkgs; [ # CAO + ## Modélisation 3D freecad # modélisation de pièces en 3D + povray # Rendu tracé de rayon, utilisé dans freecad + + ## Électricité & Électronique fritzing # schéma de câblages "jolis" kicad # ensemble d'outils de conception électronique - povray # Rendu tracé de rayon, utilisé dans freecad qucs # simulateur de circuits électroniques ]; } diff --git a/app-geo.nix b/app-geo.nix new file mode 100644 index 0000000..89d600d --- /dev/null +++ b/app-geo.nix @@ -0,0 +1,12 @@ +{ config, libs, pkgs, ... }: + +{ + imports = [ + ]; + + environment.systemPackages = with pkgs; [ + # Gestion de données géographiques + josm # outil de contribution à OpenStreetMap + viking # analyse de topo, gestion de données GPS + ]; +} diff --git a/app-multimedia.nix b/app-multimedia.nix index 2e82a49..a7a02d8 100644 --- a/app-multimedia.nix +++ b/app-multimedia.nix @@ -13,6 +13,7 @@ beep cmus # lecteur audio console easytag # gestion des métadonnées des fichiers musicaux + espeak # synthèse vocale paprefs # préferences pulseaudio pavucontrol # mixer pulseaudio vorbis-tools # codec diff --git a/desktop.nix b/desktop.nix index 356fa32..15fe026 100644 --- a/desktop.nix +++ b/desktop.nix @@ -4,12 +4,14 @@ imports = [ # applications : #./activation-manuelle/app-docker.nix # pour activer docker #./activation-manuelle/app-jeux.nix # permettant de jouer ;) - #./activation-manuelle/laptop.nix # appli & configuration adaptée pour un PC portable + #./activation-manuelle/app-virtualbox.nix # pour exploiter virtualbox + #./activation-manuelle/laptop.nix # appli & configuration adaptée pour un PC portable ./app-adminsys.nix # pour gérer le système dans son ensemble et les services ./app-bureautique.nix # dédiée à la bureautique (traitement de texte, dessin, ...) ./app-cao.nix # de conception assisté par ordinateur & modélisation ./app-client-internet.nix # pour accéder & utiliser des ressources par le réseau ./app-dev.nix # utilisée pour développer des programmes/scripts + ./app-geo.nix # utilisée pour manipuler les données géographiques ./app-multimedia.nix # pour gérer le son, l'image et la vidéo ./app-network.nix # de gestion, de diagnostique & surveillance réseau ./app-securite.nix # relatives à la sécurité (chiffrement, gpg, mots de passe, ...) @@ -17,20 +19,15 @@ environment.systemPackages = with pkgs; [ cowsay - espeak - gcc # pour les appels depuis les scripts + gcc # pour les appels depuis les scripts gnome.gnome_icon_theme # thème d'icone - semble fonctionner avec spaceFM - josm - lzop sakura # terminal samba spaceFM # gestionnaire de fichiers sqlitebrowser taskwarrior # gestionnaire de tâches en console udevil - unetbootin vifm - viking # analyse de topo, gestion de données GPS wmname xclip # manipulation du clipboard X depuis la console ]; From 11a50ead02ba509ef30456a3a9b357652fcf8d92 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sat, 9 Jul 2016 18:40:40 +0200 Subject: [PATCH 43/56] =?UTF-8?q?r=C3=A9duction=20taille=20LaTeX:=20Full?= =?UTF-8?q?=20->=20base=20+=20beamer=20+=20cv?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-bureautique.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app-bureautique.nix b/app-bureautique.nix index 7029de1..46041d6 100644 --- a/app-bureautique.nix +++ b/app-bureautique.nix @@ -29,6 +29,9 @@ graphviz # dot, neato : traçage de graphes (carré, rond) jekyll # générateur statique de site web pandoc - texLiveFull # distribution LaTeX + #texLiveFull # distribution LaTeX + texLive # distribution LaTeX de base + texLiveBeamer # paquets et extensions pour Beamer + texLiveModerncv # paquets pour la classe Modern CV ]; } From df8df234c1a7fd08bc6d0a933287b8487d9c75e1 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sat, 9 Jul 2016 21:32:41 +0200 Subject: [PATCH 44/56] =?UTF-8?q?utilisation=20des=20flags=20de=20configur?= =?UTF-8?q?ation=20des=20fop,tionalit=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- activation-manuelle/app-docker.nix | 14 ++++++++------ activation-manuelle/app-jeux.nix | 10 ++++++---- activation-manuelle/app-virtualbox.nix | 14 ++++++++------ activation-manuelle/laptop.nix | 26 ++++++++++++++------------ 4 files changed, 36 insertions(+), 28 deletions(-) diff --git a/activation-manuelle/app-docker.nix b/activation-manuelle/app-docker.nix index 89ed4e6..5ac653f 100644 --- a/activation-manuelle/app-docker.nix +++ b/activation-manuelle/app-docker.nix @@ -4,11 +4,13 @@ imports = [ ]; - environment.systemPackages = with pkgs; [ - # Ecosystème Docker - docker - python27Packages.docker_compose - ]; + config = mkIf config.r6d.config-generator.docker { + environment.systemPackages = with pkgs; [ + # Ecosystème Docker + docker + python27Packages.docker_compose + ]; - virtualisation.docker.enable = true; + virtualisation.docker.enable = true; + } } diff --git a/activation-manuelle/app-jeux.nix b/activation-manuelle/app-jeux.nix index 917da3b..4b07e11 100644 --- a/activation-manuelle/app-jeux.nix +++ b/activation-manuelle/app-jeux.nix @@ -4,8 +4,10 @@ imports = [ ]; - environment.systemPackages = with pkgs; [ - # Jeux - urbanterror - ]; + config = mkIf config.r6d.config-generator.jeux { + environment.systemPackages = with pkgs; [ + # Jeux + urbanterror + ]; + } } diff --git a/activation-manuelle/app-virtualbox.nix b/activation-manuelle/app-virtualbox.nix index 96053b0..9f55f56 100644 --- a/activation-manuelle/app-virtualbox.nix +++ b/activation-manuelle/app-virtualbox.nix @@ -4,11 +4,13 @@ imports = [ ]; - environment.systemPackages = with pkgs; [ - linuxPackages.virtualbox - linuxPackages.virtualboxGuestAdditions - ]; - - virtualisation.virtualbox.host.enable = true; + config = mkIf config.r6d.config-generator.virtualbox { + environment.systemPackages = with pkgs; [ + linuxPackages.virtualbox + linuxPackages.virtualboxGuestAdditions + ]; + virtualisation.virtualbox.host.enable = true; + } } + diff --git a/activation-manuelle/laptop.nix b/activation-manuelle/laptop.nix index 7988253..5c153d4 100644 --- a/activation-manuelle/laptop.nix +++ b/activation-manuelle/laptop.nix @@ -3,20 +3,22 @@ { # Paquets spécifiques pour un ordinateur portable - networking = { - #wireless.enable = true; # Enables wireless support via wpa_supplicant - networkmanager.enable = true; # Activation d'un gestionnaire de réseau - }; + config = mkIf config.r6d.config-generator.laptop { - hardware.bluetooth.enable = true; + networking = { + #wireless.enable = true; # Enables wireless support via wpa_supplicant + networkmanager.enable = true; # Activation d'un gestionnaire de réseau + }; - environment.systemPackages = with pkgs;[ - networkmanagerapplet - ]; + hardware.bluetooth.enable = true; - services.xserver.synaptics = { - enable = true; - twoFingerScroll = true; - }; + environment.systemPackages = with pkgs;[ + networkmanagerapplet + ]; + services.xserver.synaptics = { + enable = true; + twoFingerScroll = true; + }; + } } From 62b153735359c92ad8b2515248c2b0e775ed5880 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sun, 10 Jul 2016 17:00:15 +0200 Subject: [PATCH 45/56] fix: erreur de syntaxe sur les fichiers manuels --- activation-manuelle/app-docker.nix | 14 ++++++-------- activation-manuelle/app-jeux.nix | 10 ++++------ activation-manuelle/app-virtualbox.nix | 12 +++++------- activation-manuelle/laptop.nix | 26 ++++++++++---------------- 4 files changed, 25 insertions(+), 37 deletions(-) diff --git a/activation-manuelle/app-docker.nix b/activation-manuelle/app-docker.nix index 5ac653f..fc2116f 100644 --- a/activation-manuelle/app-docker.nix +++ b/activation-manuelle/app-docker.nix @@ -4,13 +4,11 @@ imports = [ ]; - config = mkIf config.r6d.config-generator.docker { - environment.systemPackages = with pkgs; [ - # Ecosystème Docker - docker - python27Packages.docker_compose - ]; + environment.systemPackages = with pkgs; pkgs.lib.mkIf config.r6d.config-generator.docker [ + # Ecosystème Docker + docker + python27Packages.docker_compose + ]; - virtualisation.docker.enable = true; - } + virtualisation.docker.enable = config.r6d.config-generator.docker; } diff --git a/activation-manuelle/app-jeux.nix b/activation-manuelle/app-jeux.nix index 4b07e11..a8b75ad 100644 --- a/activation-manuelle/app-jeux.nix +++ b/activation-manuelle/app-jeux.nix @@ -4,10 +4,8 @@ imports = [ ]; - config = mkIf config.r6d.config-generator.jeux { - environment.systemPackages = with pkgs; [ - # Jeux - urbanterror - ]; - } + environment.systemPackages = with pkgs; pkgs.lib.mkIf config.r6d.config-generator.jeux [ + # Jeux + urbanterror + ]; } diff --git a/activation-manuelle/app-virtualbox.nix b/activation-manuelle/app-virtualbox.nix index 9f55f56..eae85b8 100644 --- a/activation-manuelle/app-virtualbox.nix +++ b/activation-manuelle/app-virtualbox.nix @@ -4,13 +4,11 @@ imports = [ ]; - config = mkIf config.r6d.config-generator.virtualbox { - environment.systemPackages = with pkgs; [ - linuxPackages.virtualbox - linuxPackages.virtualboxGuestAdditions - ]; + environment.systemPackages = with pkgs; pkgs.lib.mkIf config.r6d.config-generator.virtualbox [ + linuxPackages.virtualbox + linuxPackages.virtualboxGuestAdditions + ]; - virtualisation.virtualbox.host.enable = true; - } + virtualisation.virtualbox.host.enable = config.r6d.config-generator.virtualbox; } diff --git a/activation-manuelle/laptop.nix b/activation-manuelle/laptop.nix index 5c153d4..3bb26f6 100644 --- a/activation-manuelle/laptop.nix +++ b/activation-manuelle/laptop.nix @@ -1,24 +1,18 @@ -{ config, libs, pkgs, ... }: +{ config, pkgs, ... }: { # Paquets spécifiques pour un ordinateur portable - config = mkIf config.r6d.config-generator.laptop { + networking.networkmanager.enable = config.r6d.config-generator.laptop; # Activation d'un gestionnaire de réseau - networking = { - #wireless.enable = true; # Enables wireless support via wpa_supplicant - networkmanager.enable = true; # Activation d'un gestionnaire de réseau - }; + hardware.bluetooth.enable = config.r6d.config-generator.laptop; - hardware.bluetooth.enable = true; + environment.systemPackages = with pkgs; pkgs.lib.mkIf config.r6d.config-generator.laptop [ + networkmanagerapplet + ]; - environment.systemPackages = with pkgs;[ - networkmanagerapplet - ]; - - services.xserver.synaptics = { - enable = true; - twoFingerScroll = true; - }; - } + services.xserver.synaptics = pkgs.lib.mkIf config.r6d.config-generator.laptop { + enable = true; + twoFingerScroll = true; + }; } From 0bfca5b71d16d8dc5fec04531b216569301aa32a Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sun, 10 Jul 2016 17:00:41 +0200 Subject: [PATCH 46/56] ajout des activations manuelles dans desktop. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * l'activarion ou non est controlée depuis base. Mais l'inclusion est * systématique --- desktop.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/desktop.nix b/desktop.nix index 15fe026..1eb6c85 100644 --- a/desktop.nix +++ b/desktop.nix @@ -2,10 +2,12 @@ { imports = [ # applications : - #./activation-manuelle/app-docker.nix # pour activer docker - #./activation-manuelle/app-jeux.nix # permettant de jouer ;) - #./activation-manuelle/app-virtualbox.nix # pour exploiter virtualbox - #./activation-manuelle/laptop.nix # appli & configuration adaptée pour un PC portable + # commandées par config-generator + ./activation-manuelle/app-docker.nix # pour activer docker + ./activation-manuelle/app-jeux.nix # permettant de jouer ;) + ./activation-manuelle/app-virtualbox.nix # pour exploiter virtualbox + ./activation-manuelle/laptop.nix # appli & configuration adaptée pour un PC portable$ + # installées systématiquement ./app-adminsys.nix # pour gérer le système dans son ensemble et les services ./app-bureautique.nix # dédiée à la bureautique (traitement de texte, dessin, ...) ./app-cao.nix # de conception assisté par ordinateur & modélisation From 49dfc7eeb0e9b461ab67aceb323f93afb7f417a5 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sun, 10 Jul 2016 22:06:26 +0200 Subject: [PATCH 47/56] uniformisation des en-tetes --- activation-manuelle/app-docker.nix | 12 +++++++----- activation-manuelle/app-jeux.nix | 10 ++++++---- activation-manuelle/app-virtualbox.nix | 12 +++++++----- activation-manuelle/laptop.nix | 16 +++++++++------- 4 files changed, 29 insertions(+), 21 deletions(-) diff --git a/activation-manuelle/app-docker.nix b/activation-manuelle/app-docker.nix index fc2116f..a1c4aaf 100644 --- a/activation-manuelle/app-docker.nix +++ b/activation-manuelle/app-docker.nix @@ -1,14 +1,16 @@ -{ config, libs, pkgs, ... }: - -{ +{ config, lib, pkgs, ... }: +let + inherit (lib) mkIf; + cfg = config.r6d.config-generator; +in { imports = [ ]; - environment.systemPackages = with pkgs; pkgs.lib.mkIf config.r6d.config-generator.docker [ + environment.systemPackages = with pkgs; mkIf cfg.docker [ # Ecosystème Docker docker python27Packages.docker_compose ]; - virtualisation.docker.enable = config.r6d.config-generator.docker; + virtualisation.docker.enable = cfg.docker; } diff --git a/activation-manuelle/app-jeux.nix b/activation-manuelle/app-jeux.nix index a8b75ad..edcfdb9 100644 --- a/activation-manuelle/app-jeux.nix +++ b/activation-manuelle/app-jeux.nix @@ -1,10 +1,12 @@ -{ config, libs, pkgs, ... }: - -{ +{ config, lib, pkgs, ... }: +let + inherit (lib) mkIf; + cfg = config.r6d.config-generator; +in { imports = [ ]; - environment.systemPackages = with pkgs; pkgs.lib.mkIf config.r6d.config-generator.jeux [ + environment.systemPackages = with pkgs; mkIf cfg.jeux [ # Jeux urbanterror ]; diff --git a/activation-manuelle/app-virtualbox.nix b/activation-manuelle/app-virtualbox.nix index eae85b8..8d9bfe5 100644 --- a/activation-manuelle/app-virtualbox.nix +++ b/activation-manuelle/app-virtualbox.nix @@ -1,14 +1,16 @@ -{ config, libs, pkgs, ... }: - -{ +{ config, lib, pkgs, ... }: +let + inherit (lib) mkIf; + cfg = config.r6d.config-generator; +in { imports = [ ]; - environment.systemPackages = with pkgs; pkgs.lib.mkIf config.r6d.config-generator.virtualbox [ + environment.systemPackages = with pkgs; mkIf cfg.virtualbox [ linuxPackages.virtualbox linuxPackages.virtualboxGuestAdditions ]; - virtualisation.virtualbox.host.enable = config.r6d.config-generator.virtualbox; + virtualisation.virtualbox.host.enable = cfg.virtualbox; } diff --git a/activation-manuelle/laptop.nix b/activation-manuelle/laptop.nix index 3bb26f6..332d6f5 100644 --- a/activation-manuelle/laptop.nix +++ b/activation-manuelle/laptop.nix @@ -1,17 +1,19 @@ -{ config, pkgs, ... }: - -{ +{ config, lib, pkgs, ... }: +let + inherit (lib) mkIf; + cfg = config.r6d.config-generator; +in { # Paquets spécifiques pour un ordinateur portable - networking.networkmanager.enable = config.r6d.config-generator.laptop; # Activation d'un gestionnaire de réseau + networking.networkmanager.enable = cfg.laptop; # Activation d'un gestionnaire de réseau - hardware.bluetooth.enable = config.r6d.config-generator.laptop; + hardware.bluetooth.enable = cfg.laptop; - environment.systemPackages = with pkgs; pkgs.lib.mkIf config.r6d.config-generator.laptop [ + environment.systemPackages = with pkgs; mkIf cfg.laptop [ networkmanagerapplet ]; - services.xserver.synaptics = pkgs.lib.mkIf config.r6d.config-generator.laptop { + services.xserver.synaptics = mkIf cfg.laptop { enable = true; twoFingerScroll = true; }; From 3180832a1f521fa5cdc46dc87c502fb8499cea8b Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Mon, 11 Jul 2016 14:26:06 +0200 Subject: [PATCH 48/56] =?UTF-8?q?ajout=20de=20paquets=20utilis=C3=A9s=20su?= =?UTF-8?q?r=20radx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-adminsys.nix | 2 +- app-bureautique.nix | 1 + app-dev.nix | 2 ++ app-multimedia.nix | 4 +++- desktop.nix | 24 +++++++++++++++++------- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/app-adminsys.nix b/app-adminsys.nix index 81ea625..359384d 100644 --- a/app-adminsys.nix +++ b/app-adminsys.nix @@ -27,7 +27,7 @@ # Mail postfix - # Systeme de fichier + # Système de fichier curlftpfs gparted inotify-tools diff --git a/app-bureautique.nix b/app-bureautique.nix index 46041d6..50caa8a 100644 --- a/app-bureautique.nix +++ b/app-bureautique.nix @@ -23,6 +23,7 @@ mcomix # livres (cbr, liste d'images), gestion d'une bibliothèque pdfpc # pdf qpdfview # pdf + gqview # visionneuse image & gestion basique de collection ## Convertisseurs (texte -> ) gnuplot # générateur de graphes à partir de données numériques diff --git a/app-dev.nix b/app-dev.nix index 058a3d3..328ada3 100644 --- a/app-dev.nix +++ b/app-dev.nix @@ -7,10 +7,12 @@ environment.systemPackages = with pkgs; [ # Base de données pgadmin + sqlitebrowser # Développement cloc idea.idea-community + gcc # pour les appels depuis les scripts ## Gestion des sources # git # déjà présent dans "base" diff --git a/app-multimedia.nix b/app-multimedia.nix index a7a02d8..7090b75 100644 --- a/app-multimedia.nix +++ b/app-multimedia.nix @@ -6,7 +6,7 @@ environment.systemPackages = with pkgs; [ # Multimedia - picard + picard # gestion des métadonnées des fichiers musicaux ## Audio audacity # montage audio @@ -23,6 +23,8 @@ vlc # lecteur vidéo ## Photo & Dessin vectoriel + exif + exiftags gimp # logiciel d'édition/montage/retouche photo inkscape # édition d'image vectorielle (svg & autre) imagemagick # modification image en CLI diff --git a/desktop.nix b/desktop.nix index 1eb6c85..0f0b7ab 100644 --- a/desktop.nix +++ b/desktop.nix @@ -20,17 +20,27 @@ ]; environment.systemPackages = with pkgs; [ - cowsay - gcc # pour les appels depuis les scripts + # Environement de bureau + wmname # pour définir le nom du gestionnaire de fenêtre (utile pour java) + kde4.ksnapshot# capture d'écran + + ## Gestionnaire de fenêtre & Thème gnome.gnome_icon_theme # thème d'icone - semble fonctionner avec spaceFM + + ## Manipulation de fichier + pcmanfm # gestionnaire de fichiers graphique + spaceFM # gestionnaire de fichiers graphique + vifm # gestionnaire de fichiers basé sur VIM (console) + + ## Terminal sakura # terminal + + # A trier + cowsay + fgallery # générateur de gallerie statique http://www.thregr.org/~wavexx/software/fgallery/ samba - spaceFM # gestionnaire de fichiers - sqlitebrowser taskwarrior # gestionnaire de tâches en console - udevil - vifm - wmname + udevil # pour le montage des media amovibles xclip # manipulation du clipboard X depuis la console ]; From a5f3e7f87d786872fb9d5dc3de8511599761e300 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Wed, 13 Jul 2016 16:58:31 +0200 Subject: [PATCH 49/56] ajout de zeal (explorateur de doc offline) --- app-dev.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app-dev.nix b/app-dev.nix index 328ada3..4c4a2d0 100644 --- a/app-dev.nix +++ b/app-dev.nix @@ -14,6 +14,9 @@ idea.idea-community gcc # pour les appels depuis les scripts + # Documentation + zeal + ## Gestion des sources # git # déjà présent dans "base" git-cola From 50083e7d93aaf1ef3f82939de4f14003838afef9 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Wed, 13 Jul 2016 23:21:59 +0200 Subject: [PATCH 50/56] xkill --- desktop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop.nix b/desktop.nix index 0f0b7ab..0815bbb 100644 --- a/desktop.nix +++ b/desktop.nix @@ -23,6 +23,7 @@ # Environement de bureau wmname # pour définir le nom du gestionnaire de fenêtre (utile pour java) kde4.ksnapshot# capture d'écran + xorg.xkill # pour 'tuer une application' ## Gestionnaire de fenêtre & Thème gnome.gnome_icon_theme # thème d'icone - semble fonctionner avec spaceFM From bd70296e6841a48197f567084727f5ff4402317d Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sat, 16 Jul 2016 13:36:36 +0200 Subject: [PATCH 51/56] variable d'environement contenant le chemin vers awesome --- desktop.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/desktop.nix b/desktop.nix index 0815bbb..f7bbf96 100644 --- a/desktop.nix +++ b/desktop.nix @@ -50,6 +50,9 @@ mumble = pkgs.mumble.override { pulseSupport = true; }; }; + # Export the current path for the awesome derivation, useful for users rc.lua + environment.variables.AWESOME_CONFIG_DIR = "${pkgs.awesome}"; + # Enable the X11 windowing system. services.xserver = { enable = true; From ba9cdb75186342e0b2c43b524f7ba769ec154f0a Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sat, 16 Jul 2016 13:40:13 +0200 Subject: [PATCH 52/56] exemple d'utilisation de la variable d'environement pour awesome --- desktop.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/desktop.nix b/desktop.nix index f7bbf96..8a1a7e3 100644 --- a/desktop.nix +++ b/desktop.nix @@ -51,6 +51,12 @@ }; # Export the current path for the awesome derivation, useful for users rc.lua + # Example usage in rc.lua : + # + # config = {} + # config.dir = os.getenv("AWESOME_CONFIG_DIR") + # beautiful.init(config.dir .. "/share/awesome//themes/zenburn/theme.lua") + # environment.variables.AWESOME_CONFIG_DIR = "${pkgs.awesome}"; # Enable the X11 windowing system. From 7e9a8131a37ed019ee80016ff7cbf7bed0d2e3b3 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Mon, 18 Jul 2016 12:14:43 +0200 Subject: [PATCH 53/56] =?UTF-8?q?d=C3=A9placement=20de=20la=20d=C3=A9finit?= =?UTF-8?q?ion=20de=20la=20variable=20awesome?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- activation-manuelle/app-awesome.nix | 20 ++++++++++++++++++++ desktop.nix | 10 +--------- 2 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 activation-manuelle/app-awesome.nix diff --git a/activation-manuelle/app-awesome.nix b/activation-manuelle/app-awesome.nix new file mode 100644 index 0000000..e0ccfd0 --- /dev/null +++ b/activation-manuelle/app-awesome.nix @@ -0,0 +1,20 @@ +{ config, lib, pkgs, ... }: +let + inherit (lib) mkIf; + cfg = config.r6d.config-generator; + profiles = config.r6d.profiles; +in { + imports = [ + ]; + + environment.variables = mkIf cfg.awesome { + # Export the current path for the awesome derivation, useful for users rc.lua + # Example usage in rc.lua : + # + # config = {} + # config.dir = os.getenv("AWESOME_CONFIG_DIR") + # beautiful.init(config.dir .. "/share/awesome//themes/zenburn/theme.lua") + # + AWESOME_CONFIG_DIR = "${pkgs.awesome}"; + }; +} diff --git a/desktop.nix b/desktop.nix index 8a1a7e3..c5ecbcc 100644 --- a/desktop.nix +++ b/desktop.nix @@ -3,6 +3,7 @@ { imports = [ # applications : # commandées par config-generator + ./activation-manuelle/app-awesome.nix # pour les profils awesome ./activation-manuelle/app-docker.nix # pour activer docker ./activation-manuelle/app-jeux.nix # permettant de jouer ;) ./activation-manuelle/app-virtualbox.nix # pour exploiter virtualbox @@ -50,15 +51,6 @@ mumble = pkgs.mumble.override { pulseSupport = true; }; }; - # Export the current path for the awesome derivation, useful for users rc.lua - # Example usage in rc.lua : - # - # config = {} - # config.dir = os.getenv("AWESOME_CONFIG_DIR") - # beautiful.init(config.dir .. "/share/awesome//themes/zenburn/theme.lua") - # - environment.variables.AWESOME_CONFIG_DIR = "${pkgs.awesome}"; - # Enable the X11 windowing system. services.xserver = { enable = true; From 51787ab25bd7a248cdd628b89fa77edbbd109fdc Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 21 Jul 2016 00:22:07 +0200 Subject: [PATCH 54/56] configuration pour xmonad --- activation-manuelle/xmonad.nix | 18 ++++++++++++++++++ desktop.nix | 1 + 2 files changed, 19 insertions(+) create mode 100644 activation-manuelle/xmonad.nix diff --git a/activation-manuelle/xmonad.nix b/activation-manuelle/xmonad.nix new file mode 100644 index 0000000..9ada317 --- /dev/null +++ b/activation-manuelle/xmonad.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, ... }: +let + inherit (lib) mkIf; + cfg = config.r6d.config-generator; +in mkIf cfg.xmonad { + # Paquets spécifiques pour un ordinateur portable + + environment.systemPackages = with pkgs;[ + dmenu + haskellPackages.xmobar + ]; + + services.xserver.windowManager.xmonad.enable = true; + services.xserver.windowManager.xmonad.enableContribAndExtras = true; + services.xserver.windowManager.xmonad.extraPackages = haskellPackages: [ + haskellPackages.xmobar + ]; +} diff --git a/desktop.nix b/desktop.nix index c5ecbcc..17416db 100644 --- a/desktop.nix +++ b/desktop.nix @@ -8,6 +8,7 @@ ./activation-manuelle/app-jeux.nix # permettant de jouer ;) ./activation-manuelle/app-virtualbox.nix # pour exploiter virtualbox ./activation-manuelle/laptop.nix # appli & configuration adaptée pour un PC portable$ + ./activation-manuelle/xmonad.nix # gestionnaire de fenêtres xmonad # installées systématiquement ./app-adminsys.nix # pour gérer le système dans son ensemble et les services ./app-bureautique.nix # dédiée à la bureautique (traitement de texte, dessin, ...) From e0cd512f87eb63ffe9420b717bae6d61b4dbb4ef Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 21 Jul 2016 00:44:23 +0200 Subject: [PATCH 55/56] petits outils pour xorg : xev et xbacklight --- desktop.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/desktop.nix b/desktop.nix index 17416db..3f135e4 100644 --- a/desktop.nix +++ b/desktop.nix @@ -25,6 +25,8 @@ # Environement de bureau wmname # pour définir le nom du gestionnaire de fenêtre (utile pour java) kde4.ksnapshot# capture d'écran + xorg.xbacklight # pour gérer la luminosité de l'écran + xorg.xev # pour repérer les codes + noms standard des actions clavier/souris xorg.xkill # pour 'tuer une application' ## Gestionnaire de fenêtre & Thème From 6ff5e008a7f2167ba7e92ddf5dfc59883cbdcd70 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 26 Jul 2016 15:57:02 +0200 Subject: [PATCH 56/56] harmonisation fichiers activation manuelle --- activation-manuelle/app-awesome.nix | 8 ++++---- activation-manuelle/app-docker.nix | 12 +++++++----- activation-manuelle/app-jeux.nix | 10 ++++++---- activation-manuelle/app-virtualbox.nix | 12 +++++++----- activation-manuelle/laptop.nix | 15 ++++++++++----- activation-manuelle/xmonad.nix | 20 +++++++++++++------- 6 files changed, 47 insertions(+), 30 deletions(-) diff --git a/activation-manuelle/app-awesome.nix b/activation-manuelle/app-awesome.nix index e0ccfd0..abc751a 100644 --- a/activation-manuelle/app-awesome.nix +++ b/activation-manuelle/app-awesome.nix @@ -1,13 +1,13 @@ { config, lib, pkgs, ... }: + let inherit (lib) mkIf; cfg = config.r6d.config-generator; + computers = config.r6d.computers; profiles = config.r6d.profiles; -in { - imports = [ - ]; +in mkIf cfg.awesome { - environment.variables = mkIf cfg.awesome { + environment.variables = { # Export the current path for the awesome derivation, useful for users rc.lua # Example usage in rc.lua : # diff --git a/activation-manuelle/app-docker.nix b/activation-manuelle/app-docker.nix index a1c4aaf..69bc060 100644 --- a/activation-manuelle/app-docker.nix +++ b/activation-manuelle/app-docker.nix @@ -1,16 +1,18 @@ { config, lib, pkgs, ... }: + let inherit (lib) mkIf; cfg = config.r6d.config-generator; -in { - imports = [ - ]; + computers = config.r6d.computers; + profiles = config.r6d.profiles; + +in mkIf cfg.docker { - environment.systemPackages = with pkgs; mkIf cfg.docker [ + environment.systemPackages = with pkgs; [ # Ecosystème Docker docker python27Packages.docker_compose ]; - virtualisation.docker.enable = cfg.docker; + virtualisation.docker.enable = true; } diff --git a/activation-manuelle/app-jeux.nix b/activation-manuelle/app-jeux.nix index edcfdb9..7371907 100644 --- a/activation-manuelle/app-jeux.nix +++ b/activation-manuelle/app-jeux.nix @@ -1,12 +1,14 @@ { config, lib, pkgs, ... }: + let inherit (lib) mkIf; cfg = config.r6d.config-generator; -in { - imports = [ - ]; + computers = config.r6d.computers; + profiles = config.r6d.profiles; + +in mkIf cfg.jeux { - environment.systemPackages = with pkgs; mkIf cfg.jeux [ + environment.systemPackages = with pkgs; [ # Jeux urbanterror ]; diff --git a/activation-manuelle/app-virtualbox.nix b/activation-manuelle/app-virtualbox.nix index 8d9bfe5..47d461c 100644 --- a/activation-manuelle/app-virtualbox.nix +++ b/activation-manuelle/app-virtualbox.nix @@ -1,16 +1,18 @@ { config, lib, pkgs, ... }: + let inherit (lib) mkIf; cfg = config.r6d.config-generator; -in { - imports = [ - ]; + computers = config.r6d.computers; + profiles = config.r6d.profiles; + +in mkIf cfg.virtualbox { - environment.systemPackages = with pkgs; mkIf cfg.virtualbox [ + environment.systemPackages = with pkgs; [ linuxPackages.virtualbox linuxPackages.virtualboxGuestAdditions ]; - virtualisation.virtualbox.host.enable = cfg.virtualbox; + virtualisation.virtualbox.host.enable = true; } diff --git a/activation-manuelle/laptop.nix b/activation-manuelle/laptop.nix index 332d6f5..f31a388 100644 --- a/activation-manuelle/laptop.nix +++ b/activation-manuelle/laptop.nix @@ -1,19 +1,24 @@ { config, lib, pkgs, ... }: + let inherit (lib) mkIf; cfg = config.r6d.config-generator; -in { + computers = config.r6d.computers; + profiles = config.r6d.profiles; + +in mkIf cfg.laptop { # Paquets spécifiques pour un ordinateur portable - networking.networkmanager.enable = cfg.laptop; # Activation d'un gestionnaire de réseau + ## Activation d'un gestionnaire de réseau + networking.networkmanager.enable = true; - hardware.bluetooth.enable = cfg.laptop; + hardware.bluetooth.enable = true; - environment.systemPackages = with pkgs; mkIf cfg.laptop [ + environment.systemPackages = with pkgs; [ networkmanagerapplet ]; - services.xserver.synaptics = mkIf cfg.laptop { + services.xserver.synaptics = { enable = true; twoFingerScroll = true; }; diff --git a/activation-manuelle/xmonad.nix b/activation-manuelle/xmonad.nix index 9ada317..bb46a15 100644 --- a/activation-manuelle/xmonad.nix +++ b/activation-manuelle/xmonad.nix @@ -1,18 +1,24 @@ { config, lib, pkgs, ... }: + let inherit (lib) mkIf; cfg = config.r6d.config-generator; -in mkIf cfg.xmonad { - # Paquets spécifiques pour un ordinateur portable + computers = config.r6d.computers; + profiles = config.r6d.profiles; + +in mkIf cfg.xmonad { + # Paquets spécifiques pour xmonad environment.systemPackages = with pkgs;[ dmenu haskellPackages.xmobar ]; - services.xserver.windowManager.xmonad.enable = true; - services.xserver.windowManager.xmonad.enableContribAndExtras = true; - services.xserver.windowManager.xmonad.extraPackages = haskellPackages: [ - haskellPackages.xmobar - ]; + services.xserver.windowManager.xmonad = { + enable = true; + enableContribAndExtras = true; + extraPackages = haskellPackages: [ + haskellPackages.xmobar + ]; + }; }