This commit is contained in:
parent
6e92de7014
commit
d959aa19a1
3 changed files with 44 additions and 73 deletions
|
@ -1,12 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
system,
|
||||
nixpkgs-nixos-unstable-and-unfree,
|
||||
...
|
||||
}: {
|
||||
{ config, pkgs, inputs, lib, system, nixpkgs-nixos-unstable-and-unfree, ... }: {
|
||||
networking.hostName = "yoga";
|
||||
|
||||
imports = [
|
||||
|
@ -22,9 +14,9 @@
|
|||
hardware.trackpoint.enable = true;
|
||||
services.hardware.bolt.enable = true;
|
||||
|
||||
services.fprintd = {enable = true;};
|
||||
services.fprintd = { enable = true; };
|
||||
|
||||
home-manager.users.cyryl = {lib, ...}: {home.packages = with pkgs; [];};
|
||||
home-manager.users.cyryl = { lib, ... }: { home.packages = with pkgs; [ ]; };
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
|
@ -51,30 +43,14 @@
|
|||
|
||||
services.printing.enable = true;
|
||||
|
||||
sound.enable = true;
|
||||
hardware.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
# If you want to use JACK applications, uncomment this
|
||||
#jack.enable = true;
|
||||
|
||||
# use the example session manager (no others are packaged yet so this is enabled by default,
|
||||
# no need to redefine it in your config for now)
|
||||
#media-session.enable = true;
|
||||
};
|
||||
|
||||
# Enable touchpad support (enabled default in most desktopManager).
|
||||
# services.xserver.libinput.enable = true;
|
||||
|
||||
users.users.cyryl = {
|
||||
isNormalUser = true;
|
||||
description = "cyryl";
|
||||
extraGroups = ["networkmanager" "wheel"];
|
||||
packages = with pkgs; [];
|
||||
extraGroups = [ "networkmanager" "wheel" ];
|
||||
packages = with pkgs; [ ];
|
||||
};
|
||||
|
||||
services.fwupd.enable = true;
|
||||
|
|
|
@ -1,41 +1,33 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
nixpkgs-nixos-unstable-and-unfree,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
boot.kernelModules = ["fuse"];
|
||||
{ config, pkgs, nixpkgs-nixos-unstable-and-unfree, lib, ... }: {
|
||||
boot.kernelModules = [ "fuse" ];
|
||||
services.smartd.enable = true;
|
||||
|
||||
sound.enable = true;
|
||||
|
||||
networking.networkmanager = {
|
||||
enable = true;
|
||||
dispatcherScripts = [
|
||||
{
|
||||
source = pkgs.writeText "upHook" ''
|
||||
enable_disable_wifi ()
|
||||
{
|
||||
result=$(nmcli dev | grep "ethernet" | grep -w "connected")
|
||||
if [ -n "$result" ]; then
|
||||
nmcli radio wifi off
|
||||
else
|
||||
nmcli radio wifi on
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "$2" = "up" ]; then
|
||||
enable_disable_wifi
|
||||
dispatcherScripts = [{
|
||||
source = pkgs.writeText "upHook" ''
|
||||
enable_disable_wifi ()
|
||||
{
|
||||
result=$(nmcli dev | grep "ethernet" | grep -w "connected")
|
||||
if [ -n "$result" ]; then
|
||||
nmcli radio wifi off
|
||||
else
|
||||
nmcli radio wifi on
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "$2" = "down" ]; then
|
||||
enable_disable_wifi
|
||||
fi
|
||||
'';
|
||||
type = "basic";
|
||||
}
|
||||
];
|
||||
if [ "$2" = "up" ]; then
|
||||
enable_disable_wifi
|
||||
fi
|
||||
|
||||
if [ "$2" = "down" ]; then
|
||||
enable_disable_wifi
|
||||
fi
|
||||
'';
|
||||
type = "basic";
|
||||
}];
|
||||
};
|
||||
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
|
@ -44,11 +36,9 @@
|
|||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
package = pkgs.bluez;
|
||||
settings = {General = {Enable = "Source,Sink,Media,Socket";};};
|
||||
settings = { General = { Enable = "Source,Sink,Media,Socket"; }; };
|
||||
};
|
||||
|
||||
services.blueman.enable = true;
|
||||
|
||||
hardware.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
|
@ -56,14 +46,17 @@
|
|||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
# If you want to use JACK applications, uncomment this
|
||||
#jack.enable = true;
|
||||
|
||||
# use the example session manager (no others are packaged yet so this is enabled by default,
|
||||
# no need to redefine it in your config for now)
|
||||
#media-session.enable = true;
|
||||
extraConfig.pipewire."92-low-latency" = {
|
||||
context.properties = {
|
||||
default.clock.rate = 48000;
|
||||
default.clock.quantum = 32;
|
||||
default.clock.min-quantum = 32;
|
||||
default.clock.max-quantum = 32;
|
||||
};
|
||||
};
|
||||
};
|
||||
environment.systemPackages = with pkgs; [ghostscript poppler];
|
||||
|
||||
environment.systemPackages = with pkgs; [ ghostscript poppler ];
|
||||
services.printing = {
|
||||
enable = true;
|
||||
drivers = with pkgs; [
|
||||
|
@ -81,7 +74,8 @@
|
|||
description = "Epson XP-540 via bolty";
|
||||
name = "epson_xp540_via_bolty";
|
||||
deviceUri = "ipp://bolty:631/printers/epson_xp540";
|
||||
model = "epson-inkjet-printer-escpr/Epson-XP-540_Series-epson-escpr-en.ppd";
|
||||
model =
|
||||
"epson-inkjet-printer-escpr/Epson-XP-540_Series-epson-escpr-en.ppd";
|
||||
ppdOptions = {
|
||||
PageSize = "A4";
|
||||
Duplex = "DuplexNoTumble";
|
||||
|
@ -90,7 +84,8 @@
|
|||
{
|
||||
description = "Samsung SCX-4623 Series";
|
||||
name = "samsung-SCX-4623";
|
||||
deviceUri = "usb://Samsung/SCX-4623%20Series?serial=Z2TYBFFZC01007W&interface=1";
|
||||
deviceUri =
|
||||
"usb://Samsung/SCX-4623%20Series?serial=Z2TYBFFZC01007W&interface=1";
|
||||
model = "samsung/SCX-4623FW.ppd";
|
||||
ppdOptions = {
|
||||
PageSize = "A4";
|
||||
|
@ -99,7 +94,7 @@
|
|||
}
|
||||
];
|
||||
|
||||
services.udev.packages = [];
|
||||
services.udev.packages = [ ];
|
||||
hardware.sane = {
|
||||
enable = true;
|
||||
snapshot = true;
|
||||
|
|
|
@ -72,7 +72,7 @@
|
|||
yubikey-manager-qt
|
||||
yubikey-personalization
|
||||
yubikey-personalization-gui
|
||||
]) ++ (with nixpkgs-nixos-unstable; [ gnucash thunderbird ])
|
||||
]) ++ (with nixpkgs-nixos-unstable; [ thunderbird ])
|
||||
++ [ nixpkgs-nixos-stable-and-unfree.discord ]
|
||||
++ (with nixpkgs-nixos-unstable-and-unfree; [
|
||||
hopper
|
||||
|
|
Loading…
Reference in a new issue