mirror of
https://github.com/Ascyii/nixos.git
synced 2026-01-01 06:44:26 -05:00
Fixed the other two laptops to work
This commit is contained in:
@@ -1,20 +1,34 @@
|
|||||||
{ ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|
||||||
../../user/users.nix
|
./../../user/users.nix
|
||||||
../../modules/common.nix
|
|
||||||
|
|
||||||
../../modules/hardware/battery.nix
|
./../../modules/common.nix
|
||||||
../../modules/hardware/xremap.nix
|
|
||||||
|
./../../modules/hardware/xremap.nix
|
||||||
|
./../../modules/hardware/battery.nix
|
||||||
|
|
||||||
|
./../../modules/graphics/workstation.nix
|
||||||
|
|
||||||
|
./../../modules/services/webdav.nix.nix
|
||||||
|
./../../modules/services/scanning.nix.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.hostName = "nixyos";
|
networking.hostName = "nixyos";
|
||||||
|
batMode = "single";
|
||||||
|
|
||||||
networking.networkmanager.wifi.powersave = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
system.stateVersion = "24.11"; # Did you read the comment?
|
networking = {
|
||||||
|
networkmanager = {
|
||||||
|
wifi.powersave = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Older machine
|
||||||
|
system.stateVersion = "24.11";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,33 +3,32 @@
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|
||||||
./../../user/users.nix
|
./../../user/users.nix
|
||||||
|
|
||||||
./../../modules/common.nix
|
./../../modules/common.nix
|
||||||
|
|
||||||
./../../modules/hardware/xremap.nix
|
./../../modules/hardware/xremap.nix
|
||||||
./../../modules/hardware/battery.nix
|
./../../modules/hardware/battery.nix
|
||||||
|
|
||||||
|
./../../modules/graphics/workstation.nix
|
||||||
|
|
||||||
|
./../../modules/services/webdav.nix.nix
|
||||||
|
./../../modules/services/scanning.nix.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.hostName = "thinix";
|
networking.hostName = "thinix";
|
||||||
batMode = "double";
|
batMode = "double";
|
||||||
|
|
||||||
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
programs.gnupg.agent = {
|
programs.gnupg.agent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
pinentryPackage = with pkgs; pinentry-all;
|
pinentryPackage = with pkgs; pinentry-all;
|
||||||
enableSSHSupport = true;
|
enableSSHSupport = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Scanning over the network support
|
|
||||||
hardware.sane.enable = true;
|
|
||||||
hardware.sane.extraBackends = [ pkgs.sane-airscan ];
|
|
||||||
hardware.sane.disabledDefaultBackends = [ "escl" ];
|
|
||||||
services.udev.packages = [ pkgs.sane-airscan ];
|
|
||||||
services.avahi.enable = true;
|
|
||||||
services.avahi.nssmdns = true;
|
|
||||||
|
|
||||||
services.davfs2.enable = true;
|
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
networkmanager = {
|
networkmanager = {
|
||||||
wifi.powersave = true;
|
wifi.powersave = true;
|
||||||
@@ -43,5 +42,6 @@
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# Older machine
|
||||||
system.stateVersion = "24.11";
|
system.stateVersion = "24.11";
|
||||||
}
|
}
|
||||||
|
|||||||
11
modules/services/scanning.nix
Normal file
11
modules/services/scanning.nix
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
# Scanning over the network support
|
||||||
|
hardware.sane.enable = true;
|
||||||
|
hardware.sane.extraBackends = [ pkgs.sane-airscan ];
|
||||||
|
hardware.sane.disabledDefaultBackends = [ "escl" ];
|
||||||
|
services.udev.packages = [ pkgs.sane-airscan ];
|
||||||
|
services.avahi.enable = true;
|
||||||
|
services.avahi.nssmdns = true;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user