Compare commits
13 Commits
2016-08-04
...
2016-08-08
| Author | SHA1 | Date | |
|---|---|---|---|
| 3d7b3f1106 | |||
|
|
71c89d7272 | ||
|
|
e974e8949d | ||
| a8b5ee97c6 | |||
| 45a4bc9a28 | |||
|
|
b998bea22e | ||
|
|
a356a2f5fa | ||
|
|
0e5137a236 | ||
|
|
65064f7f8b | ||
|
|
12e3f20a8e | ||
| a05ef8fbdc | |||
| e6fc844aaf | |||
|
|
eaa35ac70e |
File diff suppressed because one or more lines are too long
@@ -19,6 +19,7 @@
|
|||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [
|
networking.firewall.allowedTCPPorts = [
|
||||||
# TODO configurer les bon ports lors de l'ouverture du service
|
# TODO configurer les bon ports lors de l'ouverture du service
|
||||||
|
8000
|
||||||
];
|
];
|
||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ in
|
|||||||
murmur = mkEnableOption "Profil pour activer un serveur Mumble (murmur)";
|
murmur = mkEnableOption "Profil pour activer un serveur Mumble (murmur)";
|
||||||
nix-serve-client= mkEnableOption "Profil pour que la machine soit un client de cache nix.";
|
nix-serve-client= mkEnableOption "Profil pour que la machine soit un client de cache nix.";
|
||||||
nix-serve-server= mkEnableOption "Profil pour que la machine soit un serveur de cache nix.";
|
nix-serve-server= mkEnableOption "Profil pour que la machine soit un serveur de cache nix.";
|
||||||
|
online-ipv6 = mkEnableOption "Profil pour activer l'IPv6 de online.net";
|
||||||
print = mkEnableOption "Profil pour activer cups & pouvoir imprimer.";
|
print = mkEnableOption "Profil pour activer cups & pouvoir imprimer.";
|
||||||
rabbitmq = mkEnableOption "Profil pour activer le service de messagerie AMQP.";
|
rabbitmq = mkEnableOption "Profil pour activer le service de messagerie AMQP.";
|
||||||
swap = mkEnableOption "Profil pour que le swap soit activé.";
|
swap = mkEnableOption "Profil pour que le swap soit activé.";
|
||||||
@@ -240,6 +241,7 @@ in
|
|||||||
r6d.config-generator = {
|
r6d.config-generator = {
|
||||||
fail2ban = true;
|
fail2ban = true;
|
||||||
murmur = true;
|
murmur = true;
|
||||||
|
online-ipv6 = true;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|||||||
32
desktop/activation-manuelle/xmonad/xmobarrc
Normal file
32
desktop/activation-manuelle/xmonad/xmobarrc
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
Config { font = "xft:Monospace-10:bold"
|
||||||
|
, additionalFonts = []
|
||||||
|
, border = NoBorder
|
||||||
|
, bgColor = "black"
|
||||||
|
, fgColor = "white"
|
||||||
|
, alpha = 255
|
||||||
|
, position = Top
|
||||||
|
--, textOffset = -1
|
||||||
|
--, iconOffset = -1
|
||||||
|
, lowerOnStart = False
|
||||||
|
, pickBroadest = False
|
||||||
|
, persistent = False
|
||||||
|
, hideOnStart = False
|
||||||
|
, iconRoot = "."
|
||||||
|
, allDesktops = True
|
||||||
|
, overrideRedirect = True
|
||||||
|
, commands = [ Run DynNetwork ["-L","0","-H","32","--normal","green","--high","red"] 10
|
||||||
|
, Run Cpu ["-L","3","-H","50","--normal","green","--high","red"] 10
|
||||||
|
, Run Memory ["-t","Mem: <usedratio>%"] 10
|
||||||
|
, Run Battery ["-t", "Batt: <left>%, <watts>W -> <timeleft>"] 10
|
||||||
|
, Run Date "%F %H:%M:%S" "date" 10
|
||||||
|
--, Run Date "%a %b %_d %Y %H:%M:%S" "date" 10
|
||||||
|
, Run StdinReader
|
||||||
|
, Run Brightness [] 10
|
||||||
|
, Run Volume "default" "Master" [] 10
|
||||||
|
]
|
||||||
|
, sepChar = "%"
|
||||||
|
, alignSep = "}{"
|
||||||
|
, template = " %StdinReader% }\
|
||||||
|
\{ %cpu% | %memory% | %dynnetwork% | %battery% | %bright% | %default:Master% | <fc=#ee9a00>%date%</fc>"
|
||||||
|
}
|
||||||
|
|
||||||
47
desktop/activation-manuelle/xmonad/xmonad.hs
Normal file
47
desktop/activation-manuelle/xmonad/xmonad.hs
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
import Graphics.X11.ExtraTypes.XF86
|
||||||
|
import XMonad
|
||||||
|
import XMonad.Config.Desktop
|
||||||
|
import XMonad.Config.Azerty
|
||||||
|
import XMonad.Hooks.DynamicLog
|
||||||
|
import XMonad.Util.EZConfig
|
||||||
|
|
||||||
|
-- # Ligne principale
|
||||||
|
|
||||||
|
main = xmonad =<< xmobar myConfig
|
||||||
|
--main = xmonad =<< statusBar myBar myPP toggleStrutsKey myConfig
|
||||||
|
|
||||||
|
-- # Réglages de xmonad
|
||||||
|
|
||||||
|
myConfig = azertyConfig
|
||||||
|
{ terminal = "sakura"
|
||||||
|
, modMask = mod4Mask
|
||||||
|
, borderWidth = 2
|
||||||
|
, workspaces = myWorkspaces
|
||||||
|
} `additionalKeys` myKeys `removeKeys` unusefulKeys
|
||||||
|
|
||||||
|
myWorkspaces = ["1:mail","2:chat","3:web","4","5","6","7","8", "9:system"]
|
||||||
|
|
||||||
|
myKeys = [ ((0, xF86XK_MonBrightnessUp), spawn "xbacklight +10") -- +brightness
|
||||||
|
, ((0, xF86XK_MonBrightnessDown), spawn "xbacklight -10") -- -brightness
|
||||||
|
, ((0, xF86XK_AudioRaiseVolume), spawn "amixer set Master 3%+") -- +volume
|
||||||
|
, ((0, xF86XK_AudioLowerVolume), spawn "amixer set Master 3%-") -- -volume
|
||||||
|
, ((0, xF86XK_AudioMute), spawn "amixer set Master toggle") -- mute volume
|
||||||
|
, ((0, xF86XK_AudioPlay), spawn "cmus-remote -u") -- cmus play/stop
|
||||||
|
, ((0, xF86XK_AudioPrev), spawn "cmus-remote -r") -- cmus next
|
||||||
|
, ((0, xF86XK_AudioNext), spawn "cmus-remote -n") -- cmus previous
|
||||||
|
]
|
||||||
|
|
||||||
|
unusefulKeys = []
|
||||||
|
|
||||||
|
-- # Réglages de xmobar
|
||||||
|
|
||||||
|
myBar = "xmobar"
|
||||||
|
|
||||||
|
-- Custom PP, configure it as you like. It determines what is being written to the bar.
|
||||||
|
myPP = xmobarPP
|
||||||
|
{ ppCurrent = xmobarColor "black" "yellow" . wrap " " " "
|
||||||
|
}
|
||||||
|
|
||||||
|
-- Key binding to toggle the gap for the bar.
|
||||||
|
toggleStrutsKey XConfig {XMonad.modMask = modMask} = (modMask, xK_b)
|
||||||
|
|
||||||
@@ -29,9 +29,6 @@ mkIf profiles.isDesktop {
|
|||||||
lz4
|
lz4
|
||||||
lzop
|
lzop
|
||||||
|
|
||||||
# Mail
|
|
||||||
postfix
|
|
||||||
|
|
||||||
# Système de fichier
|
# Système de fichier
|
||||||
curlftpfs
|
curlftpfs
|
||||||
gparted
|
gparted
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ in
|
|||||||
./activation-manuelle/app-jeux.nix # permettant de jouer ;)
|
./activation-manuelle/app-jeux.nix # permettant de jouer ;)
|
||||||
./activation-manuelle/app-virtualbox.nix # pour exploiter virtualbox
|
./activation-manuelle/app-virtualbox.nix # pour exploiter virtualbox
|
||||||
./activation-manuelle/laptop.nix # appli & configuration adaptée pour un PC portable$
|
./activation-manuelle/laptop.nix # appli & configuration adaptée pour un PC portable$
|
||||||
./activation-manuelle/xmonad.nix # gestionnaire de fenêtres xmonad
|
./activation-manuelle/xmonad/xmonad.nix # gestionnaire de fenêtres xmonad
|
||||||
# installées systématiquement
|
# installées systématiquement
|
||||||
./desktop-minimal.nix
|
./desktop-minimal.nix
|
||||||
./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
|
||||||
|
|||||||
Reference in New Issue
Block a user