Compare commits

..

12 Commits

Author SHA1 Message Date
Yves Dubromelle
8845300555 awesome: activation du raccourci xrandr-auto + au démarrage 2017-02-25 11:51:16 +01:00
dce783708c désactivation modification IO scheduler pour SSD 2017-02-20 22:23:13 +01:00
f2305d0a81 tinc: ajout @IP dubro vivo 2017-02-20 22:22:51 +01:00
a6e957afae ménage config-generator 2017-02-20 22:21:00 +01:00
edfac07129 pru: + de paquets par défaut 2017-02-20 22:20:39 +01:00
7799eb106f haskell: ajout threadscope pour analyser les logs d'application 2017-02-19 21:28:58 +01:00
Yves Dubromelle
754a1ec934 nix-server: ajout de monstre 2017-02-12 22:58:00 +01:00
Yves Dubromelle
80f7b32af6 phenom: est un client nix-serve 2017-02-12 22:38:04 +01:00
Yves Dubromelle
5cd1cd0e6f phenom: desactivation de latitude comme source nix-serve 2017-02-12 22:10:30 +01:00
Yves Dubromelle
fae4a8237c /run/current-system/sw/bin/bash: q : commande introuvable 2017-02-12 22:06:38 +01:00
Yves Dubromelle
5f09c0896d ajout de machines fixes comme serveur nix 2017-02-12 22:04:08 +01:00
Yves Dubromelle
2244b917ac radx: activation nix-server 2017-02-12 22:00:48 +01:00
5 changed files with 22 additions and 29 deletions

View File

@@ -14,9 +14,14 @@ mkIf cfg.nix-serve-client {
requireSignedBinaryCaches = false;
binaryCaches = [
(mkIf (profiles.isDubronetwork && (! computers.isPedro) && (! computers.isRollo)) "http://nix-cache.dubronetwork.fr:5001")
#(mkIf (profiles.isDubronetwork && computers.isPhenom) "http://latitude.grudu.net:5000")
(mkIf (profiles.isDubronetwork && computers.isPhenom) "http://monstre.grudu.net:5000")
(mkIf (profiles.isDubronetwork && computers.isPhenom) "http://radx.grudu.net:5000")
(mkIf profiles.isPrunetwork "https://cache.nixos.org/")
(mkIf (profiles.isPrunetwork && !profiles.isServer) "http://nix-cache.dubronetwork.fr:5001")
(mkIf (profiles.isPrunetwork && !profiles.isServer) "http://nix-cache.dubronetwork.fr:5001")
(mkIf (profiles.isPrunetwork && computers.isRadx) "http://monstre.grudu.net:5000")
(mkIf (profiles.isPrunetwork && computers.isRadx) "http://phenom.grudu.net:5000")
];
extraOptions = ''
connect-timeout = 5

View File

@@ -103,25 +103,7 @@ in
# https://nixos.org/releases/nixos/14.12-small/nixos-14.12.374.61adf9e/manual/sec-writing-modules.html
# https://nixos.org/wiki/NixOS:extend_NixOS
config = mkMerge
[ # Unconditional stuff.
{
#r6d.config-generator.enable = true;
# r6d.computers = {
# isHydra = host == "hydra.prunetwork.fr";
# isLatitude = host == "latitude.dubronetwork.fr";
# isMonstre = host == "monstre.dubronetwork.fr";
# isNeoNomade = host == "neo-nomade.dubronetwork.fr";
# isNomade = host == "nomade.dubronetwork.fr";
# isOcean = host == "ocean.prunetwork.fr";
# isPedro = host == "pedro.dubronetwork.fr";
# isPhenom = host == "phenom.dubronetwork.fr";
# isRadx = host == "radx.prunetwork.fr";
# isRollo = host == "rollo.dubronetwork.fr";
# };
}
# Conditional stuff
[
## Définition des profils génériques
(mkIf pfl.isDesktop {
r6d.config-generator = {
@@ -197,16 +179,16 @@ in
(mkIf (pfl.isPrunetwork && pfl.isWorkstation) {
r6d.config-generator = {
cartographie = true;
#conception-assistee = true;
conception-assistee = true;
docker = true;
developpement = true;
developpement-elm = true;
#developpement-elm = true;
developpement-haskell = true;
developpement-java = true;
#developpement-rust = true;
#edition-musique = true;
developpement-rust = true;
edition-musique = true;
edition-photo = true;
#edition-video = true;
edition-video = true;
hydra-core = false; # DO NOT ENABLE ON WORKSTATION, YOU CAN CRASH YOUR SYSTEM
print = true;
#virtualbox = true;
@@ -263,6 +245,8 @@ in
hydra-builder = true;
#hydra-core = false; # DO NOT ENABLE ON WORKSTATION
kibana = true;
nix-serve-client = true;
nix-serve-server = true;
rabbitmq = true;
tincAddress = "192.168.12.3/24";
tincExtraConfig = ''
@@ -327,6 +311,8 @@ in
'';
};
})
# Dubro Vivo - St Malo
#tincAddress = "192.168.12.8/24";
(mkIf comp.isNomade{
r6d.profiles.isDubronetwork = true;
@@ -355,6 +341,7 @@ in
r6d.config-generator = {
jetbrains-licensed = true;
#hydra-core = true;
nix-serve-client = true;
nix-serve-server = true;
edition-photo = true;
tincAddress = "192.168.12.1/24";

View File

@@ -20,6 +20,7 @@ mkIf cfg.developpement-haskell {
haskellPackages.stylish-haskell # qualité de code
haskellPackages.hindent
haskellPackages.hlint
haskellPackages.threadscope
# Application perso
haskellPackages.hahp

View File

@@ -343,8 +343,8 @@ globalkeys = awful.util.table.join(
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" }, "F3", function () awful.util.spawn("pcmanfm") end),
awful.key({ modkey }, "F11", function () awful.util.spawn("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),
@@ -564,6 +564,6 @@ client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_n
-- }}}
-- Au démarrage
-- awful.util.spawn_with_shell("/home/taeradan/bin/xrandr-auto")
awful.util.spawn_with_shell("xrandr-auto || true")
-- awful.util.spawn_with_shell("gnome-sound-applet")
-- awful.util.spawn_with_shell("nm-applet")

View File

@@ -7,7 +7,7 @@ let
profiles = config.r6d.profiles;
in
{
mkIf false {
# Définition du IO Scheduler pour les SSD
services.udev.extraRules = ''
# set deadline scheduler for non-rotating disks