Compare commits

...

4 Commits

Author SHA1 Message Date
Alexandre LUCAZEAU f61980caef
ADD plocate group to user
ADD plocate configuration
MOD i3config : remove emacs launch, add ferdi launch, set screensaver
2022-09-14 16:53:48 +02:00
Alexandre LUCAZEAU a681c1d4de
modifié : ../../nixos/configuration.nix
modifié :         ../../nixos/packages.nix
	modifié :         i3config
	modifié :         ../dunst.nix
	modifié :         ../home.nix
	modifié :         ../packages.nix
2022-09-07 13:50:01 +02:00
Alexandre LUCAZEAU 634c91eb3e
Merge branch 'main' of git.atlanticaweb.fr:alexandre/nixos-config 2022-09-01 11:05:42 +02:00
Alexandre LUCAZEAU 3fd2175042
ADD gitconfig - initial commit 2022-08-05 14:16:06 +02:00
9 changed files with 75 additions and 22 deletions

View File

@ -12,6 +12,7 @@
./services.nix
./scanner.nix
./packages.nix
../modules/prometheus-node.nix
];
# Use the systemd-boot EFI boot loader.
@ -133,9 +134,8 @@
isNormalUser = true;
home = "/home/alexandre";
description = "alexandre";
extraGroups = [ "wheel" "networkmanager" "docker" "libvirtd" "vboxusers" "scanner" "lp" ];
extraGroups = [ "wheel" "networkmanager" "docker" "libvirtd" "vboxusers" "scanner" "lp" "plocate" ];
hashedPassword = "$6$7m77oPQxa$W9YnRLo1X2eqztBHwpoH8diHGkBno5O39AMyL9Qm8y8I6uW63H2Nwx4p239OG5zhOxA8J1lZvHTQ3hKPSP9mT/";
};
};
}

View File

@ -22,5 +22,6 @@
font-manager
utf8proc
pam_u2f
zlib
];
}

View File

@ -30,7 +30,31 @@
};
ntp.enable = true;
tlp.enable = true;
tlp = {
enable = true;
settings = {
CPU_SCALING_GOVERNOR_ON_BAT="powersave";
CPU_SCALING_GOVERNOR_ON_AC="powersave";
# The following prevents the battery from charging fully to
# preserve lifetime. Run `tlp fullcharge` to temporarily force
# full charge.
# https://linrunner.de/tlp/faq/battery.html#how-to-choose-good-battery-charge-thresholds
START_CHARGE_THRESH_BAT0=40;
STOP_CHARGE_THRESH_BAT0=50;
# 100 being the maximum, limit the speed of my CPU to reduce
# heat and increase battery usage:
CPU_MAX_PERF_ON_AC=75;
CPU_MAX_PERF_ON_BAT=60;
};
};
# ADD group mlocate to your user
locate = {
enable = true;
locate = pkgs.plocate;
interval = "hourly";
localuser = null;
};
xserver = {
@ -44,7 +68,7 @@
};
xautolock = {
enable = true;
time = 1;
time = 10;
locker = "${pkgs.i3lock}/bin/i3lock -i /home/alexandre/images/coffee_time.png";
#notifier = "${pkgs.libnotify}/bin/notify-send 'Locking in 10 seconds'";
};
@ -64,14 +88,6 @@
};
nixpkgs.config = {
#packageOverrides = pkgs: {
# polybar = pkgs.polybar.override {
# i3Support = true;
# pulseSupport = true;
# };
#};
allowUnfree = true;
};

View File

@ -129,7 +129,7 @@ bar {
bindsym $mod+$ALT+l exec i3lock -ti ~/images/coffee_time.png
# blocage automatique de l'ecran en cas d'inactivité
exec xautolock -detectsleep -time 120 -corners -locker 'i3lock -ti ~/images/coffee_time.png'
exec xautolock -detectsleep -time 1200 -corners -locker 'i3lock -ti ~/images/coffee_time.png'
# Capture d'ecran
bindsym Print exec scrot -u '%Y-%m-%d-%T_$wx$h_scrot.png' -e 'mv $f ~/Screenshots/'
@ -138,16 +138,16 @@ bindsym Print exec scrot -u '%Y-%m-%d-%T_$wx$h_scrot.png' -e 'mv $f ~/Screenshot
bindsym $mod+Return exec "LIBGL_ALWAYS_SOFTWARE=1 alacritty"
bindsym $mod+m exec "i3-sensible-terminal -e ncmpcpp"
# Assigne les applications aux workspaces
assign [class="firefox"] $ws3
assign [class="emacs"] $ws2
# programmes au démarrage
exec --no-startup-id nm-applet
exec --no-startup-id nextcloud
exec --no-startup-id blueman-applet
exec --no-startup-id i3-msg 'workspace $ws9; exec keepassxc;'
exec --no-startup-id i3-msg 'workspace $ws5; exec emacs;'
#exec --no-startup-id i3-msg 'workspace $ws5; exec emacs;'
exec --no-startup-id i3-msg 'workspace $ws1; exec alacritty;'
exec --no-startup-id i3-msg 'workspace $ws1; exec ferdi;'
exec --no-startup-id i3-msg 'workspace $ws2; exec thunderbird;'
exec --no-startup-id i3-msg 'workspace $ws3; exec firefox;'
exec --no-startup-id xset s off
exec --no-startup-id xset -dpms

View File

@ -105,7 +105,7 @@
#
# If this option is set to mouse or keyboard, the monitor option
# will be ignored.
follow = "none";
follow = "mouse";
# Should a notification popped up from history be sticky or timeout
# as if it would normally do.

View File

@ -9,8 +9,9 @@
./emacs.nix
./mails.nix
./dunst.nix
./redshift.nix
../../../modules/neovim.nix
# ./redshift.nix
# ../../../modules/neovim.nix
../../../modules/rust.nix
];
home.keyboard = {
layout = "fr";
@ -21,3 +22,4 @@
};
xsession.numlock.enable = true;
}

View File

@ -45,5 +45,8 @@
exa
bat
vimPlugins.vim-markdown-composer
neovim
python3
ferdi
];
}

View File

@ -8,7 +8,7 @@
day = 5500;
night = 4500;
};
brightness = {
settings.redshift.brightness = {
day = "1.0";
night = "0.9";
};

31
modules/.gitconfig Normal file
View File

@ -0,0 +1,31 @@
[alias]
aa = add --all
b = branch -v
bd = branch -d
bD = branch -D
br = branch
ci = commit
cim = commit -m
cima = commit -am
clr = rm -r --cached
co = checkout
cp = cherry-pick -x
d = diff -w
dc = diff --cached
nb = checkout -b
oups = commit --amend --no-edit
r = remote -v
rh = reset --hard
st = status -sb
t = tag -l
unstage = reset HEAD
uncommit = reset --soft HEAD^
pushfl = push --force-with-lease
lg = lg1
lg1 = lg1-specific --all
lg2 = lg2-specific --all
lg3 = lg3-specific --all
lg1-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)'
lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(auto)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)'