Compare commits
58 Commits
2016-11-29
...
2017-01-20
| Author | SHA1 | Date | |
|---|---|---|---|
| 09f970266e | |||
| 8de39214b6 | |||
| b9b92c5942 | |||
| aec47a8d1b | |||
| 0fefb7adc8 | |||
| 6779d58dfb | |||
| 54d15c8ed6 | |||
| f2ce6751d2 | |||
| 996b8e803c | |||
| 162bac4af0 | |||
| 55da6460d6 | |||
| 14bc58c1c2 | |||
| 3818122ac9 | |||
| 7afafa7863 | |||
| cb6676a215 | |||
| c0c4550af0 | |||
| 43fac7495d | |||
|
|
ab32cae7d8 | ||
|
|
5bbb61b05d | ||
|
|
8abd9b1d5d | ||
| 31692206e0 | |||
| fad5a05159 | |||
| 30962288b7 | |||
| 8d28f29c57 | |||
| df05e6101d | |||
| 72eaf19f95 | |||
| f632193558 | |||
| 05b5da4319 | |||
| 64d0765e40 | |||
| 587e91fe61 | |||
|
|
0f4355d382 | ||
|
|
8c18caab2e | ||
|
|
2bee4131ed | ||
|
|
49b86fb898 | ||
| 6dd9251f07 | |||
| 6ca6c83898 | |||
| d6ff207d22 | |||
| 2a26db779f | |||
| aecfadea5f | |||
| 2e45bfbc05 | |||
| cd05bec335 | |||
| 3aecc135c0 | |||
| 54b8d6ce7d | |||
| 4a81f80d8c | |||
| ec3dc220be | |||
| 4a106a82ef | |||
| 4397b892eb | |||
| 829aff682e | |||
| cff0a177d2 | |||
| de2c645dbe | |||
| 0facfef3e9 | |||
| 94c1485006 | |||
| 35322c124c | |||
| 8d9c0d830f | |||
| bdf5e511f3 | |||
| 386ce3b25e | |||
| b9d19017c0 | |||
| f91e72ef50 |
6
Makefile
6
Makefile
@@ -31,6 +31,12 @@ store-repair:
|
|||||||
upgrade:
|
upgrade:
|
||||||
nixos-rebuild switch --upgrade --fallback --show-trace
|
nixos-rebuild switch --upgrade --fallback --show-trace
|
||||||
|
|
||||||
|
##--------- Commandes spécifiques pour NixOS -- Opérations non courantes
|
||||||
|
|
||||||
|
download-sources:
|
||||||
|
# https://nixos.org/wiki/Download_all_sources
|
||||||
|
nix-store -r $$(grep -l outputHash $$(nix-store -qR $$(nix-instantiate '<nixpkgs>' -A geeqie) | grep '.drv$$'))
|
||||||
|
|
||||||
##--------- Commandes spécifiques pour GIT
|
##--------- Commandes spécifiques pour GIT
|
||||||
|
|
||||||
push: submodules-push
|
push: submodules-push
|
||||||
|
|||||||
@@ -16,53 +16,55 @@ in
|
|||||||
#* Utilisé pour afecter des capacités aux machines
|
#* Utilisé pour afecter des capacités aux machines
|
||||||
r6d.profiles = {
|
r6d.profiles = {
|
||||||
# Domaine
|
# Domaine
|
||||||
isDubronetwork = mkEnableOption "Pour distinguer les machines dubronetwork.";
|
isDubronetwork = mkEnableOption "Pour distinguer les machines dubronetwork.";
|
||||||
isPrunetwork = mkEnableOption "Pour distinguer les machines prunetwork.";
|
isPrunetwork = mkEnableOption "Pour distinguer les machines prunetwork.";
|
||||||
# Utilisation machine
|
# Utilisation machine
|
||||||
isDesktop = mkEnableOption "Pour indiquer une machine avec interface graphique.";
|
isDesktop = mkEnableOption "Pour indiquer une machine avec interface graphique.";
|
||||||
isHome = mkEnableOption "Pour indiquer que la machine sert à la maison (divertissement & autre).";
|
isHome = mkEnableOption "Pour indiquer que la machine sert à la maison (divertissement & autre).";
|
||||||
isServer = mkEnableOption "Pour indiquer qu'il s'agit d'un serveur.";
|
isServer = mkEnableOption "Pour indiquer qu'il s'agit d'un serveur.";
|
||||||
isWorkstation = mkEnableOption "Pour indiquer que la machine sert à travailler.";
|
isWorkstation = mkEnableOption "Pour indiquer que la machine sert à travailler.";
|
||||||
};
|
};
|
||||||
|
|
||||||
#* Utilisé dans les fichiers .nix
|
#* Utilisé dans les fichiers .nix
|
||||||
r6d.config-generator = {
|
r6d.config-generator = {
|
||||||
enable = mkEnableOption "Génération de la configuration d'une machine.";
|
enable = mkEnableOption "Génération de la configuration d'une machine.";
|
||||||
awesome = mkEnableOption "Profil pour activer le gestionnaire de fenêtre awesome.";
|
awesome = mkEnableOption "Profil pour activer le gestionnaire de fenêtre awesome.";
|
||||||
auto-upgrade = mkEnableOption "Profil pour activer les mises à jour automatiques.";
|
auto-upgrade = mkEnableOption "Profil pour activer les mises à jour automatiques.";
|
||||||
cartographie = mkEnableOption "Profil pour activer les outils de gestion de données géographiques.";
|
cartographie = mkEnableOption "Profil pour activer les outils de gestion de données géographiques.";
|
||||||
conception-assistee = mkEnableOption "Profil pour activer les outils de conception électronique & modélisation 3D";
|
conception-assistee = mkEnableOption "Profil pour activer les outils de conception électronique & modélisation 3D";
|
||||||
database_postgres=mkEnableOption "Profil pour activer le SGBD PostgreSQL.";
|
database_postgres = mkEnableOption "Profil pour activer le SGBD PostgreSQL.";
|
||||||
developpement = mkEnableOption "Profil pour activer les outils de développement";
|
developpement = mkEnableOption "Profil pour activer les outils de développement";
|
||||||
docker = mkEnableOption "Profil pour l'utilisation de Docker.";
|
developpement-haskell = mkEnableOption "Profil pour activer les outils de développement Haskell";
|
||||||
dovecot = mkEnableOption "Profil pour activer le serveur Dovecot.";
|
developpement-java = mkEnableOption "Profil pour activer les outils de développement Java";
|
||||||
dns_autorite = mkEnableOption "Profil pour servir les fichiers de zone DNS.";
|
developpement-rust = mkEnableOption "Profil pour activer les outils de développement Rust";
|
||||||
dns_resolveur = mkEnableOption "Profil pour activer un résolveur DNS local.";
|
docker = mkEnableOption "Profil pour l'utilisation de Docker.";
|
||||||
edition-musique = mkEnableOption "Profil pour la création/édition de musique.";
|
dovecot = mkEnableOption "Profil pour activer le serveur Dovecot.";
|
||||||
edition-photo = mkEnableOption "Profil pour la création/édition de photos.";
|
dns_autorite = mkEnableOption "Profil pour servir les fichiers de zone DNS.";
|
||||||
edition-video = mkEnableOption "Profil pour la création/édition de video.";
|
dns_resolveur = mkEnableOption "Profil pour activer un résolveur DNS local.";
|
||||||
elasticsearch = mkEnableOption "Profil pour activer le service elasticsearch.";
|
edition-musique = mkEnableOption "Profil pour la création/édition de musique.";
|
||||||
fail2ban = mkEnableOption "Profil pour activer Fail2ban.";
|
edition-photo = mkEnableOption "Profil pour la création/édition de photos.";
|
||||||
hydra-builder = mkEnableOption "Profil pour une machine qui compile pour hydra.";
|
edition-video = mkEnableOption "Profil pour la création/édition de video.";
|
||||||
hydra-core = mkEnableOption "Profil pour un serveur hydra.";
|
elasticsearch = mkEnableOption "Profil pour activer le service elasticsearch.";
|
||||||
kibana = mkEnableOption "Profil pour activer le service kibana.";
|
fail2ban = mkEnableOption "Profil pour activer Fail2ban.";
|
||||||
jeux = mkEnableOption "Profil pour les jeux vidéos.";
|
hydra-builder = mkEnableOption "Profil pour une machine qui compile pour hydra.";
|
||||||
laptop = mkEnableOption "Profil pour les outils spécifiques aux ordinateurs portables..";
|
hydra-core = mkEnableOption "Profil pour un serveur hydra.";
|
||||||
locate = mkEnableOption "Profil pour activer la fonction locate.";
|
kibana = mkEnableOption "Profil pour activer le service kibana.";
|
||||||
mailboxes = mkEnableOption "Profil pour stocker les mails dans des boîtes aux lettres.";
|
jeux = mkEnableOption "Profil pour les jeux vidéos.";
|
||||||
murmur = mkEnableOption "Profil pour activer un serveur Mumble (murmur)";
|
laptop = mkEnableOption "Profil pour les outils spécifiques aux ordinateurs portables..";
|
||||||
nix-serve-client= mkEnableOption "Profil pour que la machine soit un client de cache nix.";
|
locate = mkEnableOption "Profil pour activer la fonction locate.";
|
||||||
nix-serve-server= mkEnableOption "Profil pour que la machine soit un serveur de cache nix.";
|
mailboxes = mkEnableOption "Profil pour stocker les mails dans des boîtes aux lettres.";
|
||||||
nixStoreProxyCache = mkEnableOption "Profil pour activer le proxy cahce nginx pour le nix store";
|
murmur = mkEnableOption "Profil pour activer un serveur Mumble (murmur)";
|
||||||
online-ipv6 = mkEnableOption "Profil pour activer l'IPv6 de online.net";
|
nix-serve-client = mkEnableOption "Profil pour que la machine soit un client de cache nix.";
|
||||||
print = mkEnableOption "Profil pour activer cups & pouvoir imprimer.";
|
nix-serve-server = mkEnableOption "Profil pour que la machine soit un serveur de cache nix.";
|
||||||
rabbitmq = mkEnableOption "Profil pour activer le service de messagerie AMQP.";
|
nixStoreProxyCache = mkEnableOption "Profil pour activer le proxy cahce nginx pour le nix store";
|
||||||
radicale = mkEnableOption "Profil pour activer le service d'hébergement de calendrier + tâches & contacts.";
|
print = mkEnableOption "Profil pour activer cups & pouvoir imprimer.";
|
||||||
scanner = mkEnableOption "Profil pour que les scanners soient utilisable.";
|
rabbitmq = mkEnableOption "Profil pour activer le service de messagerie AMQP.";
|
||||||
swap = mkEnableOption "Profil pour que le swap soit activé.";
|
radicale = mkEnableOption "Profil pour activer le service d'hébergement de calendrier + tâches & contacts.";
|
||||||
virtualbox = mkEnableOption "Profil pour l'utilisation de VirtualBox.";
|
scanner = mkEnableOption "Profil pour que les scanners soient utilisable.";
|
||||||
xmonad = mkEnableOption "Profil pour activer le gestionnaire de fenêtres xmonad.";
|
swap = mkEnableOption "Profil pour que le swap soit activé.";
|
||||||
znc = mkEnableOption "Profil pour activer le relais IRC ZNC.";
|
virtualbox = mkEnableOption "Profil pour l'utilisation de VirtualBox.";
|
||||||
|
xmonad = mkEnableOption "Profil pour activer le gestionnaire de fenêtres xmonad.";
|
||||||
|
znc = mkEnableOption "Profil pour activer le relais IRC ZNC.";
|
||||||
|
|
||||||
tincAddress = mkOption {
|
tincAddress = mkOption {
|
||||||
default = "";
|
default = "";
|
||||||
@@ -82,16 +84,15 @@ in
|
|||||||
};
|
};
|
||||||
#* Utilisé pour avoir des raccourcis de machine
|
#* Utilisé pour avoir des raccourcis de machine
|
||||||
r6d.computers = {
|
r6d.computers = {
|
||||||
isLatitude = mkEnableOption "Identification du nom de machine.";
|
isLatitude = mkEnableOption "Identification du nom de machine.";
|
||||||
isMonstre = mkEnableOption "Identification du nom de machine.";
|
isMonstre = mkEnableOption "Identification du nom de machine.";
|
||||||
isNeoNomade = mkEnableOption "Identification du nom de machine.";
|
isNeoNomade = mkEnableOption "Identification du nom de machine.";
|
||||||
isNomade = mkEnableOption "Identification du nom de machine.";
|
isNomade = mkEnableOption "Identification du nom de machine.";
|
||||||
isOcean = mkEnableOption "Identification du nom de machine.";
|
isOcean = mkEnableOption "Identification du nom de machine.";
|
||||||
isPedro = mkEnableOption "Identification du nom de machine.";
|
isPedro = mkEnableOption "Identification du nom de machine.";
|
||||||
isPhenom = mkEnableOption "Identification du nom de machine.";
|
isPhenom = mkEnableOption "Identification du nom de machine.";
|
||||||
isRadx = mkEnableOption "Identification du nom de machine.";
|
isRadx = mkEnableOption "Identification du nom de machine.";
|
||||||
isRollo = mkEnableOption "Identification du nom de machine.";
|
isRollo = mkEnableOption "Identification du nom de machine.";
|
||||||
isXray = mkEnableOption "Identification du nom de machine.";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -112,7 +113,6 @@ in
|
|||||||
isPhenom = host == "phenom.dubronetwork.fr";
|
isPhenom = host == "phenom.dubronetwork.fr";
|
||||||
isRadx = host == "radx.prunetwork.fr";
|
isRadx = host == "radx.prunetwork.fr";
|
||||||
isRollo = host == "rollo.dubronetwork.fr";
|
isRollo = host == "rollo.dubronetwork.fr";
|
||||||
isXray = host == "xray.prunetwork.fr";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,7 +122,7 @@ in
|
|||||||
(mkIf pfl.isDesktop {
|
(mkIf pfl.isDesktop {
|
||||||
r6d.config-generator = {
|
r6d.config-generator = {
|
||||||
awesome = true;
|
awesome = true;
|
||||||
nix-serve-client = true;
|
#nix-serve-client = true;
|
||||||
scanner = true;
|
scanner = true;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
@@ -150,13 +150,7 @@ in
|
|||||||
r6d.profiles.isDesktop = true;
|
r6d.profiles.isDesktop = true;
|
||||||
|
|
||||||
r6d.config-generator = {
|
r6d.config-generator = {
|
||||||
cartographie = true;
|
|
||||||
developpement = true;
|
|
||||||
docker = true;
|
docker = true;
|
||||||
|
|
||||||
edition-musique = true;
|
|
||||||
edition-photo = true;
|
|
||||||
edition-video = true;
|
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -164,12 +158,22 @@ in
|
|||||||
(mkIf pfl.isDubronetwork {
|
(mkIf pfl.isDubronetwork {
|
||||||
r6d.config-generator = {
|
r6d.config-generator = {
|
||||||
auto-upgrade = true;
|
auto-upgrade = true;
|
||||||
|
locate = true;
|
||||||
print = true;
|
print = true;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
(mkIf (pfl.isDubronetwork && pfl.isWorkstation) {
|
(mkIf (pfl.isDubronetwork && pfl.isWorkstation) {
|
||||||
r6d.config-generator = {
|
r6d.config-generator = {
|
||||||
|
cartographie = true;
|
||||||
conception-assistee = true;
|
conception-assistee = true;
|
||||||
|
docker = true;
|
||||||
|
developpement = true;
|
||||||
|
developpement-haskell = true;
|
||||||
|
developpement-java = true;
|
||||||
|
developpement-rust = true;
|
||||||
|
edition-musique = true;
|
||||||
|
edition-photo = true;
|
||||||
|
edition-video = true;
|
||||||
virtualbox = true;
|
virtualbox = true;
|
||||||
xmonad = true;
|
xmonad = true;
|
||||||
};
|
};
|
||||||
@@ -179,10 +183,26 @@ in
|
|||||||
(mkIf pfl.isPrunetwork {
|
(mkIf pfl.isPrunetwork {
|
||||||
r6d.config-generator = {
|
r6d.config-generator = {
|
||||||
auto-upgrade = true;
|
auto-upgrade = true;
|
||||||
|
docker = true;
|
||||||
|
locate = true;
|
||||||
fail2ban = true;
|
fail2ban = true;
|
||||||
swap = true;
|
swap = true;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
(mkIf (pfl.isPrunetwork && pfl.isWorkstation) {
|
||||||
|
r6d.config-generator = {
|
||||||
|
cartographie = true;
|
||||||
|
developpement = true;
|
||||||
|
developpement-haskell = true;
|
||||||
|
developpement-java = true;
|
||||||
|
#developpement-rust = true;
|
||||||
|
#edition-musique = true;
|
||||||
|
edition-photo = true;
|
||||||
|
#edition-video = true;
|
||||||
|
print = true;
|
||||||
|
virtualbox = true;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
## Affectation des profils aux machines
|
## Affectation des profils aux machines
|
||||||
@@ -213,7 +233,6 @@ in
|
|||||||
hydra-builder = true;
|
hydra-builder = true;
|
||||||
hydra-core = true;
|
hydra-core = true;
|
||||||
kibana = true;
|
kibana = true;
|
||||||
print = true;
|
|
||||||
rabbitmq = true;
|
rabbitmq = true;
|
||||||
tincAddress = "192.168.12.3/24";
|
tincAddress = "192.168.12.3/24";
|
||||||
tincExtraConfig = ''
|
tincExtraConfig = ''
|
||||||
@@ -221,13 +240,6 @@ in
|
|||||||
ConnectTo = rollo_dubronetwork_fr
|
ConnectTo = rollo_dubronetwork_fr
|
||||||
ConnectTo = ocean_prunetwork_fr
|
ConnectTo = ocean_prunetwork_fr
|
||||||
'';
|
'';
|
||||||
virtualbox = true;
|
|
||||||
};
|
|
||||||
})
|
|
||||||
(mkIf comp.isXray {
|
|
||||||
r6d.profiles = {
|
|
||||||
isPrunetwork = true;
|
|
||||||
isServer = true;
|
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -256,6 +268,7 @@ in
|
|||||||
|
|
||||||
r6d.config-generator = {
|
r6d.config-generator = {
|
||||||
fail2ban = true;
|
fail2ban = true;
|
||||||
|
murmur = true;
|
||||||
nix-serve-client = true;
|
nix-serve-client = true;
|
||||||
nixStoreProxyCache = true;
|
nixStoreProxyCache = true;
|
||||||
tincAddress = "192.168.12.4/24";
|
tincAddress = "192.168.12.4/24";
|
||||||
@@ -296,7 +309,6 @@ in
|
|||||||
|
|
||||||
r6d.config-generator = {
|
r6d.config-generator = {
|
||||||
fail2ban = true;
|
fail2ban = true;
|
||||||
online-ipv6 = true;
|
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
(mkIf comp.isPhenom {
|
(mkIf comp.isPhenom {
|
||||||
@@ -328,7 +340,6 @@ in
|
|||||||
fail2ban = true;
|
fail2ban = true;
|
||||||
mailboxes = true;
|
mailboxes = true;
|
||||||
murmur = true;
|
murmur = true;
|
||||||
online-ipv6 = true;
|
|
||||||
tincAddress = "192.168.12.5/24";
|
tincAddress = "192.168.12.5/24";
|
||||||
tincExtraConfig = ''
|
tincExtraConfig = ''
|
||||||
ConnectTo = ocean_prunetwork_fr
|
ConnectTo = ocean_prunetwork_fr
|
||||||
|
|||||||
@@ -18,13 +18,13 @@ in
|
|||||||
# Environement de bureau
|
# Environement de bureau
|
||||||
arandr # interface graphique pour xrandr
|
arandr # interface graphique pour xrandr
|
||||||
wmname # pour définir le nom du gestionnaire de fenêtre (utile pour java)
|
wmname # pour définir le nom du gestionnaire de fenêtre (utile pour java)
|
||||||
kde4.ksnapshot# capture d'écran
|
#kde4.ksnapshot # capture d'écran
|
||||||
xorg.xbacklight # pour gérer la luminosité de l'é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.xev # pour repérer les codes + noms standard des actions clavier/souris
|
||||||
xorg.xkill # pour 'tuer une application'
|
xorg.xkill # pour 'tuer une application'
|
||||||
|
|
||||||
## Gestionnaire de fenêtre & Thème
|
## Gestionnaire de fenêtre & Thème
|
||||||
gnome.gnome_icon_theme # thème d'icone - semble fonctionner avec spaceFM
|
gnome3.adwaita-icon-theme # thème d'icone - semble fonctionner avec spaceFM
|
||||||
|
|
||||||
## Manipulation de fichier
|
## Manipulation de fichier
|
||||||
pcmanfm # gestionnaire de fichiers graphique
|
pcmanfm # gestionnaire de fichiers graphique
|
||||||
@@ -52,7 +52,14 @@ in
|
|||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs.config.packageOverrides = pkgs: {
|
nixpkgs.config.packageOverrides = pkgs: {
|
||||||
clawsMail = pkgs.clawsMail.override { enablePluginFancy = true; };
|
clawsMail = pkgs.clawsMail.override {
|
||||||
|
enablePluginFancy = true;
|
||||||
|
enablePluginPdf = true;
|
||||||
|
enablePluginRavatar = true;
|
||||||
|
enablePluginSmime = true;
|
||||||
|
enablePluginVcalendar = true;
|
||||||
|
enableSpellcheck = true;
|
||||||
|
};
|
||||||
mumble = pkgs.mumble.override { pulseSupport = true; };
|
mumble = pkgs.mumble.override { pulseSupport = true; };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ mkIf true {
|
|||||||
python27Packages.glances
|
python27Packages.glances
|
||||||
usbutils
|
usbutils
|
||||||
|
|
||||||
|
# Backup
|
||||||
|
duplicity # création de sauvegarde chiffrées (GPG)
|
||||||
|
|
||||||
# Compression
|
# Compression
|
||||||
lz4
|
lz4
|
||||||
lzop
|
lzop
|
||||||
@@ -30,6 +33,8 @@ mkIf true {
|
|||||||
# Système de fichier
|
# Système de fichier
|
||||||
## Montage de filesystem
|
## Montage de filesystem
|
||||||
curlftpfs # ftp
|
curlftpfs # ftp
|
||||||
|
exfat # Pour monter les FAT avec Fuse
|
||||||
|
hubicfuse # montage hubic
|
||||||
ntfs3g # ntfs
|
ntfs3g # ntfs
|
||||||
sshfsFuse # ssh
|
sshfsFuse # ssh
|
||||||
|
|
||||||
@@ -38,7 +43,7 @@ mkIf true {
|
|||||||
|
|
||||||
## Exploitation FS
|
## Exploitation FS
|
||||||
inotify-tools # être notifié lorsque le contenu d'un répertoire change
|
inotify-tools # être notifié lorsque le contenu d'un répertoire change
|
||||||
duff # outil de recherche de fichiers en doublons
|
duff # outil de recherche de fichiers en doublons
|
||||||
rdfind # recherche de fichiers doublons pour remplacement par hard/soft link
|
rdfind # recherche de fichiers doublons pour remplacement par hard/soft link
|
||||||
|
|
||||||
(mkIf profiles.isDesktop
|
(mkIf profiles.isDesktop
|
||||||
|
|||||||
@@ -12,21 +12,24 @@ mkIf profiles.isDesktop {
|
|||||||
# Paquets
|
# Paquets
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# Bureautique
|
# Bureautique
|
||||||
aspell aspellDicts.fr
|
aspell aspellDicts.fr # correction d'ortographe
|
||||||
dia
|
gnumeric # tableur
|
||||||
gnumeric
|
#kde4.ksnapshot# réalisation de capture d'écran
|
||||||
|
|
||||||
## Cartes mentales
|
## Cartes mentales
|
||||||
freemind
|
freemind
|
||||||
|
|
||||||
|
## Diagrammes & Schémas
|
||||||
|
dia # dessin & schéma technique
|
||||||
|
|
||||||
## Editeur de texte
|
## Editeur de texte
|
||||||
lyx # surcouche WISIWIM à LaTeX
|
#lyx # surcouche WISIWIM à LaTeX
|
||||||
focuswriter # outil pour l'écriture
|
#focuswriter # outil pour l'écriture
|
||||||
textadept # un éditeur de texte facile pour copier-coller graphique
|
textadept # un éditeur de texte facile pour copier-coller graphique
|
||||||
zim # outil de prise de notes, wiki de bureau
|
#zim # outil de prise de notes, wiki de bureau
|
||||||
|
|
||||||
## Visionneuse
|
## Visionneuse
|
||||||
kde5.okular # pdf
|
#kde5.okular # pdf
|
||||||
mcomix # livres (cbr, liste d'images), gestion d'une bibliothèque
|
mcomix # livres (cbr, liste d'images), gestion d'une bibliothèque
|
||||||
pdfpc # pdf
|
pdfpc # pdf
|
||||||
qpdfview # pdf
|
qpdfview # pdf
|
||||||
@@ -35,9 +38,10 @@ mkIf profiles.isDesktop {
|
|||||||
## Convertisseurs (texte -> <autre format>)
|
## Convertisseurs (texte -> <autre format>)
|
||||||
gnuplot # générateur de graphes à partir de données numériques
|
gnuplot # générateur de graphes à partir de données numériques
|
||||||
graphviz # dot, neato : traçage de graphes (carré, rond)
|
graphviz # dot, neato : traçage de graphes (carré, rond)
|
||||||
jekyll # générateur statique de site web
|
#jekyll # générateur statique de site web
|
||||||
odpdown # conversion md -> presentation ODP : https://github.com/thorstenb/odpdown
|
#odpdown # conversion md -> presentation ODP : https://github.com/thorstenb/odpdown
|
||||||
pandoc
|
pandoc
|
||||||
|
haskellPackages.pandoc-citeproc
|
||||||
texlive.combined.scheme-full # distribution LaTeX
|
texlive.combined.scheme-full # distribution LaTeX
|
||||||
#texLive # distribution LaTeX de base
|
#texLive # distribution LaTeX de base
|
||||||
#texLiveBeamer # paquets et extensions pour Beamer
|
#texLiveBeamer # paquets et extensions pour Beamer
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ mkIf cfg.cartographie {
|
|||||||
expat
|
expat
|
||||||
gpsbabel # pour convettir les données des GPS
|
gpsbabel # pour convettir les données des GPS
|
||||||
josm # outil de contribution à OpenStreetMap
|
josm # outil de contribution à OpenStreetMap
|
||||||
qgis # client lourd de manipulation de données géographiques
|
#qgis # client lourd de manipulation de données géographiques
|
||||||
viking # analyse de topo, gestion de données GPS
|
viking # analyse de topo, gestion de données GPS
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ environment.systemPackages = with pkgs; [
|
|||||||
firefox
|
firefox
|
||||||
|
|
||||||
## Réseaux sociaux
|
## Réseaux sociaux
|
||||||
python27Packages.turses # client twitter en ncurse
|
#python27Packages.turses # client twitter en ncurse
|
||||||
python27Packages.rainbowstream # client twitter en console
|
python27Packages.rainbowstream # client twitter en console
|
||||||
rtv # client reddit en console
|
rtv # client reddit en console
|
||||||
|
|
||||||
|
|||||||
25
public/app-developpement-haskell.nix
Normal file
25
public/app-developpement-haskell.nix
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (lib) mkIf mkMerge mkThenElse;
|
||||||
|
cfg = config.r6d.config-generator;
|
||||||
|
computers = config.r6d.computers;
|
||||||
|
profiles = config.r6d.profiles;
|
||||||
|
in
|
||||||
|
|
||||||
|
mkIf cfg.developpement-haskell {
|
||||||
|
|
||||||
|
# Paquets
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
# Haskell
|
||||||
|
cabal-install # fournis cabal
|
||||||
|
cabal2nix # convertir les .cabal en .nix
|
||||||
|
ghc # pour les appels depuis les scripts
|
||||||
|
stack # pour les paquets en LTS de stackage
|
||||||
|
|
||||||
|
haskellPackages.stylish-haskell # qualité de code
|
||||||
|
|
||||||
|
# Application perso
|
||||||
|
haskellPackages.hahp
|
||||||
|
];
|
||||||
|
}
|
||||||
20
public/app-developpement-java.nix
Normal file
20
public/app-developpement-java.nix
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (lib) mkIf mkMerge mkThenElse;
|
||||||
|
cfg = config.r6d.config-generator;
|
||||||
|
computers = config.r6d.computers;
|
||||||
|
profiles = config.r6d.profiles;
|
||||||
|
in
|
||||||
|
|
||||||
|
mkIf cfg.developpement-java {
|
||||||
|
|
||||||
|
# Paquets
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
# IDE
|
||||||
|
idea.idea-community # IntelliJ IDEA
|
||||||
|
|
||||||
|
# Java
|
||||||
|
maven
|
||||||
|
];
|
||||||
|
}
|
||||||
18
public/app-developpement-rust.nix
Normal file
18
public/app-developpement-rust.nix
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (lib) mkIf mkMerge mkThenElse;
|
||||||
|
cfg = config.r6d.config-generator;
|
||||||
|
computers = config.r6d.computers;
|
||||||
|
profiles = config.r6d.profiles;
|
||||||
|
in
|
||||||
|
|
||||||
|
mkIf cfg.developpement-rust {
|
||||||
|
|
||||||
|
# Paquets
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
# Rust
|
||||||
|
cargo # récupération des dépendances + compilation projet rust
|
||||||
|
rustc # pour les appels depuis les scripts
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -15,35 +15,28 @@ mkIf cfg.developpement {
|
|||||||
pgadmin # interface d'administration de postgres
|
pgadmin # interface d'administration de postgres
|
||||||
sqlitebrowser # interface d'administration de sqlite
|
sqlitebrowser # interface d'administration de sqlite
|
||||||
|
|
||||||
# Développement
|
# C / C++
|
||||||
cloc
|
|
||||||
idea.idea-community # IntelliJ IDEA
|
|
||||||
gcc # pour les appels depuis les scripts
|
gcc # pour les appels depuis les scripts
|
||||||
maven
|
|
||||||
|
|
||||||
# Documentation
|
# Documentation
|
||||||
zeal # consulter la documentation hors ligne
|
#zeal # consulter la documentation hors ligne
|
||||||
|
|
||||||
## Gestion des sources
|
# Gestion des sources
|
||||||
# git # déjà présent dans "base"
|
cloc # outil pour compter les lignes de code source
|
||||||
# gitg # interface pour utiliser git (historique, commit)
|
git # déjà présent dans "base"
|
||||||
|
gitg # interface pour utiliser git (historique, commit)
|
||||||
gitstats # génère un site web statique avec des statistiques
|
gitstats # génère un site web statique avec des statistiques
|
||||||
gitAndTools.gitFull # pour gitk
|
gitAndTools.gitFull # pour gitk
|
||||||
git-cola # interface pour utiliser git (historique, commit)
|
git-cola # interface pour utiliser git (historique, commit)
|
||||||
mercurial
|
mercurial
|
||||||
subversion
|
subversion
|
||||||
|
|
||||||
## Haskell
|
# Mono
|
||||||
ghc # pour les appels depuis les scripts
|
#mono46 # interpréteur .NET
|
||||||
stack
|
|
||||||
|
|
||||||
## Rust
|
|
||||||
cargo # récupération des dépendances + compilation projet rust
|
|
||||||
rustc # pour les appels depuis les scripts
|
|
||||||
|
|
||||||
## Visualisation & outils de diff
|
## Visualisation & outils de diff
|
||||||
gource # visualisation en mouvement de l'historique git
|
#gource # visualisation en mouvement de l'historique git
|
||||||
meld # outil de comparaison graphique
|
meld # outil de comparaison graphique
|
||||||
vbindiff # diff de fichier hexadecimaux avec vim
|
#vbindiff # diff de fichier hexadecimaux avec vim
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,9 +19,9 @@ environment.systemPackages = with pkgs; [
|
|||||||
gimp # logiciel d'édition/montage/retouche photo
|
gimp # logiciel d'édition/montage/retouche photo
|
||||||
inkscape # édition d'image vectorielle (svg & autre)
|
inkscape # édition d'image vectorielle (svg & autre)
|
||||||
imagemagick # modification image en CLI
|
imagemagick # modification image en CLI
|
||||||
rawtherapee # développemen de photos en RAW
|
#rawtherapee # développemen de photos en RAW
|
||||||
|
|
||||||
# TEST d'outil de gestion de catalogue de photos
|
# TEST d'outil de gestion de catalogue de photos
|
||||||
kde4.digikam # gestionnaire de bibliothèque de photo
|
#kde4.digikam # gestionnaire de bibliothèque de photo
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,7 +24,5 @@ mkIf profiles.isDesktop {
|
|||||||
## Video
|
## Video
|
||||||
smplayer # lecteur vidéo
|
smplayer # lecteur vidéo
|
||||||
vlc # lecteur vidéo
|
vlc # lecteur vidéo
|
||||||
|
|
||||||
kde4.ksnapshot# réalisation de capture d'écran
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ mkIf true {
|
|||||||
|
|
||||||
## Diagnostic
|
## Diagnostic
|
||||||
arp-scan
|
arp-scan
|
||||||
|
nmap # outil de scan de port réseau
|
||||||
|
mtr # outil de diagnostic réseau
|
||||||
#wireshark
|
#wireshark
|
||||||
whois
|
whois
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ mkIf profiles.isDesktop {
|
|||||||
pass # gestionnaire de mots de passe
|
pass # gestionnaire de mots de passe
|
||||||
pwgen # générateur 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
|
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
|
#yubikey-personalization-gui # utilisation de la clef Yubikey
|
||||||
];
|
];
|
||||||
security.setuidPrograms = [ "slock" ];
|
security.setuidPrograms = [ "slock" ];
|
||||||
}
|
}
|
||||||
|
|||||||
470
public/config-awesome-3-rc.lua
Normal file
470
public/config-awesome-3-rc.lua
Normal file
@@ -0,0 +1,470 @@
|
|||||||
|
-- ~home : .config/awesome/rc.lua
|
||||||
|
|
||||||
|
-- Standard awesome library
|
||||||
|
local gears = require("gears")
|
||||||
|
local awful = require("awful")
|
||||||
|
awful.rules = require("awful.rules")
|
||||||
|
require("awful.autofocus")
|
||||||
|
-- Widget and layout library
|
||||||
|
local wibox = require("wibox")
|
||||||
|
-- Theme handling library
|
||||||
|
local beautiful = require("beautiful")
|
||||||
|
-- Notification library
|
||||||
|
local naughty = require("naughty")
|
||||||
|
local menubar = require("menubar")
|
||||||
|
|
||||||
|
-- {{{ Error handling
|
||||||
|
-- Check if awesome encountered an error during startup and fell back to
|
||||||
|
-- another config (This code will only ever execute for the fallback config)
|
||||||
|
if awesome.startup_errors then
|
||||||
|
naughty.notify({ preset = naughty.config.presets.critical,
|
||||||
|
title = "Oops, there were errors during startup!",
|
||||||
|
text = awesome.startup_errors })
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Handle runtime errors after startup
|
||||||
|
do
|
||||||
|
local in_error = false
|
||||||
|
awesome.connect_signal("debug::error", function (err)
|
||||||
|
-- Make sure we don't go into an endless error loop
|
||||||
|
if in_error then return end
|
||||||
|
in_error = true
|
||||||
|
|
||||||
|
naughty.notify({ preset = naughty.config.presets.critical,
|
||||||
|
title = "Oops, an error happened!",
|
||||||
|
text = err })
|
||||||
|
in_error = false
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Variable definitions
|
||||||
|
-- Themes define colours, icons, font and wallpapers.
|
||||||
|
|
||||||
|
local config_dir = os.getenv("AWESOME_CONFIG_DIR")
|
||||||
|
beautiful.init(config_dir .. "/share/awesome/themes/zenburn/theme.lua")
|
||||||
|
-- beautiful.init("/nix/store/vpj4i2vmqbinqfcigy44xzh81k9h0mv8-awesome-3.5.8/share/awesome/themes/zenburn/theme.lua")
|
||||||
|
|
||||||
|
-- This is used later as the default terminal and editor to run.
|
||||||
|
terminal = "sakura"
|
||||||
|
editor = os.getenv("EDITOR") or "vim"
|
||||||
|
editor_cmd = terminal .. " -e " .. editor
|
||||||
|
|
||||||
|
-- Default modkey.
|
||||||
|
-- Usually, Mod4 is the key with a logo between Control and Alt.
|
||||||
|
-- If you do not like this or do not have such a key,
|
||||||
|
-- I suggest you to remap Mod4 to another key using xmodmap or other tools.
|
||||||
|
-- However, you can use another modifier like Mod1, but it may interact with others.
|
||||||
|
modkey = "Mod4"
|
||||||
|
|
||||||
|
-- Table of layouts to cover with awful.layout.inc, order matters.
|
||||||
|
local layouts =
|
||||||
|
{
|
||||||
|
awful.layout.suit.fair,
|
||||||
|
awful.layout.suit.fair.horizontal,
|
||||||
|
awful.layout.suit.max.fullscreen,
|
||||||
|
awful.layout.suit.spiral,
|
||||||
|
awful.layout.suit.spiral.dwindle,
|
||||||
|
awful.layout.suit.max,
|
||||||
|
awful.layout.suit.floating,
|
||||||
|
awful.layout.suit.tile,
|
||||||
|
awful.layout.suit.tile.left,
|
||||||
|
awful.layout.suit.tile.bottom,
|
||||||
|
awful.layout.suit.tile.top,
|
||||||
|
awful.layout.suit.magnifier
|
||||||
|
}
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Wallpaper
|
||||||
|
if beautiful.wallpaper then
|
||||||
|
for s = 1, screen.count() do
|
||||||
|
gears.wallpaper.maximized(beautiful.wallpaper, s, true)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Tags
|
||||||
|
-- Define a tag table which hold all screen tags.
|
||||||
|
tags = {}
|
||||||
|
for s = 1, screen.count() do
|
||||||
|
-- Each screen has its own tag table.
|
||||||
|
tags[s] = awful.tag({ 1, 2, 3, 4, 5, 6, 7, 8, 9 }, s, layouts[1])
|
||||||
|
end
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Menu
|
||||||
|
-- Create a laucher widget and a main menu
|
||||||
|
myawesomemenu = {
|
||||||
|
{ "manual", terminal .. " -e man awesome" },
|
||||||
|
{ "edit config", editor_cmd .. " " .. awesome.conffile },
|
||||||
|
{ "restart", awesome.restart },
|
||||||
|
{ "quit", awesome.quit }
|
||||||
|
}
|
||||||
|
|
||||||
|
mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
|
||||||
|
{ "open terminal", terminal }
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
|
||||||
|
menu = mymainmenu })
|
||||||
|
|
||||||
|
-- Menubar configuration
|
||||||
|
menubar.utils.terminal = terminal -- Set the terminal for applications that require it
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Wibox
|
||||||
|
-- Create a textclock widget
|
||||||
|
mytextclock = awful.widget.textclock()
|
||||||
|
|
||||||
|
-- Create a wibox for each screen and add it
|
||||||
|
mywibox = {}
|
||||||
|
mypromptbox = {}
|
||||||
|
mylayoutbox = {}
|
||||||
|
mytaglist = {}
|
||||||
|
mytaglist.buttons = awful.util.table.join(
|
||||||
|
awful.button({ }, 1, awful.tag.viewonly),
|
||||||
|
awful.button({ modkey }, 1, awful.client.movetotag),
|
||||||
|
awful.button({ }, 3, awful.tag.viewtoggle),
|
||||||
|
awful.button({ modkey }, 3, awful.client.toggletag),
|
||||||
|
awful.button({ }, 4, function(t) awful.tag.viewnext(awful.tag.getscreen(t)) end),
|
||||||
|
awful.button({ }, 5, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end)
|
||||||
|
)
|
||||||
|
mytasklist = {}
|
||||||
|
mytasklist.buttons = awful.util.table.join(
|
||||||
|
awful.button({ }, 1, function (c)
|
||||||
|
if c == client.focus then
|
||||||
|
c.minimized = true
|
||||||
|
else
|
||||||
|
-- Without this, the following
|
||||||
|
-- :isvisible() makes no sense
|
||||||
|
c.minimized = false
|
||||||
|
if not c:isvisible() then
|
||||||
|
awful.tag.viewonly(c:tags()[1])
|
||||||
|
end
|
||||||
|
-- This will also un-minimize
|
||||||
|
-- the client, if needed
|
||||||
|
client.focus = c
|
||||||
|
c:raise()
|
||||||
|
end
|
||||||
|
end),
|
||||||
|
awful.button({ }, 3, function ()
|
||||||
|
if instance then
|
||||||
|
instance:hide()
|
||||||
|
instance = nil
|
||||||
|
else
|
||||||
|
instance = awful.menu.clients({
|
||||||
|
theme = { width = 250 }
|
||||||
|
})
|
||||||
|
end
|
||||||
|
end),
|
||||||
|
awful.button({ }, 4, function ()
|
||||||
|
awful.client.focus.byidx(1)
|
||||||
|
if client.focus then client.focus:raise() end
|
||||||
|
end),
|
||||||
|
awful.button({ }, 5, function ()
|
||||||
|
awful.client.focus.byidx(-1)
|
||||||
|
if client.focus then client.focus:raise() end
|
||||||
|
end))
|
||||||
|
|
||||||
|
for s = 1, screen.count() do
|
||||||
|
-- Create a promptbox for each screen
|
||||||
|
mypromptbox[s] = awful.widget.prompt()
|
||||||
|
-- Create an imagebox widget which will contains an icon indicating which layout we're using.
|
||||||
|
-- We need one layoutbox per screen.
|
||||||
|
mylayoutbox[s] = awful.widget.layoutbox(s)
|
||||||
|
mylayoutbox[s]:buttons(awful.util.table.join(
|
||||||
|
awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end),
|
||||||
|
awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end),
|
||||||
|
awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end),
|
||||||
|
awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end)))
|
||||||
|
-- Create a taglist widget
|
||||||
|
mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons)
|
||||||
|
|
||||||
|
-- Create a tasklist widget
|
||||||
|
mytasklist[s] = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons)
|
||||||
|
|
||||||
|
-- Create the wibox
|
||||||
|
mywibox[s] = awful.wibox({ position = "top", screen = s })
|
||||||
|
|
||||||
|
-- Widgets that are aligned to the left
|
||||||
|
local left_layout = wibox.layout.fixed.horizontal()
|
||||||
|
left_layout:add(mylauncher)
|
||||||
|
left_layout:add(mytaglist[s])
|
||||||
|
left_layout:add(mypromptbox[s])
|
||||||
|
|
||||||
|
-- Widgets that are aligned to the right
|
||||||
|
local right_layout = wibox.layout.fixed.horizontal()
|
||||||
|
if s == 1 then right_layout:add(wibox.widget.systray()) end
|
||||||
|
right_layout:add(mytextclock)
|
||||||
|
right_layout:add(mylayoutbox[s])
|
||||||
|
|
||||||
|
-- Now bring it all together (with the tasklist in the middle)
|
||||||
|
local layout = wibox.layout.align.horizontal()
|
||||||
|
layout:set_left(left_layout)
|
||||||
|
layout:set_middle(mytasklist[s])
|
||||||
|
layout:set_right(right_layout)
|
||||||
|
|
||||||
|
mywibox[s]:set_widget(layout)
|
||||||
|
end
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Mouse bindings
|
||||||
|
root.buttons(awful.util.table.join(
|
||||||
|
awful.button({ }, 3, function () mymainmenu:toggle() end),
|
||||||
|
awful.button({ }, 4, awful.tag.viewnext),
|
||||||
|
awful.button({ }, 5, awful.tag.viewprev)
|
||||||
|
))
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Key bindings
|
||||||
|
globalkeys = awful.util.table.join(
|
||||||
|
awful.key({ modkey, }, "Left", awful.tag.viewprev ),
|
||||||
|
awful.key({ modkey, }, "Right", awful.tag.viewnext ),
|
||||||
|
awful.key({ modkey, }, "Escape", awful.tag.history.restore),
|
||||||
|
|
||||||
|
awful.key({ modkey, }, "j",
|
||||||
|
function ()
|
||||||
|
awful.client.focus.byidx( 1)
|
||||||
|
if client.focus then client.focus:raise() end
|
||||||
|
end),
|
||||||
|
awful.key({ modkey, }, "k",
|
||||||
|
function ()
|
||||||
|
awful.client.focus.byidx(-1)
|
||||||
|
if client.focus then client.focus:raise() end
|
||||||
|
end),
|
||||||
|
awful.key({ modkey, }, "w", function () mymainmenu:show() end),
|
||||||
|
|
||||||
|
-- Layout manipulation
|
||||||
|
awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end),
|
||||||
|
awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end),
|
||||||
|
awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end),
|
||||||
|
awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end),
|
||||||
|
awful.key({ modkey, }, "u", awful.client.urgent.jumpto),
|
||||||
|
awful.key({ modkey, }, "Tab",
|
||||||
|
function ()
|
||||||
|
awful.client.focus.history.previous()
|
||||||
|
if client.focus then
|
||||||
|
client.focus:raise()
|
||||||
|
end
|
||||||
|
end),
|
||||||
|
|
||||||
|
-- Standard program
|
||||||
|
awful.key({ modkey, }, "Return", function () awful.util.spawn(terminal) end),
|
||||||
|
awful.key({ modkey, "Control" }, "r", awesome.restart),
|
||||||
|
awful.key({ modkey, "Shift" }, "q", awesome.quit),
|
||||||
|
|
||||||
|
awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end),
|
||||||
|
awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end),
|
||||||
|
awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1) end),
|
||||||
|
awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end),
|
||||||
|
awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1) end),
|
||||||
|
awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end),
|
||||||
|
awful.key({ modkey, }, "space", function () awful.layout.inc(layouts, 1) end),
|
||||||
|
awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end),
|
||||||
|
|
||||||
|
awful.key({ modkey, "Control" }, "n", awful.client.restore),
|
||||||
|
|
||||||
|
-- Prompt
|
||||||
|
awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end),
|
||||||
|
awful.key({ modkey }, "x",
|
||||||
|
function ()
|
||||||
|
awful.prompt.run({ prompt = "Run Lua code: " },
|
||||||
|
mypromptbox[mouse.screen].widget,
|
||||||
|
awful.util.eval, nil,
|
||||||
|
awful.util.getdir("cache") .. "/history_eval")
|
||||||
|
end),
|
||||||
|
-- Menubar
|
||||||
|
awful.key({ modkey }, "p", function() menubar.show() end),
|
||||||
|
-- Lanceurs perso
|
||||||
|
awful.key({ modkey }, "F1", function () awful.util.spawn("kontact") end),
|
||||||
|
awful.key({ modkey, "Shift" }, "F1", function () awful.util.spawn("claws-mail") end),
|
||||||
|
awful.key({ modkey }, "F2", function () awful.util.spawn("firefox") end),
|
||||||
|
awful.key({ modkey, "Shift" }, "F2", function () awful.util.spawn("uzbl-tabbed") end),
|
||||||
|
awful.key({ modkey }, "F3", function () awful.util.spawn("spacefm") end),
|
||||||
|
awful.key({ modkey, "Shift" }, "F3", function () awful.util.spawn("pcmanfm") end),
|
||||||
|
-- awful.key({ modkey }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-auto") end),
|
||||||
|
-- awful.key({ modkey, "Shift" }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-left") end),
|
||||||
|
-- awful.key({ modkey, "Control" }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-right") end),
|
||||||
|
awful.key({ modkey }, "F12", function () awful.util.spawn("slock") end)
|
||||||
|
)
|
||||||
|
|
||||||
|
clientkeys = awful.util.table.join(
|
||||||
|
awful.key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen end),
|
||||||
|
awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end),
|
||||||
|
awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle ),
|
||||||
|
awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
|
||||||
|
awful.key({ modkey, }, "o", awful.client.movetoscreen ),
|
||||||
|
awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end),
|
||||||
|
awful.key({ modkey, }, "n",
|
||||||
|
function (c)
|
||||||
|
-- The client currently has the input focus, so it cannot be
|
||||||
|
-- minimized, since minimized clients can't have the focus.
|
||||||
|
c.minimized = true
|
||||||
|
end),
|
||||||
|
awful.key({ modkey, }, "m",
|
||||||
|
function (c)
|
||||||
|
c.maximized_horizontal = not c.maximized_horizontal
|
||||||
|
c.maximized_vertical = not c.maximized_vertical
|
||||||
|
end)
|
||||||
|
)
|
||||||
|
|
||||||
|
-- Bind all key numbers to tags.
|
||||||
|
-- Be careful: we use keycodes to make it works on any keyboard layout.
|
||||||
|
-- This should map on the top row of your keyboard, usually 1 to 9.
|
||||||
|
for i = 1, 9 do
|
||||||
|
globalkeys = awful.util.table.join(globalkeys,
|
||||||
|
-- View tag only.
|
||||||
|
awful.key({ modkey }, "#" .. i + 9,
|
||||||
|
function ()
|
||||||
|
local screen = mouse.screen
|
||||||
|
local tag = awful.tag.gettags(screen)[i]
|
||||||
|
if tag then
|
||||||
|
awful.tag.viewonly(tag)
|
||||||
|
end
|
||||||
|
end),
|
||||||
|
-- Toggle tag.
|
||||||
|
awful.key({ modkey, "Control" }, "#" .. i + 9,
|
||||||
|
function ()
|
||||||
|
local screen = mouse.screen
|
||||||
|
local tag = awful.tag.gettags(screen)[i]
|
||||||
|
if tag then
|
||||||
|
awful.tag.viewtoggle(tag)
|
||||||
|
end
|
||||||
|
end),
|
||||||
|
-- Move client to tag.
|
||||||
|
awful.key({ modkey, "Shift" }, "#" .. i + 9,
|
||||||
|
function ()
|
||||||
|
if client.focus then
|
||||||
|
local tag = awful.tag.gettags(client.focus.screen)[i]
|
||||||
|
if tag then
|
||||||
|
awful.client.movetotag(tag)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end),
|
||||||
|
-- Toggle tag.
|
||||||
|
awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
|
||||||
|
function ()
|
||||||
|
if client.focus then
|
||||||
|
local tag = awful.tag.gettags(client.focus.screen)[i]
|
||||||
|
if tag then
|
||||||
|
awful.client.toggletag(tag)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end))
|
||||||
|
end
|
||||||
|
|
||||||
|
clientbuttons = awful.util.table.join(
|
||||||
|
awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
|
||||||
|
awful.button({ modkey }, 1, awful.mouse.client.move),
|
||||||
|
awful.button({ modkey }, 3, awful.mouse.client.resize)
|
||||||
|
)
|
||||||
|
|
||||||
|
-- Set keys
|
||||||
|
root.keys(globalkeys)
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Rules
|
||||||
|
-- Rules to apply to new clients (through the "manage" signal).
|
||||||
|
awful.rules.rules = {
|
||||||
|
-- All clients will match this rule.
|
||||||
|
{ rule = { },
|
||||||
|
properties = { border_width = beautiful.border_width,
|
||||||
|
border_color = beautiful.border_normal,
|
||||||
|
focus = awful.client.focus.filter,
|
||||||
|
raise = true,
|
||||||
|
keys = clientkeys,
|
||||||
|
buttons = clientbuttons }
|
||||||
|
},
|
||||||
|
{ rule = { class = "MPlayer" },
|
||||||
|
properties = { floating = true }
|
||||||
|
},
|
||||||
|
{ rule = { class = "pinentry" },
|
||||||
|
properties = { floating = true }
|
||||||
|
},
|
||||||
|
{ rule = { class = "gimp" },
|
||||||
|
properties = { floating = true }
|
||||||
|
}
|
||||||
|
-- Set Firefox to always map on tags number 2 of screen 1.
|
||||||
|
-- { rule = { class = "Firefox" },
|
||||||
|
-- properties = { tag = tags[1][2] } },
|
||||||
|
}
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Signals
|
||||||
|
-- Signal function to execute when a new client appears.
|
||||||
|
client.connect_signal("manage", function (c, startup)
|
||||||
|
-- Enable sloppy focus
|
||||||
|
c:connect_signal("mouse::enter", function(c)
|
||||||
|
if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
|
||||||
|
and awful.client.focus.filter(c) then
|
||||||
|
client.focus = c
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
|
||||||
|
if not startup then
|
||||||
|
-- Set the windows at the slave,
|
||||||
|
-- i.e. put it at the end of others instead of setting it master.
|
||||||
|
-- awful.client.setslave(c)
|
||||||
|
|
||||||
|
-- Put windows in a smart way, only if they does not set an initial position.
|
||||||
|
if not c.size_hints.user_position and not c.size_hints.program_position then
|
||||||
|
awful.placement.no_overlap(c)
|
||||||
|
awful.placement.no_offscreen(c)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local titlebars_enabled = false
|
||||||
|
if titlebars_enabled and (c.type == "normal" or c.type == "dialog") then
|
||||||
|
-- buttons for the titlebar
|
||||||
|
local buttons = awful.util.table.join(
|
||||||
|
awful.button({ }, 1, function()
|
||||||
|
client.focus = c
|
||||||
|
c:raise()
|
||||||
|
awful.mouse.client.move(c)
|
||||||
|
end),
|
||||||
|
awful.button({ }, 3, function()
|
||||||
|
client.focus = c
|
||||||
|
c:raise()
|
||||||
|
awful.mouse.client.resize(c)
|
||||||
|
end)
|
||||||
|
)
|
||||||
|
|
||||||
|
-- Widgets that are aligned to the left
|
||||||
|
local left_layout = wibox.layout.fixed.horizontal()
|
||||||
|
left_layout:add(awful.titlebar.widget.iconwidget(c))
|
||||||
|
left_layout:buttons(buttons)
|
||||||
|
|
||||||
|
-- Widgets that are aligned to the right
|
||||||
|
local right_layout = wibox.layout.fixed.horizontal()
|
||||||
|
right_layout:add(awful.titlebar.widget.floatingbutton(c))
|
||||||
|
right_layout:add(awful.titlebar.widget.maximizedbutton(c))
|
||||||
|
right_layout:add(awful.titlebar.widget.stickybutton(c))
|
||||||
|
right_layout:add(awful.titlebar.widget.ontopbutton(c))
|
||||||
|
right_layout:add(awful.titlebar.widget.closebutton(c))
|
||||||
|
|
||||||
|
-- The title goes in the middle
|
||||||
|
local middle_layout = wibox.layout.flex.horizontal()
|
||||||
|
local title = awful.titlebar.widget.titlewidget(c)
|
||||||
|
title:set_align("center")
|
||||||
|
middle_layout:add(title)
|
||||||
|
middle_layout:buttons(buttons)
|
||||||
|
|
||||||
|
-- Now bring it all together
|
||||||
|
local layout = wibox.layout.align.horizontal()
|
||||||
|
layout:set_left(left_layout)
|
||||||
|
layout:set_right(right_layout)
|
||||||
|
layout:set_middle(middle_layout)
|
||||||
|
|
||||||
|
awful.titlebar(c):set_widget(layout)
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
|
||||||
|
client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
|
||||||
|
client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- Au démarrage
|
||||||
|
-- awful.util.spawn_with_shell("/home/taeradan/bin/xrandr-auto")
|
||||||
|
-- awful.util.spawn_with_shell("gnome-sound-applet")
|
||||||
|
-- awful.util.spawn_with_shell("nm-applet")
|
||||||
569
public/config-awesome-4-rc.lua
Normal file
569
public/config-awesome-4-rc.lua
Normal file
@@ -0,0 +1,569 @@
|
|||||||
|
-- $HOME : .config/awesome/rc.lua
|
||||||
|
|
||||||
|
-- Standard awesome library
|
||||||
|
local gears = require("gears")
|
||||||
|
local awful = require("awful")
|
||||||
|
awful.rules = require("awful.rules")
|
||||||
|
require("awful.autofocus")
|
||||||
|
-- Widget and layout library
|
||||||
|
local wibox = require("wibox")
|
||||||
|
-- Theme handling library
|
||||||
|
local beautiful = require("beautiful")
|
||||||
|
-- Notification library
|
||||||
|
local naughty = require("naughty")
|
||||||
|
local menubar = require("menubar")
|
||||||
|
local hotkeys_popup = require("awful.hotkeys_popup").widget
|
||||||
|
|
||||||
|
-- {{{ Error handling
|
||||||
|
-- Check if awesome encountered an error during startup and fell back to
|
||||||
|
-- another config (This code will only ever execute for the fallback config)
|
||||||
|
if awesome.startup_errors then
|
||||||
|
naughty.notify({ preset = naughty.config.presets.critical,
|
||||||
|
title = "Oops, there were errors during startup!",
|
||||||
|
text = awesome.startup_errors })
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Handle runtime errors after startup
|
||||||
|
do
|
||||||
|
local in_error = false
|
||||||
|
awesome.connect_signal("debug::error", function (err)
|
||||||
|
-- Make sure we don't go into an endless error loop
|
||||||
|
if in_error then return end
|
||||||
|
in_error = true
|
||||||
|
|
||||||
|
naughty.notify({ preset = naughty.config.presets.critical,
|
||||||
|
title = "Oops, an error happened!",
|
||||||
|
text = tostring(err) })
|
||||||
|
in_error = false
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Variable definitions
|
||||||
|
-- Themes define colours, icons, font and wallpapers.
|
||||||
|
local config_dir = os.getenv("AWESOME_CONFIG_DIR")
|
||||||
|
beautiful.init(config_dir .. "/share/awesome/themes/zenburn/theme.lua")
|
||||||
|
|
||||||
|
-- This is used later as the default terminal and editor to run.
|
||||||
|
terminal = "sakura"
|
||||||
|
editor = os.getenv("EDITOR") or "vim"
|
||||||
|
editor_cmd = terminal .. " -e " .. editor
|
||||||
|
|
||||||
|
-- Default modkey.
|
||||||
|
-- Usually, Mod4 is the key with a logo between Control and Alt.
|
||||||
|
-- If you do not like this or do not have such a key,
|
||||||
|
-- I suggest you to remap Mod4 to another key using xmodmap or other tools.
|
||||||
|
-- However, you can use another modifier like Mod1, but it may interact with others.
|
||||||
|
modkey = "Mod4"
|
||||||
|
|
||||||
|
-- Table of layouts to cover with awful.layout.inc, order matters.
|
||||||
|
awful.layout.layouts = {
|
||||||
|
awful.layout.suit.corner.nw,
|
||||||
|
awful.layout.suit.tile,
|
||||||
|
awful.layout.suit.tile.left,
|
||||||
|
awful.layout.suit.tile.bottom,
|
||||||
|
awful.layout.suit.tile.top,
|
||||||
|
awful.layout.suit.fair,
|
||||||
|
awful.layout.suit.fair.horizontal,
|
||||||
|
awful.layout.suit.spiral,
|
||||||
|
awful.layout.suit.spiral.dwindle,
|
||||||
|
awful.layout.suit.max,
|
||||||
|
awful.layout.suit.max.fullscreen,
|
||||||
|
awful.layout.suit.magnifier,
|
||||||
|
awful.layout.suit.floating,
|
||||||
|
-- awful.layout.suit.corner.ne,
|
||||||
|
-- awful.layout.suit.corner.sw,
|
||||||
|
-- awful.layout.suit.corner.se,
|
||||||
|
}
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Helper functions
|
||||||
|
local function client_menu_toggle_fn()
|
||||||
|
local instance = nil
|
||||||
|
|
||||||
|
return function ()
|
||||||
|
if instance and instance.wibox.visible then
|
||||||
|
instance:hide()
|
||||||
|
instance = nil
|
||||||
|
else
|
||||||
|
instance = awful.menu.clients({ theme = { width = 250 } })
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Menu
|
||||||
|
-- Create a launcher widget and a main menu
|
||||||
|
myawesomemenu = {
|
||||||
|
{ "hotkeys", function() return false, hotkeys_popup.show_help end},
|
||||||
|
{ "manual", terminal .. " -e man awesome" },
|
||||||
|
{ "edit config", editor_cmd .. " " .. awesome.conffile },
|
||||||
|
{ "restart", awesome.restart },
|
||||||
|
{ "quit", function() awesome.quit() end}
|
||||||
|
}
|
||||||
|
|
||||||
|
mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
|
||||||
|
{ "open terminal", terminal }
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
|
||||||
|
menu = mymainmenu })
|
||||||
|
|
||||||
|
-- Menubar configuration
|
||||||
|
menubar.utils.terminal = terminal -- Set the terminal for applications that require it
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- Keyboard map indicator and switcher
|
||||||
|
mykeyboardlayout = awful.widget.keyboardlayout()
|
||||||
|
|
||||||
|
-- {{{ Wibar
|
||||||
|
-- Create a textclock widget
|
||||||
|
mytextclock = wibox.widget.textclock()
|
||||||
|
|
||||||
|
-- Create a wibox for each screen and add it
|
||||||
|
local taglist_buttons = awful.util.table.join(
|
||||||
|
awful.button({ }, 1, function(t) t:view_only() end),
|
||||||
|
awful.button({ modkey }, 1, function(t)
|
||||||
|
if client.focus then
|
||||||
|
client.focus:move_to_tag(t)
|
||||||
|
end
|
||||||
|
end),
|
||||||
|
awful.button({ }, 3, awful.tag.viewtoggle),
|
||||||
|
awful.button({ modkey }, 3, function(t)
|
||||||
|
if client.focus then
|
||||||
|
client.focus:toggle_tag(t)
|
||||||
|
end
|
||||||
|
end),
|
||||||
|
awful.button({ }, 4, function(t) awful.tag.viewnext(t.screen) end),
|
||||||
|
awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end)
|
||||||
|
)
|
||||||
|
|
||||||
|
local tasklist_buttons = awful.util.table.join(
|
||||||
|
awful.button({ }, 1, function (c)
|
||||||
|
if c == client.focus then
|
||||||
|
c.minimized = true
|
||||||
|
else
|
||||||
|
-- Without this, the following
|
||||||
|
-- :isvisible() makes no sense
|
||||||
|
c.minimized = false
|
||||||
|
if not c:isvisible() and c.first_tag then
|
||||||
|
c.first_tag:view_only()
|
||||||
|
end
|
||||||
|
-- This will also un-minimize
|
||||||
|
-- the client, if needed
|
||||||
|
client.focus = c
|
||||||
|
c:raise()
|
||||||
|
end
|
||||||
|
end),
|
||||||
|
awful.button({ }, 3, client_menu_toggle_fn()),
|
||||||
|
awful.button({ }, 4, function ()
|
||||||
|
awful.client.focus.byidx(1)
|
||||||
|
end),
|
||||||
|
awful.button({ }, 5, function ()
|
||||||
|
awful.client.focus.byidx(-1)
|
||||||
|
end))
|
||||||
|
|
||||||
|
local function set_wallpaper(s)
|
||||||
|
-- Wallpaper
|
||||||
|
if beautiful.wallpaper then
|
||||||
|
local wallpaper = beautiful.wallpaper
|
||||||
|
-- If wallpaper is a function, call it with the screen
|
||||||
|
if type(wallpaper) == "function" then
|
||||||
|
wallpaper = wallpaper(s)
|
||||||
|
end
|
||||||
|
gears.wallpaper.maximized(wallpaper, s, true)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
|
||||||
|
screen.connect_signal("property::geometry", set_wallpaper)
|
||||||
|
|
||||||
|
awful.screen.connect_for_each_screen(function(s)
|
||||||
|
-- Wallpaper
|
||||||
|
set_wallpaper(s)
|
||||||
|
|
||||||
|
-- Each screen has its own tag table.
|
||||||
|
awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[1])
|
||||||
|
|
||||||
|
-- Create a promptbox for each screen
|
||||||
|
s.mypromptbox = awful.widget.prompt()
|
||||||
|
-- Create an imagebox widget which will contains an icon indicating which layout we're using.
|
||||||
|
-- We need one layoutbox per screen.
|
||||||
|
s.mylayoutbox = awful.widget.layoutbox(s)
|
||||||
|
s.mylayoutbox:buttons(awful.util.table.join(
|
||||||
|
awful.button({ }, 1, function () awful.layout.inc( 1) end),
|
||||||
|
awful.button({ }, 3, function () awful.layout.inc(-1) end),
|
||||||
|
awful.button({ }, 4, function () awful.layout.inc( 1) end),
|
||||||
|
awful.button({ }, 5, function () awful.layout.inc(-1) end)))
|
||||||
|
-- Create a taglist widget
|
||||||
|
s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons)
|
||||||
|
|
||||||
|
-- Create a tasklist widget
|
||||||
|
s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, tasklist_buttons)
|
||||||
|
|
||||||
|
-- Create the wibox
|
||||||
|
s.mywibox = awful.wibar({ position = "top", screen = s })
|
||||||
|
|
||||||
|
-- Add widgets to the wibox
|
||||||
|
s.mywibox:setup {
|
||||||
|
layout = wibox.layout.align.horizontal,
|
||||||
|
{ -- Left widgets
|
||||||
|
layout = wibox.layout.fixed.horizontal,
|
||||||
|
mylauncher,
|
||||||
|
s.mytaglist,
|
||||||
|
s.mypromptbox,
|
||||||
|
},
|
||||||
|
s.mytasklist, -- Middle widget
|
||||||
|
{ -- Right widgets
|
||||||
|
layout = wibox.layout.fixed.horizontal,
|
||||||
|
mykeyboardlayout,
|
||||||
|
wibox.widget.systray(),
|
||||||
|
mytextclock,
|
||||||
|
s.mylayoutbox,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
end)
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Mouse bindings
|
||||||
|
root.buttons(awful.util.table.join(
|
||||||
|
awful.button({ }, 3, function () mymainmenu:toggle() end),
|
||||||
|
awful.button({ }, 4, awful.tag.viewnext),
|
||||||
|
awful.button({ }, 5, awful.tag.viewprev)
|
||||||
|
))
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Key bindings
|
||||||
|
globalkeys = awful.util.table.join(
|
||||||
|
awful.key({ modkey, }, "s", hotkeys_popup.show_help,
|
||||||
|
{description="show help", group="awesome"}),
|
||||||
|
awful.key({ modkey, }, "Left", awful.tag.viewprev,
|
||||||
|
{description = "view previous", group = "tag"}),
|
||||||
|
awful.key({ modkey, }, "Right", awful.tag.viewnext,
|
||||||
|
{description = "view next", group = "tag"}),
|
||||||
|
awful.key({ modkey, }, "Escape", awful.tag.history.restore,
|
||||||
|
{description = "go back", group = "tag"}),
|
||||||
|
|
||||||
|
awful.key({ modkey, }, "j",
|
||||||
|
function ()
|
||||||
|
awful.client.focus.byidx( 1)
|
||||||
|
end,
|
||||||
|
{description = "focus next by index", group = "client"}
|
||||||
|
),
|
||||||
|
awful.key({ modkey, }, "k",
|
||||||
|
function ()
|
||||||
|
awful.client.focus.byidx(-1)
|
||||||
|
end,
|
||||||
|
{description = "focus previous by index", group = "client"}
|
||||||
|
),
|
||||||
|
awful.key({ modkey, }, "w", function () mymainmenu:show() end,
|
||||||
|
{description = "show main menu", group = "awesome"}),
|
||||||
|
|
||||||
|
-- Layout manipulation
|
||||||
|
awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end,
|
||||||
|
{description = "swap with next client by index", group = "client"}),
|
||||||
|
awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end,
|
||||||
|
{description = "swap with previous client by index", group = "client"}),
|
||||||
|
awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end,
|
||||||
|
{description = "focus the next screen", group = "screen"}),
|
||||||
|
awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end,
|
||||||
|
{description = "focus the previous screen", group = "screen"}),
|
||||||
|
awful.key({ modkey, }, "u", awful.client.urgent.jumpto,
|
||||||
|
{description = "jump to urgent client", group = "client"}),
|
||||||
|
awful.key({ modkey, }, "Tab",
|
||||||
|
function ()
|
||||||
|
awful.client.focus.history.previous()
|
||||||
|
if client.focus then
|
||||||
|
client.focus:raise()
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
{description = "go back", group = "client"}),
|
||||||
|
|
||||||
|
-- Standard program
|
||||||
|
awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end,
|
||||||
|
{description = "open a terminal", group = "launcher"}),
|
||||||
|
awful.key({ modkey, "Control" }, "r", awesome.restart,
|
||||||
|
{description = "reload awesome", group = "awesome"}),
|
||||||
|
awful.key({ modkey, "Shift" }, "q", awesome.quit,
|
||||||
|
{description = "quit awesome", group = "awesome"}),
|
||||||
|
|
||||||
|
awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end,
|
||||||
|
{description = "increase master width factor", group = "layout"}),
|
||||||
|
awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end,
|
||||||
|
{description = "decrease master width factor", group = "layout"}),
|
||||||
|
awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1, nil, true) end,
|
||||||
|
{description = "increase the number of master clients", group = "layout"}),
|
||||||
|
awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1, nil, true) end,
|
||||||
|
{description = "decrease the number of master clients", group = "layout"}),
|
||||||
|
awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1, nil, true) end,
|
||||||
|
{description = "increase the number of columns", group = "layout"}),
|
||||||
|
awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1, nil, true) end,
|
||||||
|
{description = "decrease the number of columns", group = "layout"}),
|
||||||
|
awful.key({ modkey, }, "space", function () awful.layout.inc( 1) end,
|
||||||
|
{description = "select next", group = "layout"}),
|
||||||
|
awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(-1) end,
|
||||||
|
{description = "select previous", group = "layout"}),
|
||||||
|
|
||||||
|
awful.key({ modkey, "Control" }, "n",
|
||||||
|
function ()
|
||||||
|
local c = awful.client.restore()
|
||||||
|
-- Focus restored client
|
||||||
|
if c then
|
||||||
|
client.focus = c
|
||||||
|
c:raise()
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
{description = "restore minimized", group = "client"}),
|
||||||
|
|
||||||
|
-- Prompt
|
||||||
|
awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end,
|
||||||
|
{description = "run prompt", group = "launcher"}),
|
||||||
|
|
||||||
|
awful.key({ modkey }, "x",
|
||||||
|
function ()
|
||||||
|
awful.prompt.run {
|
||||||
|
prompt = "Run Lua code: ",
|
||||||
|
textbox = awful.screen.focused().mypromptbox.widget,
|
||||||
|
exe_callback = awful.util.eval,
|
||||||
|
history_path = awful.util.get_cache_dir() .. "/history_eval"
|
||||||
|
}
|
||||||
|
end,
|
||||||
|
{description = "lua execute prompt", group = "awesome"}),
|
||||||
|
-- Menubar
|
||||||
|
awful.key({ modkey }, "p", function() menubar.show() end,
|
||||||
|
{description = "show the menubar", group = "launcher"}),
|
||||||
|
-- Lanceurs perso
|
||||||
|
awful.key({ modkey }, "F1", function () awful.util.spawn("firefox") end),
|
||||||
|
awful.key({ modkey }, "F2", function () awful.util.spawn("firefox") end),
|
||||||
|
-- awful.key({ modkey }, "F3", function () awful.util.spawn("") end),
|
||||||
|
awful.key({ modkey }, "F4", function () awful.util.spawn("chromium") end),
|
||||||
|
awful.key({ modkey }, "F5", function () awful.util.spawn("spacefm") end),
|
||||||
|
awful.key({ modkey }, "F6", function () awful.util.spawn("vlc") end),
|
||||||
|
awful.key({ modkey }, "F7", function () awful.util.spawn("claws-mail") end),
|
||||||
|
awful.key({ modkey }, "F12", function () awful.util.spawn("slock") end),
|
||||||
|
awful.key({ modkey, "Shift" }, "F1", function () awful.util.spawn("claws-mail") end),
|
||||||
|
awful.key({ modkey, "Shift" }, "F3", function () awful.util.spawn("pcmanfm") end)
|
||||||
|
-- awful.key({ modkey }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-auto") end),
|
||||||
|
-- awful.key({ modkey, "Shift" }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-left") end),
|
||||||
|
-- awful.key({ modkey, "Control" }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-right") end),
|
||||||
|
|
||||||
|
)
|
||||||
|
|
||||||
|
clientkeys = awful.util.table.join(
|
||||||
|
awful.key({ modkey, }, "f",
|
||||||
|
function (c)
|
||||||
|
c.fullscreen = not c.fullscreen
|
||||||
|
c:raise()
|
||||||
|
end,
|
||||||
|
{description = "toggle fullscreen", group = "client"}),
|
||||||
|
awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end,
|
||||||
|
{description = "close", group = "client"}),
|
||||||
|
awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle ,
|
||||||
|
{description = "toggle floating", group = "client"}),
|
||||||
|
awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end,
|
||||||
|
{description = "move to master", group = "client"}),
|
||||||
|
awful.key({ modkey, }, "o", function (c) c:move_to_screen() end,
|
||||||
|
{description = "move to screen", group = "client"}),
|
||||||
|
awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end,
|
||||||
|
{description = "toggle keep on top", group = "client"}),
|
||||||
|
awful.key({ modkey, }, "n",
|
||||||
|
function (c)
|
||||||
|
-- The client currently has the input focus, so it cannot be
|
||||||
|
-- minimized, since minimized clients can't have the focus.
|
||||||
|
c.minimized = true
|
||||||
|
end ,
|
||||||
|
{description = "minimize", group = "client"}),
|
||||||
|
awful.key({ modkey, }, "m",
|
||||||
|
function (c)
|
||||||
|
c.maximized = not c.maximized
|
||||||
|
c:raise()
|
||||||
|
end ,
|
||||||
|
{description = "maximize", group = "client"})
|
||||||
|
)
|
||||||
|
|
||||||
|
-- Bind all key numbers to tags.
|
||||||
|
-- Be careful: we use keycodes to make it works on any keyboard layout.
|
||||||
|
-- This should map on the top row of your keyboard, usually 1 to 9.
|
||||||
|
for i = 1, 9 do
|
||||||
|
globalkeys = awful.util.table.join(globalkeys,
|
||||||
|
-- View tag only.
|
||||||
|
awful.key({ modkey }, "#" .. i + 9,
|
||||||
|
function ()
|
||||||
|
local screen = awful.screen.focused()
|
||||||
|
local tag = screen.tags[i]
|
||||||
|
if tag then
|
||||||
|
tag:view_only()
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
{description = "view tag #"..i, group = "tag"}),
|
||||||
|
-- Toggle tag display.
|
||||||
|
awful.key({ modkey, "Control" }, "#" .. i + 9,
|
||||||
|
function ()
|
||||||
|
local screen = awful.screen.focused()
|
||||||
|
local tag = screen.tags[i]
|
||||||
|
if tag then
|
||||||
|
awful.tag.viewtoggle(tag)
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
{description = "toggle tag #" .. i, group = "tag"}),
|
||||||
|
-- Move client to tag.
|
||||||
|
awful.key({ modkey, "Shift" }, "#" .. i + 9,
|
||||||
|
function ()
|
||||||
|
if client.focus then
|
||||||
|
local tag = client.focus.screen.tags[i]
|
||||||
|
if tag then
|
||||||
|
client.focus:move_to_tag(tag)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
{description = "move focused client to tag #"..i, group = "tag"}),
|
||||||
|
-- Toggle tag on focused client.
|
||||||
|
awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
|
||||||
|
function ()
|
||||||
|
if client.focus then
|
||||||
|
local tag = client.focus.screen.tags[i]
|
||||||
|
if tag then
|
||||||
|
client.focus:toggle_tag(tag)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
{description = "toggle focused client on tag #" .. i, group = "tag"})
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
clientbuttons = awful.util.table.join(
|
||||||
|
awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
|
||||||
|
awful.button({ modkey }, 1, awful.mouse.client.move),
|
||||||
|
awful.button({ modkey }, 3, awful.mouse.client.resize))
|
||||||
|
|
||||||
|
-- Set keys
|
||||||
|
root.keys(globalkeys)
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Rules
|
||||||
|
-- Rules to apply to new clients (through the "manage" signal).
|
||||||
|
awful.rules.rules = {
|
||||||
|
-- All clients will match this rule.
|
||||||
|
{ rule = { },
|
||||||
|
properties = { border_width = beautiful.border_width,
|
||||||
|
border_color = beautiful.border_normal,
|
||||||
|
focus = awful.client.focus.filter,
|
||||||
|
raise = true,
|
||||||
|
keys = clientkeys,
|
||||||
|
buttons = clientbuttons,
|
||||||
|
screen = awful.screen.preferred,
|
||||||
|
placement = awful.placement.no_overlap+awful.placement.no_offscreen
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
-- Floating clients.
|
||||||
|
{ rule_any = {
|
||||||
|
instance = {
|
||||||
|
"DTA", -- Firefox addon DownThemAll.
|
||||||
|
"copyq", -- Includes session name in class.
|
||||||
|
},
|
||||||
|
class = {
|
||||||
|
"Arandr",
|
||||||
|
"Gpick",
|
||||||
|
"Kruler",
|
||||||
|
"MessageWin", -- kalarm.
|
||||||
|
"Sxiv",
|
||||||
|
"Wpa_gui",
|
||||||
|
"pinentry",
|
||||||
|
"veromix",
|
||||||
|
"xtightvncviewer"},
|
||||||
|
|
||||||
|
name = {
|
||||||
|
"Event Tester", -- xev.
|
||||||
|
},
|
||||||
|
role = {
|
||||||
|
"AlarmWindow", -- Thunderbird's calendar.
|
||||||
|
"pop-up", -- e.g. Google Chrome's (detached) Developer Tools.
|
||||||
|
}
|
||||||
|
}, properties = { floating = true }},
|
||||||
|
|
||||||
|
-- Add titlebars to normal clients and dialogs
|
||||||
|
{ rule_any = {type = { "normal", "dialog" }
|
||||||
|
}, properties = { titlebars_enabled = false }
|
||||||
|
},
|
||||||
|
|
||||||
|
-- Set Firefox to always map on the tag named "2" on screen 1.
|
||||||
|
-- { rule = { class = "Firefox" },
|
||||||
|
-- properties = { screen = 1, tag = "2" } },
|
||||||
|
}
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Signals
|
||||||
|
-- Signal function to execute when a new client appears.
|
||||||
|
client.connect_signal("manage", function (c)
|
||||||
|
-- Set the windows at the slave,
|
||||||
|
-- i.e. put it at the end of others instead of setting it master.
|
||||||
|
-- if not awesome.startup then awful.client.setslave(c) end
|
||||||
|
|
||||||
|
if awesome.startup and
|
||||||
|
not c.size_hints.user_position
|
||||||
|
and not c.size_hints.program_position then
|
||||||
|
-- Prevent clients from being unreachable after screen count changes.
|
||||||
|
awful.placement.no_offscreen(c)
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
|
||||||
|
-- Add a titlebar if titlebars_enabled is set to true in the rules.
|
||||||
|
client.connect_signal("request::titlebars", function(c)
|
||||||
|
-- buttons for the titlebar
|
||||||
|
local buttons = awful.util.table.join(
|
||||||
|
awful.button({ }, 1, function()
|
||||||
|
client.focus = c
|
||||||
|
c:raise()
|
||||||
|
awful.mouse.client.move(c)
|
||||||
|
end),
|
||||||
|
awful.button({ }, 3, function()
|
||||||
|
client.focus = c
|
||||||
|
c:raise()
|
||||||
|
awful.mouse.client.resize(c)
|
||||||
|
end)
|
||||||
|
)
|
||||||
|
|
||||||
|
awful.titlebar(c) : setup {
|
||||||
|
{ -- Left
|
||||||
|
awful.titlebar.widget.iconwidget(c),
|
||||||
|
buttons = buttons,
|
||||||
|
layout = wibox.layout.fixed.horizontal
|
||||||
|
},
|
||||||
|
{ -- Middle
|
||||||
|
{ -- Title
|
||||||
|
align = "center",
|
||||||
|
widget = awful.titlebar.widget.titlewidget(c)
|
||||||
|
},
|
||||||
|
buttons = buttons,
|
||||||
|
layout = wibox.layout.flex.horizontal
|
||||||
|
},
|
||||||
|
{ -- Right
|
||||||
|
awful.titlebar.widget.floatingbutton (c),
|
||||||
|
awful.titlebar.widget.maximizedbutton(c),
|
||||||
|
awful.titlebar.widget.stickybutton (c),
|
||||||
|
awful.titlebar.widget.ontopbutton (c),
|
||||||
|
awful.titlebar.widget.closebutton (c),
|
||||||
|
layout = wibox.layout.fixed.horizontal()
|
||||||
|
},
|
||||||
|
layout = wibox.layout.align.horizontal
|
||||||
|
}
|
||||||
|
end)
|
||||||
|
|
||||||
|
-- Enable sloppy focus, so that focus follows mouse.
|
||||||
|
client.connect_signal("mouse::enter", function(c)
|
||||||
|
if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
|
||||||
|
and awful.client.focus.filter(c) then
|
||||||
|
client.focus = c
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
|
||||||
|
client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
|
||||||
|
client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- Au démarrage
|
||||||
|
-- awful.util.spawn_with_shell("/home/taeradan/bin/xrandr-auto")
|
||||||
|
-- awful.util.spawn_with_shell("gnome-sound-applet")
|
||||||
|
-- awful.util.spawn_with_shell("nm-applet")
|
||||||
@@ -31,7 +31,7 @@ in
|
|||||||
systemPackages = with pkgs; [
|
systemPackages = with pkgs; [
|
||||||
bind # utilisé pour les utilitaires comme dig
|
bind # utilisé pour les utilitaires comme dig
|
||||||
byobu # permet de se déconnecter d'un terminal sans l'aréter
|
byobu # permet de se déconnecter d'un terminal sans l'aréter
|
||||||
exfat # Pour monter les FAT avec Fuse
|
dhcp # client dhcp
|
||||||
git gitAndTools.gitSVN gitAndTools.tig gti # outil de gestion de version
|
git gitAndTools.gitSVN gitAndTools.tig gti # outil de gestion de version
|
||||||
gnumake # pour décrire les recettes de compilation
|
gnumake # pour décrire les recettes de compilation
|
||||||
gnupg # GPG
|
gnupg # GPG
|
||||||
@@ -40,8 +40,6 @@ in
|
|||||||
lsb-release # pour les scripts qui utilisent cet outil
|
lsb-release # pour les scripts qui utilisent cet outil
|
||||||
#libressl # librairie pour faire du TLS et les algorithmes de crypto par OpenBSD
|
#libressl # librairie pour faire du TLS et les algorithmes de crypto par OpenBSD
|
||||||
ncdu # outil pour voir l'espace utilisé
|
ncdu # outil pour voir l'espace utilisé
|
||||||
nmap # outil de scan de port réseau
|
|
||||||
mtr # outil de diagnostic réseau
|
|
||||||
par2cmdline # outil de récupération de fichiers corrompus - .par2
|
par2cmdline # outil de récupération de fichiers corrompus - .par2
|
||||||
p7zip # compression de fichier
|
p7zip # compression de fichier
|
||||||
parted # partitionnement de disque
|
parted # partitionnement de disque
|
||||||
@@ -51,7 +49,7 @@ in
|
|||||||
python # python -- python -m SimpleHTTPServer 8000
|
python # python -- python -m SimpleHTTPServer 8000
|
||||||
python34Packages.glances # monitoring
|
python34Packages.glances # monitoring
|
||||||
pwgen # générateur de mot de passe
|
pwgen # générateur de mot de passe
|
||||||
rtorrent # outil de téléchargement de torrent & magnet
|
rtorrent # TODO outil de téléchargement de torrent & magnet
|
||||||
tmux # nécessaire pour byobu
|
tmux # nécessaire pour byobu
|
||||||
tree # affiche une arborescence de fichiers et dossiers
|
tree # affiche une arborescence de fichiers et dossiers
|
||||||
usbutils
|
usbutils
|
||||||
@@ -67,6 +65,8 @@ in
|
|||||||
tree1 = "tree -d -L 1";
|
tree1 = "tree -d -L 1";
|
||||||
tree2 = "tree -d -L 2";
|
tree2 = "tree -d -L 2";
|
||||||
tree3 = "tree -d -L 3";
|
tree3 = "tree -d -L 3";
|
||||||
|
# https://gist.github.com/amitchhajer/4461043 : Count number of code lines in git repository per user
|
||||||
|
#git-loc = "git ls-files | while read f; do git blame --line-porcelain "${f}" | grep '^author '; done | sort -f | uniq -ic | sort -n";
|
||||||
grep = "grep --color=auto";
|
grep = "grep --color=auto";
|
||||||
vi = "vim";
|
vi = "vim";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -22,36 +22,39 @@ in
|
|||||||
|
|
||||||
# commandées par config-generator
|
# commandées par config-generator
|
||||||
## option de configuration spécifique
|
## option de configuration spécifique
|
||||||
./app-awesome.nix # pour les profils awesome
|
./app-awesome.nix # pour les profils awesome
|
||||||
./app-cao.nix # de conception assisté par ordinateur & modélisation
|
./app-cao.nix # de conception assisté par ordinateur & modélisation
|
||||||
./app-cartographie.nix # utilisée pour manipuler les données géographiques & cartes
|
./app-cartographie.nix # manipuler les données géographiques & cartes
|
||||||
./app-developpement.nix # utilisée pour développer des programmes/scripts
|
./app-developpement.nix # développer des programmes/scripts
|
||||||
./app-docker.nix # pour activer docker
|
./app-developpement-haskell.nix # développer en haskell
|
||||||
./app-edition-musique.nix # pour modifier les fichiers musicaux
|
./app-developpement-java.nix # développer en java
|
||||||
./app-edition-photo.nix # pour modifier les photos & assimilé
|
./app-developpement-rust.nix # développer en rust
|
||||||
./app-edition-video.nix # pour modifier les vidéos
|
./app-docker.nix # activer docker
|
||||||
./app-jeux.nix # permettant de jouer ;)
|
./app-edition-musique.nix # modifier les fichiers musicaux
|
||||||
./app-virtualbox.nix # pour exploiter virtualbox
|
./app-edition-photo.nix # modifier les photos & assimilé
|
||||||
./auto-upgrade.nix # mise à jour automatique du système
|
./app-edition-video.nix # modifier les vidéos
|
||||||
./laptop.nix # appli & configuration adaptée pour un PC portable
|
./app-jeux.nix # jouer, tout simplement ;)
|
||||||
./print.nix # configuration de base de cups
|
./app-virtualbox.nix # activer virtualbox
|
||||||
./service-elasticsearch.nix # service de stockage et recher de données
|
./auto-upgrade.nix # mise à jour automatique du système
|
||||||
./service-hydra-build.nix # service de construction de paquet. -> la machine compile des paquets
|
./laptop.nix # appli & configuration adaptée pour un PC portable
|
||||||
./service-hydra-core.nix # service pour l'instance d'hydra
|
./print.nix # configuration de base de cups
|
||||||
./service-kibana.nix # service de visualisation de données stockées dans elasticsearch
|
./service-elasticsearch.nix # service de stockage et recher de données
|
||||||
./service-laptop.nix # services spécifiques aux pc portables
|
./service-hydra-build.nix # service de construction de paquet. -> la machine compile des paquets
|
||||||
./service-locate.nix # service locate
|
./service-hydra-core.nix # service pour l'instance d'hydra
|
||||||
./swap.nix # définition de l'utilisation du swap
|
./service-kibana.nix # service de visualisation de données stockées dans elasticsearch
|
||||||
|
./service-laptop.nix # services spécifiques aux pc portables
|
||||||
|
./service-locate.nix # service locate
|
||||||
|
./swap.nix # définition de l'utilisation du swap
|
||||||
|
|
||||||
## if isDesktop
|
## if isDesktop
|
||||||
./app-adminsys.nix # pour gérer le système dans son ensemble et les services
|
./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-bureautique.nix # dédiée à la bureautique (traitement de texte, dessin, ...)
|
||||||
./app-client-internet.nix # pour accéder & utiliser des ressources par le réseau
|
./app-client-internet.nix # pour accéder & utiliser des ressources par le réseau
|
||||||
./app-multimedia.nix # pour gérer le son, l'image et la vidéo
|
./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-securite.nix # relatives à la sécurité (chiffrement, gpg, mots de passe, ...)
|
./app-securite.nix # relatives à la sécurité (chiffrement, gpg, mots de passe, ...)
|
||||||
./hardware-scanner.nix # utilisation d'un scanner
|
./hardware-scanner.nix # utilisation d'un scanner
|
||||||
./service-pulseaudio.nix # activation du serveur audio
|
./service-pulseaudio.nix # activation du serveur audio
|
||||||
./service-x11.nix # activation du serveur graphique X
|
./service-x11.nix # activation du serveur graphique X
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,8 +5,23 @@ let
|
|||||||
cfg = config.r6d.config-generator;
|
cfg = config.r6d.config-generator;
|
||||||
computers = config.r6d.computers;
|
computers = config.r6d.computers;
|
||||||
profiles = config.r6d.profiles;
|
profiles = config.r6d.profiles;
|
||||||
in
|
|
||||||
|
|
||||||
|
|
||||||
|
#### https://github.com/NixOS/hydra/issues/413
|
||||||
|
# Note that we use 'import <nixpkgs> {}' instead of 'pkgs'.
|
||||||
|
# If we use the latter we get an infinite recursion
|
||||||
|
# because we include hydra-src in the module imports below which in turn defines the 'pkgs' value.
|
||||||
|
#hydra-src = (import <nixpkgs> {}).fetchgit {
|
||||||
|
# url = "https://github.com/NixOS/hydra.git";
|
||||||
|
# rev = "de55303197d997c4fc5503b52b1321ae9528583d";
|
||||||
|
# sha256 = "0nimqsbpjxfwha6d5gp6a7jh50i83z1llmx30da4bscsic8z1xly";
|
||||||
|
#};
|
||||||
|
|
||||||
|
#hydra-src-pkg = lib.mkDefault ((import (hydra-src + /release.nix) {}).build.x86_64-linux);
|
||||||
|
|
||||||
|
# information pour l'état de hydra :
|
||||||
|
# hydra-queue-runner --status | json_pp
|
||||||
|
in
|
||||||
mkIf cfg.hydra-core {
|
mkIf cfg.hydra-core {
|
||||||
|
|
||||||
# Paquets
|
# Paquets
|
||||||
@@ -43,8 +58,13 @@ mkIf cfg.hydra-core {
|
|||||||
listenHost = "localhost";
|
listenHost = "localhost";
|
||||||
minimumDiskFree = 50; # Go
|
minimumDiskFree = 50; # Go
|
||||||
smtpHost = "localhost";
|
smtpHost = "localhost";
|
||||||
|
#package = hydra-src-pkg ;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#systemd.services.hydra-evaluator = {
|
||||||
|
# path = [ pkgs.nettools config.services.hydra.package ];
|
||||||
|
#};
|
||||||
|
|
||||||
## Ménage
|
## Ménage
|
||||||
#nix.gc.automatic = true;
|
#nix.gc.automatic = true;
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ mkIf true {
|
|||||||
enable = true;
|
enable = true;
|
||||||
hosts = ''
|
hosts = ''
|
||||||
[${config.networking.hostName}]
|
[${config.networking.hostName}]
|
||||||
address localhost
|
address 127.0.0.1
|
||||||
'';
|
'';
|
||||||
extraGlobalConfig = ''
|
extraGlobalConfig = ''
|
||||||
contact.email.command mail -s "Munin notification for ''${var:host}" root@${config.networking.hostName}
|
contact.email.command mail -s "Munin notification for ''${var:host}" root@${config.networking.hostName}
|
||||||
@@ -36,7 +36,7 @@ mkIf true {
|
|||||||
# Réseau
|
# Réseau
|
||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
allowedTCPPorts = [
|
allowedTCPPorts = [
|
||||||
8000
|
#8000
|
||||||
];
|
];
|
||||||
allowedUDPPorts = [
|
allowedUDPPorts = [
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ mkIf profiles.isDesktop {
|
|||||||
hardware.pulseaudio = {
|
hardware.pulseaudio = {
|
||||||
enable = true;
|
enable = true;
|
||||||
support32Bit = true;
|
support32Bit = true;
|
||||||
|
daemon.config = { flat-volumes = "no"; };
|
||||||
};
|
};
|
||||||
environment.etc."pulse/daemon.conf".text = "flat-volumes = no";
|
#environment.etc."pulse/daemon.conf".text = "flat-volumes = no";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user