xeovalyte/nix
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
xeovalyte 2024-10-06 19:17:37 +02:00
commit 59367c916f
Signed by: xeovalyte
SSH Key Fingerprint: SHA256:GWI1hq+MNKR2UOcvk7n9tekASXT8vyazK7vDF9Xyciw
19 changed files with 105 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
flake.lock generated
View File

@ -23,11 +23,11 @@
]
},
"locked": {
"lastModified": 1720042825,
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
"lastModified": 1726989464,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
"type": "github"
},
"original": {
@ -58,11 +58,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1725001927,
"narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
"lastModified": 1728067476,
"narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
"rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030",
"type": "github"
},
"original": {
@ -88,19 +88,11 @@
},
"nixpkgs-unstable": {
"locked": {
<<<<<<< HEAD
"lastModified": 1724819573,
"narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
"lastModified": 1728018373,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
=======
"lastModified": 1725103162,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
>>>>>>> 5655c8a056d725790ff88631d9bcc98875ef0333
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"type": "github"
},
"original": {

1
flake.nix
View File

@ -91,3 +91,4 @@
};
};
}

12
hosts/desktop/default.nix
View File

@ -46,17 +46,7 @@
extraGroups = [ "networkmanager" "wheel" "dialout" "fuse" ];
};
services.openssh.enable = true;
# boot.kernelPackages = pkgs.linuxPackages_latest;
# sunshine
services.sunshine = {
enable = true;
autoStart = true;
capSysAdmin = true;
openFirewall = true;
};
boot.kernelPackages = pkgs.linuxPackages_latest;
system.stateVersion = "24.05";

6
hosts/desktop/hardware-configuration.nix
View File

@ -8,18 +8,18 @@
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/f8dc500b-2b36-4ca8-940b-1716742d6cf3";
{ device = "/dev/disk/by-uuid/b4cefbc5-dd3d-4a4b-84d0-031b2ed7655c";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/029A-9287";
{ device = "/dev/disk/by-uuid/9A7D-7464";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};

3
hosts/desktop/home.nix
View File

@ -31,9 +31,6 @@
home.packages = with pkgs; [
unstable.prismlauncher
unstable.modrinth-app
unstable.vesktop
unstable.blender
];
home.stateVersion = "24.05";

3
hosts/laptop/default.nix
View File

@ -22,6 +22,8 @@
../../modules/system/hardware/laptop.nix
../../modules/system/hardware/locale.nix
../../modules/system/hardware/printing.nix
../../modules/system/hardware/fprint.nix
../../modules/system/hardware/virt.nix
];
nix.settings = {
@ -57,6 +59,7 @@
};
services.libinput.enable = true;
services.fwupd.enable = true;
system.stateVersion = "24.05";

13
hosts/laptop/home.nix
View File

@ -38,17 +38,22 @@
kdenlive
unstable.prismlauncher
unstable.joplin-desktop
unstable.moonlight-qt
unstable.prusa-slicer
signal-desktop
unstable.vesktop
unstable.rnote
unstable.blender
unstable.openscad-unstable
loupe
unstable.bottles
# Systemverilog
unstable.gtkwave
unstable.verilator
gnumake
# Office
libreoffice
unstable.onlyoffice-bin
onlyoffice-bin
papers
# Image editing
gimp

53
hosts/vnix-ctr/default.nix
View File

@ -1,53 +0,0 @@
{ config, pkgs, ... }:
{
imports = [ # Include the results of the hardware scan.
./hardware-configuration.nix
# CLI
../../modules/system/cli/common.nix
../../modules/system/cli/podman.nix
# Hardware
../../modules/system/hardware/firewall.nix
../../modules/system/hardware/garbage-collection.nix
../../modules/system/hardware/locale.nix
];
nix.settings = {
experimental-features = [ "nix-command" "flakes" ];
substituters = [
"https://nix-community.cachix.org"
"https://cache.nixos.org/"
];
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
};
# Bootloader
boot.loader.grub = {
enable = true;
device = "/dev/sda";
useOSProber = true;
};
# Networking
networking.networkmanager.enable = true;
networking.firewall = {
allowedTCPPorts = [ 80 443 1080 ];
allowedUDPPorts = [ 53 ];
};
# Configure user
users.users.xeovalyte = {
isNormalUser = true;
description = "Timo Boomers";
extraGroups = [ "networkmanager" "wheel" "dialout" "fuse" ];
};
system.stateVersion = "24.05";
}

20
hosts/vnix-ctr/home.nix
View File

@ -1,20 +0,0 @@
{ pkgs, ... }:
{
imports = [
# GUI
../../modules/home/gui/theming.nix
# CLI
../../modules/home/cli/common
];
guiTheming.enable = false;
home = {
username = "xeovalyte";
homeDirectory = "/home/xeovalyte";
};
home.stateVersion = "24.05";
}

23
modules/containers/adguard.nix
View File

@ -1,23 +0,0 @@
{ pkgs, ... }:
{
virtualisation.oci-containers.containers = {
adguardhome = {
image = "docker.io/adguard/adguardhome";
autoStart = true;
ports = [
"192.168.100.107:53:53/udp"
"81:3000/tcp"
];
volumes = [
"workdir:/opt/adguardhome/work"
"confdir:/opt/adguardhome/conf"
];
};
};
networking.firewall = {
allowedTCPPorts = [ 81 53 ];
allowedUDPPorts = [ 53 ];
};
}

