Skip to content

Commit

Permalink
Merge branch 'nixos-unstable'
Browse files Browse the repository at this point in the history
  • Loading branch information
fmway committed Sep 8, 2024
2 parents 6b1a6f5 + 4c198dd commit 04bfba8
Show file tree
Hide file tree
Showing 8 changed files with 66 additions and 71 deletions.
6 changes: 6 additions & 0 deletions home-manager/fmway/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ in customImport
GITHUB = "${ASET}/Github";
DOWNLOADS = "${homeDirectory}/Downloads";
} // (getEnv username);

# xkb options
keyboard.options = [
"grp:shifts_toggle"
"caps:none" # disable capslock
];
};

# nix.extraOptions = ''
Expand Down
5 changes: 5 additions & 0 deletions home-manager/fmway/programs/fish/interactiveShellInit.fish
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
abbr -a nofu "$(string join \n -- 'cd /etc/nixos' 'doas nix flake update' 'cd -')"
abbr -a nofl "$(string join \n -- 'cd /etc/nixos' 'doas nix flake lock' 'cd -')"
abbr -a noflu \
--set-cursor=! \
"$(string join \n -- 'cd /etc/nixos' 'doas nix flake lock --update-input !' 'cd -')"
set fish_greeting # Disable greeting
printf '\e[5 q'
55 changes: 55 additions & 0 deletions systems/boot.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{ config, ... }:
with config.boot; {
loader = with loader; {
efi.canTouchEfiVariables = systemd-boot.enable;

systemd-boot = {
enable = true;
memtest86.enable = true;
};

grub = {
enable = ! systemd-boot.enable;
copyKernels = true;
efiInstallAsRemovable = ! efi.canTouchEfiVariables;
efiSupport = true;
fsIdentifier = "label";
zfsSupport = true;
# device = "/dev/disk/by-id/nvme-KINGSTON_OM8PDP3256B-AB1_50026B768583ADF8-part1";
mirroredBoots = [
{ devices = [ "nodev" ]; path = "/boot"; }
];
device = "nodev";
};
};

plymouth = {
enable = true;
theme = "bgrt";
};

tmp = {
cleanOnBoot = true;
useTmpfs = true;
};

kernelParams = [
"zfs.zfs_arc_max=536870912" # max zfs cache (512MB)
];


# Enable v4l2loopback kernel module for using Virtual Camera.
extraModulePackages = with kernelPackages; [
v4l2loopback
];
extraModprobeConfig = ''
options v4l2loopback devices=1 video_nr=1 card_label="Virtual Camera" exclusive_caps=1
'';

# kernel.sysctl = {
# for unlimited warnet hack, thankxs to umahdroid.com
# https://www.umahdroid.com/2023/08/trik-axis-warnet-unlimited-hotspot.html
# "net.ipv4.ip_default_ttl" = 65;
# "net.inet6.ip6.hlim" = 65;
# };
}
31 changes: 0 additions & 31 deletions systems/boot/default.nix

This file was deleted.

Empty file.
16 changes: 0 additions & 16 deletions systems/boot/loader/grub.nix

This file was deleted.

4 changes: 0 additions & 4 deletions systems/boot/loader/systemd-boot.nix

This file was deleted.

20 changes: 0 additions & 20 deletions systems/networking/wg-quick/interfaces/wg0.nix

This file was deleted.

0 comments on commit 04bfba8

Please sign in to comment.