Compare commits
12 Commits
2017-02-11
...
2017-02-25
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8845300555 | ||
| dce783708c | |||
| f2305d0a81 | |||
| a6e957afae | |||
| edfac07129 | |||
| 7799eb106f | |||
|
|
754a1ec934 | ||
|
|
80f7b32af6 | ||
|
|
5cd1cd0e6f | ||
|
|
fae4a8237c | ||
|
|
5f09c0896d | ||
|
|
2244b917ac |
@@ -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
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -20,6 +20,7 @@ mkIf cfg.developpement-haskell {
|
||||
haskellPackages.stylish-haskell # qualité de code
|
||||
haskellPackages.hindent
|
||||
haskellPackages.hlint
|
||||
haskellPackages.threadscope
|
||||
|
||||
# Application perso
|
||||
haskellPackages.hahp
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user