16
modules/containers/caddy.nix
View File

@ -1,16 +0,0 @@
{ pkgs, ... }:
pkgs.dockerTools.buildImage {
name = "caddy-custom";
tag = "latest";
fromImage = "docker.io/caddy";
fromImageName = null;
fromImageTag = "2.8.4-builder";
runAsRoot = ''
#!${pkgs.runtimeShell}
xcaddy build --with github.com/caddy-dns/cloudflare
'';
}

20
modules/home/cli/common/helix.nix
View File

@ -3,6 +3,9 @@
{
home.packages = with pkgs; [
unstable.marksman
unstable.svls
unstable.nil
unstable.nixpkgs-fmt
];
programs.helix = {
@ -16,11 +19,28 @@
};
};
languages = {
# Rust
language-server.rust-analyzer.config = {
cargo = {
features = "all";
};
};
# Systemverilog
language-server.svls = {
command = "svls";
};
language = [
{
name = "verilog";
language-servers = [ "svls" ];
}
{
name = "nix";
language-servers = [ "svls" ];
}
];
};
themes = {
base16 = let

32
modules/home/gui/common/firefox.nix
View File

@ -1,6 +1,11 @@
{ inputs, pkgs, ... }:
{
# about:policies
# Check about:support for extension/add-on ID strings.
# Check about:config for options.
home.packages = with pkgs; [
unstable.firefoxpwa
];
@ -42,6 +47,31 @@
};
};
profiles.xeovalyte = {
bookmarks = [
{
name = "Toolbar";
toolbar = true;
bookmarks = [
{
name = "Brightspace";
bookmarks = [
{
name = "LCA";
url = "https://brightspace.tudelft.nl/d2l/le/content/681008/Home";
}
{
name = "DSA";
url = "https://brightspace.tudelft.nl/d2l/le/content/681012/Home";
}
{
name = "iEE";
url = "https://brightspace.tudelft.nl/d2l/le/content/681018/Home";
}
];
}
];
}
];
search.engines = {
"Nix" = {
urls = [{
@ -93,7 +123,7 @@
"browser.shell.defaultBrowserCheckCount" = 1;
"dom.security.https_only_mode" = true;
"privacy.trackingProtection.enabled" = true;
"browser.toolbars.bookmarks.visibility" = "never";
"browser.toolbars.bookmarks.visibility" = "newtab";
"browser.translations.neverTranslateLanguages" = "nl";
"browser.newtabpage.pinned" = [
{

2
modules/system/cli/common.nix
View File

@ -4,7 +4,7 @@
environment.systemPackages = with pkgs; [
usbutils
tree
neofetch
fastfetch
btop
git
];

1
modules/system/gui/hyprland.nix
View File

@ -31,7 +31,6 @@
};
# Sound configuration
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {

4
modules/system/hardware/firewall.nix
View File

@ -3,7 +3,7 @@
{
networking.firewall = {
enable = true;
allowedTCPPorts = [ 53317 3000 ];
allowedUDPPorts = [ 53317 ];
allowedTCPPorts = [ 53317 3000 24800 ];
allowedUDPPorts = [ 53317 24800 ];
};
}

28
modules/system/hardware/fprint.nix
View File

@ -3,31 +3,5 @@
{
services.fprintd.enable = true;
security.pam.services.hyprlock = {
text = ''
auth sufficient pam_unix.so try_first_pass likeauth nullok
auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so
auth include login
'';
};
security.pam.services.greetd = {
text = ''
account required pam_unix.so # unix (order 10900)
# Authentication management.
auth sufficient pam_unix.so likeauth nullok try_first_pass # unix (order 11600)
auth sufficient /nix/store/bz12s6mba297725i9y35p73lvsic8gd3-fprintd-1.94.2/lib/security/pam_fprintd.so # fprintd (order 11400)
auth required pam_deny.so # deny (order 12400)
# Password management.
password sufficient pam_unix.so nullok yescrypt # unix (order 10200)
# Session management.
session required pam_env.so conffile=/etc/pam/environment readenv=0 # env (order 10100)
session required pam_unix.so # unix (order 10200)
session required pam_loginuid.so # loginuid (order 10300)
session optional /nix/store/dzp7d4k1d94s1x49p9171mvcsfyxr7bj-systemd-254.6/lib/security/pam_systemd.so # systemd (order 12000) login
'';
};
security.pam.services.login.fprintAuth = false;
}

22
modules/system/hardware/laptop.nix
View File

@ -1,17 +1,17 @@
{ ... }:
{
services.auto-cpufreq.enable = true;
services.auto-cpufreq.settings = {
battery = {
governor = "powersave";
turbo = "never";
};
charger = {
governor = "performance";
turbo = "auto";
};
};
# services.auto-cpufreq.enable = true;
# services.auto-cpufreq.settings = {
# battery = {
# governor = "powersave";
# turbo = "never";
# };
# charger = {
# governor = "performance";
# turbo = "auto";
# };
# };
services.power-profiles-daemon.enable = true;

12
modules/system/hardware/virt.nix Normal file
View File

@ -0,0 +1,12 @@
{ pkgs, ... }:
{
virtualisation.libvirtd.enable = true;
programs.virt-manager.enable = true;
users.users.xeovalyte.extraGroups = [ "libvirtd" ];
environment.systemPackages = with pkgs; [
quickemu
];
}