Skip to content

Commit

Permalink
save progress
Browse files Browse the repository at this point in the history
  • Loading branch information
oomfiee committed Dec 8, 2024
1 parent 7df8326 commit 92af49f
Show file tree
Hide file tree
Showing 15 changed files with 187 additions and 122 deletions.
8 changes: 4 additions & 4 deletions Hosts/rose/hardware-configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
boot.extraModulePackages = [ ];

fileSystems."/" =
{ device = "/dev/disk/by-uuid/00876bfb-3f34-4607-a08d-d8a4f87cc53e";
{ device = "/dev/disk/by-uuid/0d45bdbe-5542-4f60-878e-5d9cae9be310";
fsType = "btrfs";
options = [ "subvol=@" ];
options = [ "subvol=@" "compress=zstd" ];
};

boot.initrd.luks.devices."luks-9940ab6a-25a5-4789-b292-acd49816f0f9".device = "/dev/disk/by-uuid/9940ab6a-25a5-4789-b292-acd49816f0f9";
boot.initrd.luks.devices."luks-735556dc-f934-4c07-a75e-6287448a4d1b".device = "/dev/disk/by-uuid/735556dc-f934-4c07-a75e-6287448a4d1b";

fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/45BD-631C";
{ device = "/dev/disk/by-uuid/CCD3-4946";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
Expand Down
2 changes: 2 additions & 0 deletions Modules/Home/Core/Network/DNS/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ networking = {
services.resolved.extraConfig = ''
DNSOverTLS=yes
'';


#
# services.adguardhome = {
# enable = true;
Expand Down
6 changes: 6 additions & 0 deletions Modules/Home/Core/Network/VPN/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{ pkgs, config, lib, ... }:
{
imports = [
./tailscale.nix
];
}
38 changes: 38 additions & 0 deletions Modules/Home/Core/Network/VPN/tailscale.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{ pkgs, config, lib, ... }:
{

# Enable Tailscale service.
services.tailscale = {
enable = true;
useRoutingFeatures = "both";
};

environment.systemPackages = with pkgs; [
#ethtool
networkd-dispatcher
tailscale
];

# services = {
# networkd-dispatcher = {
# enable = true;
# rules."50-tailscale" = {
# onState = ["routable"];
# script = ''
# ${lib.getExe ethtool} -K eth0 rx-udp-gro-forwarding on rx-gro-list off
# '';
# };
# };
# };

networking.firewall = {
# always allow traffic from your Tailscale network
trustedInterfaces = [ "tailscale0" ];

# allow the Tailscale UDP port through the firewall
allowedUDPPorts = [ config.services.tailscale.port ];

# let you SSH in over the public internet
# allowedTCPPorts = [ 22 ];
};
}
3 changes: 1 addition & 2 deletions Modules/Home/Core/Network/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
./DNS
./Firewall
./Wireless/nm.nix
./VPN
];

services.tailscale.enable = true;
}
2 changes: 1 addition & 1 deletion Modules/Home/Core/Shell/nushell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ shellAliases = {
apply = "sudo nixos-rebuild switch --flake .#";
fhome = "sudo rm ~/.gtkrc-2.0";
rhome = "sudo systemctl restart home-manager-oomfie.service";
ani = "~/.local/bin/animdl";
#ani = "~/.local/bin/animdl";
};
};
}
2 changes: 2 additions & 0 deletions Modules/Home/Core/Shell/ssh.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@
};

systemd.services.autofs.path = [ pkgs.sshfs ];

environment.systemPackages = [ pkgs.sshfs ];
}
4 changes: 2 additions & 2 deletions Modules/Home/Core/Video/mpv/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ config = {
cache = "yes";
cache-on-disk = "yes";
demuxer-max-back-bytes = "512M";
demuxer-max-bytes = "512M";
demuxer-max-bytes = "1GB";
ytdl-raw-options = "ignore-config=,sub-lang=\"en,ar\",write-sub=,write-auto-sub=,force-ipv4=";
script-opts = "ytdl_hook-ytdl_path=yt-dlp";
deband = "no";
Expand Down Expand Up @@ -81,7 +81,7 @@ scriptOpts = {
fetch_on_start = "no";
auto_add = "no";
};
smart-copy-paste-2 = {
SmartCopyPaste_II = {
linux_copy = "wl-copy"; #xclip -silent -selection clipboard -in
linux_paste = "wl-paste"; #xclip -selection clipboard -o
};
Expand Down
2 changes: 1 addition & 1 deletion Modules/Home/Desktop/KDE/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services = {
desktopManager.plasma6.enable = true;
displayManager.sddm = {
enable = true;
wayland.enable = false;
wayland.enable = true;
};
displayManager.sddm.settings = { # Set sddm settings
Theme = {
Expand Down
2 changes: 1 addition & 1 deletion Modules/Home/Users/oomfie/users.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
shell = pkgs.${userSettings.sh};
};

programs.fish.enable = true;
#programs.fish.enable = true;
}
22 changes: 11 additions & 11 deletions Modules/NixOS/Core/Bootloader/systemd-boot.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@

boot = {
loader = {
systemd-boot.enable = lib.mkForce false;
systemd-boot.enable = lib.mkForce true;
efi.canTouchEfiVariables = true;
systemd-boot.configurationLimit = 10;
};
lanzaboote = {
enable = true;
pkiBundle = "/etc/secureboot";
};
bootspec.enable = true;
initrd.systemd = {
enable = true;
tpm2.enable = true;
};
};
# lanzaboote = {
# enable = true;
# pkiBundle = "/etc/secureboot";
# };
# bootspec.enable = true;
# initrd.systemd = {
# enable = true;
# tpm2.enable = true;
# };
};
}
14 changes: 6 additions & 8 deletions Modules/NixOS/Core/Kernel/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,12 @@ security = {
};
};

# boot.extraModprobeConfig = ''
# options iwlwifi 11n_disable=1 swcrypto=0 bt_coex_active=0 power_save=0
# options iwlmvm power_scheme=1
# options iwlwifi d0i3_disable=1
# options iwlwifi uapsd_disable=1
# options iwlwifi lar_disable=1
# '';
#
boot.extraModprobeConfig = ''
options iwlmvm power_scheme=1
options iwlwifi power_save=0
options iwlwifi swcrypto=1
'';

boot.kernelParams = [
"pcie_aspm=off"
# "pcie_aspm.policy=performance"
Expand Down
Loading

0 comments on commit 92af49f

Please sign in to comment.