Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/bernoulli' into newton
Browse files Browse the repository at this point in the history
  • Loading branch information
EthanJ-Brady committed Mar 1, 2025
2 parents 8bde8f6 + c245003 commit 446775a
Show file tree
Hide file tree
Showing 47 changed files with 623 additions and 424 deletions.
30 changes: 15 additions & 15 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,21 @@
modules = [
./hosts/morse/configuration.nix
./hosts/morse/hardware-configuration.nix
# ./modules/nixos
# home-manager.nixosModules.home-manager
# {
# home-manager.useGlobalPkgs = true;
# home-manager.useUserPackages = true;
# home-manager.extraSpecialArgs = {
# inherit inputs;
# };
# home-manager.users.ethan = {
# imports = [
# ./hosts/morse/home.nix
# ./modules/home
# ];
# };
# }
./modules/nixos
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {
inherit inputs;
};
home-manager.users.ethan = {
imports = [
./hosts/morse/home.nix
./modules/home
];
};
}
];
};

Expand Down
115 changes: 17 additions & 98 deletions hosts/bernoulli/configuration.nix
Original file line number Diff line number Diff line change
@@ -1,106 +1,25 @@
{pkgs, ...}: {
bootloader.enable = true;
gamepads.enable = true;
gamescope.enable = true;
hyprland.enable = true;
logitech.enable = true;
nvidia.enable = true;
pipewire.enable = true;
steam.enable = true;
via.enable = true;
virtualbox.enable = true;
ssh = {
{...}: {
custom = {
enable = true;
username = "ethan";
bootloader.enable = true;
desktop.enable = true;
docker.enable = true;
gaming.enable = true;
hardware = {
audio.enable = true;
bluetooth.enable = true;
laptop.enable = true;
nvidia.enable = true;
peripherals.enable = true;
};
obs.enable = true;
};

security.sudo.wheelNeedsPassword = false;

hardware.keyboard.zsa.enable = true;

services.blueman.enable = true;

networking.hostName = "bernoulli";
networking.networkmanager.enable = true;

nix.settings.experimental-features = [
"flakes"
"nix-command"
];

services.printing.enable = true;
hardware.bluetooth.enable = true;

programs.zsh.enable = true;

services.openssh.enable = true;

users.users.ethan = {
isNormalUser = true;
description = "Ethan Brady";
extraGroups = [
"networkmanager"
"wheel"
"docker"
];
shell = pkgs.zsh;
};

virtualisation.docker.enable = true;

xdg.portal = {
enable = true;
extraPortals = [pkgs.xdg-desktop-portal-gtk];
};

services.displayManager.autoLogin.enable = true;
services.displayManager.autoLogin.user = "ethan";

nixpkgs.config.allowUnfree = true;
nixpkgs.system = "x86_64-linux";

environment.systemPackages = with pkgs; [
firefox
# gnome-disk-utility
# pciutils
wl-clipboard
vivaldi
libgccjit # reqiured for nvim
nodejs_23 # required for nvim
binutils # required for nvim
gcc_multi # required for nvim
ripgrep # required for nvim
fd # required for nvim
cargo
gparted
brave
# gnome-usage
# dotnet-sdk_8
# wl-color-picker
home-manager
# appimage-run
# pavucontrol
# melonDS
# nh
kitty
# easyeffects
];

environment.sessionVariables.FLAKE = "/home/ethan/Dotfiles/nix";

fonts.packages = with pkgs; [
nerd-fonts.fira-code
];

fileSystems."/run/media/ethan/Games" = {
device = "/dev/nvme0n1p6";
};

# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment?
networking.hostName = "bernoulli";
nixpkgs.system = "x86_64-linux";
system.stateVersion = "23.11";
}
10 changes: 7 additions & 3 deletions hosts/bernoulli/home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
wayland.windowManager.hyprland.settings = {
# Determine monitors with `hyprctl monitors all`
monitor = [
"eDP-1,disable"
"eDP-1,1920x1080@60,-1920x240,1"
"HDMI-A-1,2560x1440@144,0x0,1"
"DP-1,1920x1080@60,2560x-270,1,transform,1"
"DP-1,1920x1080@60,2560x-300,1,transform,1"
];
};

Expand All @@ -56,10 +56,14 @@
neofetch
okular
texliveFull
ncpamixer
unzip
hyprshot
rustc
cargo
brave
nodejs_23
ripgrep
fd
amberol
];
}
97 changes: 6 additions & 91 deletions hosts/mohs/configuration.nix
Original file line number Diff line number Diff line change
@@ -1,100 +1,18 @@
{pkgs, ...}: {
# Bootloader
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;

services.blocky = {
custom = {
enable = true;
settings = {
ports.dns = 53;
upstreams.groups.default = [
"https://one.one.one.one/dns-query"
];
bootstrapDns = {
upstream = "https://one.one.one.one/dns-query";
ips = ["1.1.1.1" "1.0.0.1"];
};
blocking = {
denylists = {
ads = [
"https://raw.githubusercontent.com/PolishFiltersTeam/KADhosts/master/KADhosts.txt"
"https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Spam/hosts"
"https://v.firebog.net/hosts/static/w3kbl.txt"
"https://adaway.org/hosts.txt"
"https://v.firebog.net/hosts/AdguardDNS.txt"
"https://v.firebog.net/hosts/Admiral.txt"
"https://raw.githubusercontent.com/anudeepND/blacklist/master/adservers.txt"
"https://v.firebog.net/hosts/Easylist.txt"
"https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext"
"https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts"
"https://raw.githubusercontent.com/bigdargon/hostsVN/master/hosts"
"https://v.firebog.net/hosts/Easyprivacy.txt"
"https://v.firebog.net/hosts/Prigent-Ads.txt"
"https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts"
"https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt"
"https://hostfiles.frogeye.fr/firstparty-trackers-hosts.txt"
"https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareHosts.txt"
"https://v.firebog.net/hosts/Prigent-Crypto.txt"
"https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts"
"https://bitbucket.org/ethanr/dns-blacklists/raw/8575c9f96e5b4a1308f2f12394abd86d0927a4a0/bad_lists/Mandiant_APT1_Report_Appendix_D.txt"
"https://phishing.army/download/phishing_army_blocklist_extended.txt"
"https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-malware.txt"
"https://v.firebog.net/hosts/RPiList-Malware.txt"
"https://v.firebog.net/hosts/RPiList-Phishing.txt"
"https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt"
"https://raw.githubusercontent.com/AssoEchap/stalkerware-indicators/master/generated/hosts"
"https://urlhaus.abuse.ch/downloads/hostfile/"
"https://lists.cyberhost.uk/malware.txt"
"https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts"
];
adult = ["https://blocklistproject.github.io/Lists/porn.txt"];
};
clientGroupsBlock = {
default = ["ads"];
};
};
bootloader.enable = true;
homelab.enable = true;
user = {
enable = false;
username = "mohs";
};
};
networking.firewall.allowedTCPPorts = [53];
networking.firewall.allowedUDPPorts = [53];

ssh = {
enable = true;
username = "mohs";
};

programs.zsh.enable = true;

# Experimental features
nix.settings.experimental-features = [
"flakes"
"nix-command"
];

# Networking
networking.hostName = "mohs";
networking.networkmanager.enable = true;

# Locale
time.timeZone = "America/Denver";
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
};

# Configure keymap in X11
services.xserver.xkb = {
layout = "us";
variant = "";
};

# Define user account
users.users.mohs = {
Expand All @@ -116,9 +34,6 @@
# Enable automatic login for the user
services.getty.autologinUser = "mohs";

# Allow unfree packages
nixpkgs.config.allowUnfree = true;

# Packages
environment.systemPackages = with pkgs; [
vim
Expand Down
58 changes: 21 additions & 37 deletions hosts/mohs/hardware-configuration.nix
Original file line number Diff line number Diff line change
@@ -1,48 +1,32 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:

{
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];

boot.initrd.availableKernelModules = [
"xhci_pci"
"ehci_pci"
"ahci"
"usb_storage"
"usbhid"
"ums_realtek"
"sd_mod"
"sr_mod"
];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "ums_realtek" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];

fileSystems."/" = {
device = "/dev/disk/by-uuid/55dd7204-5071-4f61-a113-3892858355c4";
fsType = "ext4";
};
fileSystems."/" =
{ device = "/dev/disk/by-uuid/55dd7204-5071-4f61-a113-3892858355c4";
fsType = "ext4";
};

fileSystems."/boot" = {
device = "/dev/disk/by-uuid/082A-DB20";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/082A-DB20";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};

swapDevices = [
{device = "/dev/disk/by-uuid/d834f045-9d53-4014-b569-0dbedcc7ff1e";}
];
swapDevices =
[ { device = "/dev/disk/by-uuid/d834f045-9d53-4014-b569-0dbedcc7ff1e"; }
];

# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
Expand Down
1 change: 1 addition & 0 deletions hosts/mohs/home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
}: {
bat.enable = true;
bun.enable = true;
catppuccin.enable = true;
eza.enable = true;
fzf.enable = true;
git.enable = true;
Expand Down
Loading

0 comments on commit 446775a

Please sign in to comment.