Compare commits
5 Commits
2016-08-02
...
2016-08-05
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eaa35ac70e | ||
| 2bcc6944b2 | |||
| 013b83c9a0 | |||
| a84ca742de | |||
| 256ae50aea |
4
base.nix
4
base.nix
@@ -2,7 +2,11 @@
|
||||
|
||||
{
|
||||
imports = [
|
||||
# recettes
|
||||
./base/base.nix
|
||||
./desktop/desktop.nix
|
||||
|
||||
# moulinette de configuration
|
||||
./config-generator.nix
|
||||
];
|
||||
}
|
||||
|
||||
@@ -9,6 +9,14 @@
|
||||
./services.nix
|
||||
|
||||
# inclusion conditionnelle
|
||||
./config-generator.nix
|
||||
./activation-manuelle/auto-upgrade.nix
|
||||
./activation-manuelle/laptop.nix
|
||||
./activation-manuelle/locate.nix
|
||||
./activation-manuelle/fail2ban.nix
|
||||
./activation-manuelle/nix-serve-client.nix
|
||||
./activation-manuelle/nix-serve-server.nix
|
||||
./activation-manuelle/print.nix
|
||||
./activation-manuelle/swap.nix
|
||||
./activation-manuelle/users.nix
|
||||
];
|
||||
}
|
||||
|
||||
@@ -9,19 +9,7 @@ let
|
||||
host = config.networking.hostName;
|
||||
in
|
||||
|
||||
{
|
||||
imports = [
|
||||
./activation-manuelle/auto-upgrade.nix
|
||||
./activation-manuelle/laptop.nix
|
||||
./activation-manuelle/locate.nix
|
||||
./activation-manuelle/fail2ban.nix
|
||||
./activation-manuelle/nix-serve-client.nix
|
||||
./activation-manuelle/nix-serve-server.nix
|
||||
./activation-manuelle/print.nix
|
||||
./activation-manuelle/swap.nix
|
||||
./activation-manuelle/users.nix
|
||||
];
|
||||
|
||||
{
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
@@ -171,6 +159,10 @@ in
|
||||
isPrunetwork = true;
|
||||
isServer = true;
|
||||
};
|
||||
|
||||
r6d.config-generator = {
|
||||
docker = true;
|
||||
};
|
||||
})
|
||||
(mkIf comp.isRadx {
|
||||
r6d.profiles = {
|
||||
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)
|
||||
|
||||
@@ -14,6 +14,7 @@ mkIf profiles.isDesktop {
|
||||
expat
|
||||
gpsbabel # pour convettir les données des GPS
|
||||
josm # outil de contribution à OpenStreetMap
|
||||
qgis # client lourd de manipulation de données géographiques
|
||||
viking # analyse de topo, gestion de données GPS
|
||||
];
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ in
|
||||
./activation-manuelle/app-jeux.nix # permettant de jouer ;)
|
||||
./activation-manuelle/app-virtualbox.nix # pour exploiter virtualbox
|
||||
./activation-manuelle/laptop.nix # appli & configuration adaptée pour un PC portable$
|
||||
./activation-manuelle/xmonad.nix # gestionnaire de fenêtres xmonad
|
||||
./activation-manuelle/xmonad/xmonad.nix # gestionnaire de fenêtres xmonad
|
||||
# installées systématiquement
|
||||
./desktop-minimal.nix
|
||||
./app-adminsys.nix # pour gérer le système dans son ensemble et les services
|
||||
|
||||
Reference in New Issue
Block a user