formating
This commit is contained in:
parent
5331777153
commit
b7ca0e0020
3 changed files with 103 additions and 71 deletions
|
|
@ -1,10 +1,19 @@
|
||||||
{ lib, config, pkgs, inputs, outputs, home-manager, ... }:
|
{
|
||||||
with lib;
|
lib,
|
||||||
let cfg = config.roles.citrix;
|
config,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
outputs,
|
||||||
|
home-manager,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
with lib; let
|
||||||
|
cfg = config.roles.citrix;
|
||||||
in {
|
in {
|
||||||
options.roles.citrix = { enable = lib.mkEnableOption "citrix tools"; };
|
options.roles.citrix = {enable = lib.mkEnableOption "citrix tools";};
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home-manager.users.don.home.packages = with pkgs; [ citrix_workspace ];
|
home-manager.users.don.home.packages = with pkgs; [citrix_workspace];
|
||||||
|
nixpkgs.config.permittedInsecurePackages = ["libsoup-2.74.3"];
|
||||||
# home-manager.users.don.home.packages = with pkgs;
|
# home-manager.users.don.home.packages = with pkgs;
|
||||||
# [ citrix_workspace_24_11_0 ];
|
# [ citrix_workspace_24_11_0 ];
|
||||||
home-manager.users.don.home.file."ICAClient" = {
|
home-manager.users.don.home.file."ICAClient" = {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,11 @@
|
||||||
{ inputs, outputs, lib, config, pkgs, ... }: {
|
{
|
||||||
|
inputs,
|
||||||
|
outputs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
inputs.nixos-hardware.nixosModules.google-pixelbook
|
inputs.nixos-hardware.nixosModules.google-pixelbook
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,11 @@
|
||||||
{ inputs, outputs, lib, config, pkgs, ... }:
|
{
|
||||||
let
|
inputs,
|
||||||
|
outputs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
my-python-packages = python-packages:
|
my-python-packages = python-packages:
|
||||||
with python-packages; [
|
with python-packages; [
|
||||||
# pipx
|
# pipx
|
||||||
|
|
@ -15,10 +21,10 @@ let
|
||||||
in {
|
in {
|
||||||
nix = {
|
nix = {
|
||||||
settings = {
|
settings = {
|
||||||
experimental-features = [ "nix-command" "flakes" ];
|
# experimental-features = ["nix-command" "flakes"];
|
||||||
warn-dirty = false;
|
warn-dirty = false;
|
||||||
auto-optimise-store = true;
|
auto-optimise-store = true;
|
||||||
trusted-users = [ "root" "don" ];
|
trusted-users = ["root" "don"];
|
||||||
};
|
};
|
||||||
gc = {
|
gc = {
|
||||||
automatic = true;
|
automatic = true;
|
||||||
|
|
@ -50,23 +56,26 @@ in {
|
||||||
networking = {
|
networking = {
|
||||||
networkmanager.enable = true;
|
networkmanager.enable = true;
|
||||||
enableIPv6 = true;
|
enableIPv6 = true;
|
||||||
networkmanager = { wifi = { powersave = true; }; };
|
networkmanager = {wifi = {powersave = true;};};
|
||||||
useDHCP = false;
|
useDHCP = false;
|
||||||
firewall = {
|
firewall = {
|
||||||
enable = true;
|
enable = true;
|
||||||
trustedInterfaces =
|
trustedInterfaces = ["tailscale0"]; # always allow traffic from your Tailscale network
|
||||||
[ "tailscale0" ]; # always allow traffic from your Tailscale network
|
|
||||||
checkReversePath = "loose";
|
checkReversePath = "loose";
|
||||||
allowedUDPPorts = [ config.services.tailscale.port ];
|
allowedUDPPorts = [config.services.tailscale.port];
|
||||||
allowedTCPPortRanges = [{
|
allowedTCPPortRanges = [
|
||||||
from = 1714;
|
{
|
||||||
to = 1764;
|
from = 1714;
|
||||||
}];
|
to = 1764;
|
||||||
allowedUDPPortRanges = [{
|
}
|
||||||
from = 1714;
|
];
|
||||||
to = 1764;
|
allowedUDPPortRanges = [
|
||||||
}];
|
{
|
||||||
allowedTCPPorts = [ 22 ];
|
from = 1714;
|
||||||
|
to = 1764;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
allowedTCPPorts = [22];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -82,7 +91,7 @@ in {
|
||||||
inputMethod = {
|
inputMethod = {
|
||||||
enable = true;
|
enable = true;
|
||||||
type = "fcitx5";
|
type = "fcitx5";
|
||||||
fcitx5.addons = with pkgs; [ fcitx5-mozc fcitx5-gtk ];
|
fcitx5.addons = with pkgs; [fcitx5-mozc fcitx5-gtk];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -90,33 +99,38 @@ in {
|
||||||
boot = {
|
boot = {
|
||||||
# kernelPackages = pkgs.linuxPackages_latest;
|
# kernelPackages = pkgs.linuxPackages_latest;
|
||||||
kernelPackages = pkgs.linuxPackages_zen;
|
kernelPackages = pkgs.linuxPackages_zen;
|
||||||
kernelParams = [ "consoleblank=60" "mem_sleep_default=deep" ];
|
kernelParams = ["consoleblank=60" "mem_sleep_default=deep"];
|
||||||
# extraModulePackages = [config.boot.kernelPackages.ddcci-driver];
|
# extraModulePackages = [config.boot.kernelPackages.ddcci-driver];
|
||||||
# kernelModules = ["i2c-dev" "ddcci_backlight"];
|
# kernelModules = ["i2c-dev" "ddcci_backlight"];
|
||||||
loader = if (pkgs.hostPlatform != lib.mkDefault "aarch64-linux") then {
|
loader =
|
||||||
systemd-boot = { enable = true; };
|
if (pkgs.hostPlatform != lib.mkDefault "aarch64-linux")
|
||||||
efi = {
|
then {
|
||||||
canTouchEfiVariables = true;
|
systemd-boot = {enable = true;};
|
||||||
efiSysMountPoint = "/boot";
|
efi = {
|
||||||
|
canTouchEfiVariables = true;
|
||||||
|
efiSysMountPoint = "/boot";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
grub.enable = false;
|
||||||
|
generic-extlinux-compatible.enable = true;
|
||||||
};
|
};
|
||||||
} else {
|
plymouth = {enable = true;};
|
||||||
grub.enable = false;
|
kernel = {sysctl = {"vm.swappiness" = 10;};};
|
||||||
generic-extlinux-compatible.enable = true;
|
|
||||||
};
|
|
||||||
plymouth = { enable = true; };
|
|
||||||
kernel = { sysctl = { "vm.swappiness" = 10; }; };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
security = {
|
security = {
|
||||||
polkit = { enable = true; };
|
polkit = {enable = true;};
|
||||||
sudo.enable = false;
|
sudo.enable = false;
|
||||||
doas = {
|
doas = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraRules = [{
|
extraRules = [
|
||||||
users = [ "don" ];
|
{
|
||||||
keepEnv = true;
|
users = ["don"];
|
||||||
noPass = true;
|
keepEnv = true;
|
||||||
}];
|
noPass = true;
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -133,10 +147,10 @@ in {
|
||||||
userServices = true;
|
userServices = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
bpftune = { enable = true; };
|
bpftune = {enable = true;};
|
||||||
flatpak = { enable = true; };
|
flatpak = {enable = true;};
|
||||||
fstrim = { enable = true; };
|
fstrim = {enable = true;};
|
||||||
fwupd = { enable = true; };
|
fwupd = {enable = true;};
|
||||||
locate = {
|
locate = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.mlocate;
|
package = pkgs.mlocate;
|
||||||
|
|
@ -145,7 +159,7 @@ in {
|
||||||
lidSwitchExternalPower = "ignore";
|
lidSwitchExternalPower = "ignore";
|
||||||
lidSwitchDocked = "ignore";
|
lidSwitchDocked = "ignore";
|
||||||
};
|
};
|
||||||
nscd = { enableNsncd = true; };
|
nscd = {enableNsncd = true;};
|
||||||
openssh = {
|
openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
@ -153,34 +167,34 @@ in {
|
||||||
KbdInteractiveAuthentication = false;
|
KbdInteractiveAuthentication = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
pcscd = { enable = true; };
|
pcscd = {enable = true;};
|
||||||
pipewire = {
|
pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
alsa = {
|
alsa = {
|
||||||
enable = true;
|
enable = true;
|
||||||
support32Bit = true;
|
support32Bit = true;
|
||||||
};
|
};
|
||||||
pulse = { enable = true; };
|
pulse = {enable = true;};
|
||||||
};
|
};
|
||||||
printing = {
|
printing = {
|
||||||
enable = true;
|
enable = true;
|
||||||
drivers = [ pkgs.hplipWithPlugin ];
|
drivers = [pkgs.hplipWithPlugin];
|
||||||
};
|
};
|
||||||
pulseaudio = { enable = false; };
|
pulseaudio = {enable = false;};
|
||||||
tailscale = { enable = true; };
|
tailscale = {enable = true;};
|
||||||
udev = {
|
udev = {
|
||||||
extraRules = ''
|
extraRules = ''
|
||||||
ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ENV{ID_FS_TYPE}=="ext4", ATTR{../queue/scheduler}="none" '';
|
ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ENV{ID_FS_TYPE}=="ext4", ATTR{../queue/scheduler}="none" '';
|
||||||
};
|
};
|
||||||
udisks2 = { enable = true; };
|
udisks2 = {enable = true;};
|
||||||
};
|
};
|
||||||
|
|
||||||
hardware = {
|
hardware = {
|
||||||
bluetooth = { enable = true; };
|
bluetooth = {enable = true;};
|
||||||
sane = {
|
sane = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraBackends = [ pkgs.sane-airscan ];
|
extraBackends = [pkgs.sane-airscan];
|
||||||
disabledDefaultBackends = [ "escl" "v4l" ];
|
disabledDefaultBackends = ["escl" "v4l"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
|
|
@ -207,8 +221,7 @@ in {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
initialPassword = "changeme";
|
initialPassword = "changeme";
|
||||||
description = "Don Harper";
|
description = "Don Harper";
|
||||||
extraGroups =
|
extraGroups = ["networkmanager" "wheel" "scanner" "lp" "video" "mlocate" "disk"];
|
||||||
[ "networkmanager" "wheel" "scanner" "lp" "video" "mlocate" "disk" ];
|
|
||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd8AdVbQQ/Fmw+b9mI8EMYqIoRkwmSwAOtmlte3incL don@loki"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd8AdVbQQ/Fmw+b9mI8EMYqIoRkwmSwAOtmlte3incL don@loki"
|
||||||
];
|
];
|
||||||
|
|
@ -223,10 +236,14 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
# Allow unfree packages
|
# Allow unfree packages
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs = {
|
||||||
nixpkgs.config.allowUnfreePredicate = true;
|
config = {
|
||||||
nixpkgs.config.permittedInsecurePackages =
|
allowUnfree = true;
|
||||||
[ "libxml2-2.13.8" "libsoup-2.74.3" ];
|
allowUnfreePredicate = true;
|
||||||
|
permittedInsecurePackages = ["libsoup-2.74.3"];
|
||||||
|
allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) ["broadcom-sta"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
anonymousPro
|
anonymousPro
|
||||||
|
|
@ -297,10 +314,10 @@ in {
|
||||||
];
|
];
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
dconf = { enable = true; };
|
dconf = {enable = true;};
|
||||||
light = { enable = true; };
|
light = {enable = true;};
|
||||||
mtr = { enable = true; };
|
mtr = {enable = true;};
|
||||||
kdeconnect = { enable = true; };
|
kdeconnect = {enable = true;};
|
||||||
gnupg = {
|
gnupg = {
|
||||||
agent = {
|
agent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -312,14 +329,14 @@ in {
|
||||||
|
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
qutebrowser = prev.qutebrowser.override { enableWideVine = true; };
|
qutebrowser = prev.qutebrowser.override {enableWideVine = true;};
|
||||||
})
|
})
|
||||||
(final: super: {
|
(final: super: {
|
||||||
khal = super.khal.overridePythonAttrs (_: { doCheck = false; });
|
khal = super.khal.overridePythonAttrs (_: {doCheck = false;});
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
|
nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
|
|
@ -350,6 +367,5 @@ in {
|
||||||
"x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
|
"x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
|
||||||
"x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop";
|
"x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop";
|
||||||
};
|
};
|
||||||
environment.sessionVariables.DEFAULT_BROWSER =
|
environment.sessionVariables.DEFAULT_BROWSER = "${pkgs.qutebrowser}/bin/qutebrowser";
|
||||||
"${pkgs.qutebrowser}/bin/qutebrowser";
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue