Compare commits

..

No commits in common. "60f89aeaec6c5857e6f742c9dd6a4268d71ae6c5" and "f61980caefda3e126acd1e62c32cf8ce477b5c84" have entirely different histories.

6 changed files with 122 additions and 92 deletions

View File

@ -10,6 +10,7 @@
<nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix> <nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix>
./hardware-configuration.nix ./hardware-configuration.nix
./services.nix ./services.nix
./scanner.nix
./packages.nix ./packages.nix
../modules/prometheus-node.nix ../modules/prometheus-node.nix
]; ];
@ -20,44 +21,17 @@
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
}; };
programs = { hardware.logitech.wireless.enable = true;
zsh.enable = true; hardware.logitech.wireless.enableGraphical = true;
fish.enable = true;
ssh = { services.printing.enable = true;
setXAuthLocation = true; services.printing.drivers = [ pkgs.brlaser ];
forwardX11 = true;
# Video acceleration
nixpkgs.config.packageOverrides = pkgs: {
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
}; };
}; hardware.opengl = {
# hardware
hardware = {
logitech = {
wireless.enable = true;
wireless.enableGraphical = true;
};
pulseaudio = {
enable = true;
extraConfig = "
load-module module-switch-on-connect
";
};
sane = {
enable = true;
brscan4 = {
enable = true;
};
dsseries = {
enable = true;
};
};
bluetooth = {
enable = true;
settings = {
General = {
Enable = "Source,Sink,Media,Socket";
};
};
};
opengl = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-media-driver # LIBVA_DRIVER_NAME=iHD intel-media-driver # LIBVA_DRIVER_NAME=iHD
@ -66,13 +40,29 @@
libvdpau-va-gl libvdpau-va-gl
]; ];
}; };
# hardware.opengl.extraPackages;
# Enable Bluetooth
hardware.bluetooth.enable = true;
hardware.bluetooth.settings = {
General = {
Enable = "Source,Sink,Media,Socket";
}; };
# Video acceleration
nixpkgs.config.packageOverrides = pkgs: {
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
}; };
services.blueman.enable = true;
hardware.pulseaudio.enable = true;
hardware.pulseaudio.extraConfig = "
load-module module-switch-on-connect
";
# Enable sane and brscan4 for DSP-7055
hardware = {
sane = {
enable = true;
brscan4 = {
enable = true;
};
};
};
security = { security = {
apparmor.enable = true; apparmor.enable = true;
pam = { pam = {
@ -86,7 +76,6 @@
}; };
}; };
}; };
networking.hostName = "Alexos"; # Define your hostname. networking.hostName = "Alexos"; # Define your hostname.
# Set your time zone. # Set your time zone.
@ -136,12 +125,7 @@
# clean /tmp at boot # clean /tmp at boot
boot.cleanTmpDir = true; boot.cleanTmpDir = true;
nixpkgs.config = {
allowUnfree = true;
};
system.stateVersion = "21.05"; # Did you read the comment? system.stateVersion = "21.05"; # Did you read the comment?
users = { users = {
users.ntp.group = "ntp"; users.ntp.group = "ntp";
groups.ntp = {}; groups.ntp = {};

View File

@ -6,7 +6,7 @@
wget lshw openssh bc scrot zsh unzip zip file which vim gnumake tmux wget lshw openssh bc scrot zsh unzip zip file which vim gnumake tmux
gitAndTools.gitFull gitAndTools.gitFull
dmenu i3lock dmenu i3lock polybar
mplayer mplayer
pkgs.dconf pkgs.dconf
pulseaudio pavucontrol paprefs pulseaudio pavucontrol paprefs

View File

@ -0,0 +1,14 @@
{ config, lib, pkgs, ... } : {
#<nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix>:w
hardware.sane = {
enable = true;
dsseries.enable = true;
};
# Allow unfree software for libsane-dsseries only
nixpkgs.config.allowUnfreePredicate = (pkg: builtins.elem (builtins.parseDrvName pkg.pname).name
[
"libsane-dsseries"
]);
}

View File

@ -1,9 +1,26 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
services.printing.enable = true;
services.printing.drivers = [ pkgs.brlaser ]; hardware = {
services.blueman.enable = true; pulseaudio = {
enable = true;
};
};
# upgrade
programs = {
mtr.enable = true ;
zsh.enable = true;
fish.enable = true;
ssh = {
setXAuthLocation = true;
forwardX11 = true;
};
};
# SERVICES # SERVICES
services = { services = {
@ -31,8 +48,7 @@
CPU_MAX_PERF_ON_BAT=60; CPU_MAX_PERF_ON_BAT=60;
}; };
}; };
# ADD group mlocate to your user
# ADD group plocate to your user
locate = { locate = {
enable = true; enable = true;
locate = pkgs.plocate; locate = pkgs.plocate;
@ -40,6 +56,7 @@
localuser = null; localuser = null;
}; };
xserver = { xserver = {
enable = true; enable = true;
autorun = true; autorun = true;
@ -53,8 +70,8 @@
enable = true; enable = true;
time = 10; time = 10;
locker = "${pkgs.i3lock}/bin/i3lock -i /home/alexandre/images/coffee_time.png"; locker = "${pkgs.i3lock}/bin/i3lock -i /home/alexandre/images/coffee_time.png";
#notifier = "${pkgs.libnotify}/bin/notify-send 'Locking in 10 seconds'";
}; };
displayManager.defaultSession = "none+i3"; displayManager.defaultSession = "none+i3";
layout = "fr"; layout = "fr";
xkbOptions = "eurosign:e"; xkbOptions = "eurosign:e";
@ -64,9 +81,14 @@
xfce.thunarPlugins = with pkgs; [ xfce.thunar-volman xfce.thunar-archive-plugin ]; xfce.thunarPlugins = with pkgs; [ xfce.thunar-volman xfce.thunar-archive-plugin ];
}; };
}; };
udev.extraRules = '' udev.extraRules = ''
ACTION=="remove", ENV{ID_BUS}=="usb", ENV{ID_VENDOR_ID}=="1050", ENV{ID_MODEL_ID}=="0407", RUN+="${pkgs.i3lock}/bin/i3lock -i /home/alexandre/images/coffee_time.png"; ACTION=="remove", ENV{ID_VENDOR_ID}=="1050", ENV{ID_MODEL_ID}=="0407", RUN+="${pkgs.i3lock}/bin/i3lock -i /home/alexandre/images/coffee_time.png";
''; '';
}; };
nixpkgs.config = {
allowUnfree = true;
};
} }

View File

@ -0,0 +1,11 @@
{ config, lib, pkgs, ...} : {
services = {
synergy.client = {
enable = true;
screenName = "Alexos";
serverAddress = "192.168.10.106";
autoStart = true;
};
};
}

View File

@ -47,7 +47,6 @@
vimPlugins.vim-markdown-composer vimPlugins.vim-markdown-composer
neovim neovim
python3 python3
mtr
ferdi ferdi
]; ];
} }