Merge branch 'main' of github.com:asosnovsky/nixos-setup
This commit is contained in:
commit
bf643c6db2
23 files changed
+489
-350
No files matched your search
+68
-24
@@ -1,5 +1,11 @@
|
||||
{ user }:
|
||||
{ pkgs, hyprlauncher, system, ... }:
|
||||
{
|
||||
pkgs,
|
||||
hyprlauncher,
|
||||
system,
|
||||
nixpkgs-unstable,
|
||||
...
|
||||
}:
|
||||
let
|
||||
zshFWBook = builtins.filterSource (p: t: true) ./scripts/fwbook;
|
||||
zshFunctions = zshFWBook + "/functions.sh";
|
||||
@@ -7,6 +13,7 @@ let
|
||||
8000
|
||||
8001
|
||||
];
|
||||
unstable = nixpkgs-unstable.legacyPackages.${system};
|
||||
in
|
||||
{
|
||||
imports = [ ./fwbook.hardware-configuration.nix ];
|
||||
@@ -27,7 +34,7 @@ in
|
||||
};
|
||||
desktop = {
|
||||
enable = true;
|
||||
cosmic.enable = true;
|
||||
cosmic.enable = false;
|
||||
kde.enable = false;
|
||||
crypto.enable = true;
|
||||
gnome.enable = false;
|
||||
@@ -63,12 +70,23 @@ in
|
||||
nssmdns4 = true;
|
||||
};
|
||||
virtualisation.waydroid.enable = true;
|
||||
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
audio.enable = true;
|
||||
pulse.enable = true;
|
||||
jack.enable = true;
|
||||
};
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal
|
||||
];
|
||||
};
|
||||
# Tailscale
|
||||
services.tailscale.enable = true;
|
||||
# Desktop Env
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.xserver.displayManager.gdm.wayland = true;
|
||||
services.displayManager.gdm.enable = true;
|
||||
services.displayManager.gdm.wayland = true;
|
||||
services.displayManager.defaultSession = "niri";
|
||||
# home manager
|
||||
home-manager.users.${user.name} = {
|
||||
@@ -97,7 +115,9 @@ in
|
||||
# Enable CUPS to print documents.
|
||||
services.printing.enable = true;
|
||||
# Bluetooth
|
||||
hardware.bluetooth.settings.General = { ControllerMode = "bredr"; };
|
||||
hardware.bluetooth.settings.General = {
|
||||
ControllerMode = "bredr";
|
||||
};
|
||||
hardware.bluetooth.enable = true;
|
||||
hardware.bluetooth.powerOnBoot = true;
|
||||
# Bootloader.
|
||||
@@ -110,11 +130,13 @@ in
|
||||
# Packages
|
||||
environment.systemPackages =
|
||||
let
|
||||
gdk = pkgs.google-cloud-sdk.withExtraComponents
|
||||
(with pkgs.google-cloud-sdk.components; [
|
||||
gdk = pkgs.google-cloud-sdk.withExtraComponents (
|
||||
with pkgs.google-cloud-sdk.components;
|
||||
[
|
||||
gke-gcloud-auth-plugin
|
||||
kubectl
|
||||
]);
|
||||
]
|
||||
);
|
||||
in
|
||||
(with pkgs; [
|
||||
|
||||
@@ -126,6 +148,7 @@ in
|
||||
openfortivpn
|
||||
openfortivpn-webview
|
||||
openfortivpn-webview-qt
|
||||
nodejs
|
||||
|
||||
# Util
|
||||
libusb1
|
||||
@@ -167,13 +190,14 @@ in
|
||||
|
||||
# Development
|
||||
vscode
|
||||
zed-editor
|
||||
zed-editor-fhs
|
||||
devenv
|
||||
just
|
||||
rpi-imager
|
||||
rpiboot
|
||||
code-cursor-fhs
|
||||
nix-prefetch
|
||||
orca-slicer
|
||||
|
||||
# Run macos apps
|
||||
darling-dmg
|
||||
@@ -183,12 +207,11 @@ in
|
||||
bitwarden-cli
|
||||
|
||||
# documents
|
||||
onlyoffice-bin_latest
|
||||
onlyoffice-desktopeditors
|
||||
|
||||
# Work
|
||||
gdk
|
||||
slack
|
||||
google-chrome
|
||||
|
||||
# IPhone Tethering
|
||||
libimobiledevice
|
||||
@@ -242,12 +265,15 @@ in
|
||||
port = 11434;
|
||||
acceleration = "rocm";
|
||||
rocmOverrideGfx = "11.0.2";
|
||||
package = unstable.ollama-rocm;
|
||||
};
|
||||
# # Brother Printer
|
||||
hardware.sane.brscan5.enable = true;
|
||||
# # Display Managers
|
||||
services.xserver.videoDrivers =
|
||||
[ "modesetting" "fbdev" ];
|
||||
services.xserver.videoDrivers = [
|
||||
"modesetting"
|
||||
"fbdev"
|
||||
];
|
||||
# Kernel
|
||||
boot.kernelPackages = pkgs.linuxPackages_zen;
|
||||
|
||||
@@ -256,18 +282,36 @@ in
|
||||
fileSystems."/mnt/EightTerra/FamilyStorage" = {
|
||||
device = "tnas1.lab.internal:/mnt/EightTerra/FamilyStorage";
|
||||
fsType = "nfs";
|
||||
options = [ "x-systemd.automount" "noauto" ];
|
||||
options = [
|
||||
"x-systemd.automount"
|
||||
"noauto"
|
||||
];
|
||||
};
|
||||
fileSystems."/mnt/EightTerra/k3s-cluster" = {
|
||||
device = "tnas1.lab.internal:/mnt/EightTerra/k3s-cluster";
|
||||
fsType = "nfs";
|
||||
options = [
|
||||
"x-systemd.automount"
|
||||
"noauto"
|
||||
];
|
||||
};
|
||||
# Remote Builder
|
||||
nix.buildMachines = [{
|
||||
hostName = "root@bigbox1.lab.internal";
|
||||
system = "x86_64-linux";
|
||||
protocol = "ssh-ng";
|
||||
maxJobs = 1;
|
||||
speedFactor = 2;
|
||||
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
|
||||
mandatoryFeatures = [ ];
|
||||
}];
|
||||
nix.buildMachines = [
|
||||
{
|
||||
hostName = "root@bigbox1.lab.internal";
|
||||
system = "x86_64-linux";
|
||||
protocol = "ssh-ng";
|
||||
maxJobs = 1;
|
||||
speedFactor = 2;
|
||||
supportedFeatures = [
|
||||
"nixos-test"
|
||||
"benchmark"
|
||||
"big-parallel"
|
||||
"kvm"
|
||||
];
|
||||
mandatoryFeatures = [ ];
|
||||
}
|
||||
];
|
||||
nix.distributedBuilds = true;
|
||||
# optional, useful when the builder has a faster internet connection than yours
|
||||
nix.extraOptions = ''
|
||||
|
||||
@@ -56,8 +56,8 @@
|
||||
networkDrives.enable = true;
|
||||
};
|
||||
services.displayManager.defaultSession = "gnome";
|
||||
services.xserver.displayManager.gdm.enable = false;
|
||||
services.xserver.displayManager.gdm.wayland = false;
|
||||
services.displayManager.gdm.enable = false;
|
||||
services.displayManager.gdm.wayland = false;
|
||||
services.autosuspend.enable = false;
|
||||
services.displayManager.autoLogin = {
|
||||
enable = true;
|
||||
@@ -70,8 +70,8 @@
|
||||
systemd.targets.suspend.enable = false;
|
||||
systemd.targets.hibernate.enable = false;
|
||||
systemd.targets.hybrid-sleep.enable = false;
|
||||
services.xserver.displayManager.gdm.autoSuspend = false;
|
||||
services.xserver.displayManager.gdm.autoLogin.delay = 0;
|
||||
services.displayManager.gdm.autoSuspend = false;
|
||||
services.displayManager.gdm.autoLogin.delay = 0;
|
||||
# Remote Desktop
|
||||
services.xrdp.enable = true;
|
||||
services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session";
|
||||
|
||||
+2
-2
@@ -58,8 +58,8 @@ in
|
||||
# Tailscale
|
||||
services.tailscale.enable = true;
|
||||
# Desktop Env
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.xserver.displayManager.gdm.wayland = true;
|
||||
services.displayManager.gdm.enable = true;
|
||||
services.displayManager.gdm.wayland = true;
|
||||
services.displayManager.defaultSession = "niri";
|
||||
# Firmware updater
|
||||
services.fwupd.enable = true;
|
||||
|
||||
@@ -2,10 +2,6 @@ function start-windows() {
|
||||
quickemu --vm /mnt/Data/vms/windows-11.conf --display spice --viewer remote-viewer
|
||||
}
|
||||
|
||||
function start-windows-app() {
|
||||
google-chrome-stable --app=https://windows365.microsoft.com/webclient --new-window
|
||||
}
|
||||
|
||||
function clean-file() {
|
||||
grep -v '^\s*#' | grep -v '^$'
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user