mirror of
https://github.com/MichaelFisher1997/nixos.git
synced 2025-04-27 15:23:10 +00:00
networking
This commit is contained in:
parent
ffde7e1ae4
commit
8b064ceae9
@ -12,6 +12,7 @@
|
|||||||
./mnt.nix
|
./mnt.nix
|
||||||
./docker.nix
|
./docker.nix
|
||||||
./hyprland.nix
|
./hyprland.nix
|
||||||
|
./networking.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
@ -23,7 +24,6 @@
|
|||||||
# boot.supportedFilesystems = [ "zfs" ];
|
# boot.supportedFilesystems = [ "zfs" ];
|
||||||
# boot.zfs.forceImportRoot = false;
|
# boot.zfs.forceImportRoot = false;
|
||||||
# networking.hostId = "a44f5fde";
|
# networking.hostId = "a44f5fde";
|
||||||
networking.hostName = "hypr-nix"; # Define your hostname.
|
|
||||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||||
|
|
||||||
# Enable networking
|
# Enable networking
|
||||||
@ -52,14 +52,17 @@
|
|||||||
# services.xserver.enable = true;
|
# services.xserver.enable = true;
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
layout = "gb";
|
xkb.layout = "gb";
|
||||||
xkbVariant = "";
|
xkb.variant = "";
|
||||||
};
|
};
|
||||||
|
services.xserver.videoDrivers = ["amdgpu"];
|
||||||
# Enable the GNOME Desktop Environment.
|
# Enable the GNOME Desktop Environment.
|
||||||
services.xserver.displayManager.gdm.enable = true;
|
services.xserver.displayManager.gdm.enable = true;
|
||||||
services.xserver.desktopManager.gnome.enable = true;
|
services.xserver.desktopManager.gnome.enable = true;
|
||||||
# Configure keymap in X11
|
# Enable kde6
|
||||||
|
#services.displayManager.sddm.enable = false;
|
||||||
|
#services.displayManager.sddm.wayland.enable = false;
|
||||||
|
#services.desktopManager.plasma6.enable = true;
|
||||||
|
|
||||||
# Configure console keymap
|
# Configure console keymap
|
||||||
console.keyMap = "uk";
|
console.keyMap = "uk";
|
||||||
@ -89,7 +92,7 @@
|
|||||||
|
|
||||||
# Enable touchpad support (enabled default in most desktopManager).
|
# Enable touchpad support (enabled default in most desktopManager).
|
||||||
# services.xserver.libinput.enable = true;
|
# services.xserver.libinput.enable = true;
|
||||||
|
|
||||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||||
users.users.micqdf = {
|
users.users.micqdf = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
@ -98,20 +101,20 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
# Install programs config
|
# Install programs config
|
||||||
programs.java.enable = true;
|
programs.java.enable = true;
|
||||||
programs.sway.enable = true;
|
programs.sway.enable = true;
|
||||||
|
|
||||||
|
|
||||||
programs.fish.enable = true;
|
programs.fish.enable = true;
|
||||||
users.defaultUserShell = pkgs.fish;
|
users.defaultUserShell = pkgs.fish;
|
||||||
|
|
||||||
# Allow unfree packages
|
# Allow unfree packages
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
# List packages installed in system profile. To search, run:
|
# List packages installed in system profile. To search, run:
|
||||||
# $ nix search wget
|
# $ nix search wget
|
||||||
|
|
||||||
|
|
||||||
#hardware.opengl.driSupport = true; # This is already enabled by default
|
#hardware.opengl.driSupport = true; # This is already enabled by default
|
||||||
hardware.bluetooth.enable = true; # enables support for Bluetooth
|
hardware.bluetooth.enable = true; # enables support for Bluetooth
|
||||||
hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
|
hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
|
||||||
@ -128,8 +131,7 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
services.xserver.videoDrivers = ["amdgpu"];
|
programs.steam.enable = true;
|
||||||
programs.steam.enable = true;
|
|
||||||
programs.steam.gamescopeSession.enable = true;
|
programs.steam.gamescopeSession.enable = true;
|
||||||
|
|
||||||
programs.gamemode.enable = true;
|
programs.gamemode.enable = true;
|
||||||
@ -160,6 +162,6 @@
|
|||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
system.stateVersion = "24.05"; # Did you read the comment?
|
system.stateVersion = "24.05"; # Did you read the comment?
|
||||||
system.autoUpgrade.enable = true;
|
system.autoUpgrade.enable = true;
|
||||||
system.autoUpgrade.allowReboot = true;
|
system.autoUpgrade.allowReboot = false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
@ -25,8 +25,10 @@
|
|||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
networking.useDHCP = lib.mkDefault true;
|
networking.useDHCP = lib.mkDefault true;
|
||||||
networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
|
# networking.interfaces.docker0.useDHCP = lib.mkDefault true;
|
||||||
networking.interfaces.wlp9s0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.tailscale0.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.wlp9s0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
26
mnt.nix
26
mnt.nix
@ -1,9 +1,27 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
services.rpcbind.enable = true; # needed for NFS
|
||||||
|
systemd.mounts = [{
|
||||||
|
type = "nfs";
|
||||||
|
mountConfig = {
|
||||||
|
Options = "noatime";
|
||||||
|
};
|
||||||
|
what = "100.105.0.115:/BigNAS";
|
||||||
|
where = "/mnt/BigNAS";
|
||||||
|
}];
|
||||||
|
|
||||||
|
systemd.automounts = [{
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
automountConfig = {
|
||||||
|
TimeoutIdleSec = "600";
|
||||||
|
};
|
||||||
|
where = "/mnt/BigNAS";
|
||||||
|
}];
|
||||||
#fileSystems."/mnt/BigNAS" = {
|
#fileSystems."/mnt/BigNAS" = {
|
||||||
# device = "10.27.27.239:/BigNAS";
|
# device = "10.27.27.239:/BigNAS";
|
||||||
# fsType = "nfs";
|
# fsType = "nfs";
|
||||||
|
# options = [ "x-systemd.automount" "noauto" ];
|
||||||
#};
|
#};
|
||||||
|
|
||||||
#fileSystems."/mnt/MainPool" = {
|
#fileSystems."/mnt/MainPool" = {
|
||||||
@ -11,8 +29,8 @@
|
|||||||
# fsType = "nfs";
|
# fsType = "nfs";
|
||||||
#};
|
#};
|
||||||
|
|
||||||
#fileSystems."/mnt/NV1" = {
|
fileSystems."/mnt/NV1" = {
|
||||||
# device = "/dev/nvme1n1p2";
|
device = "/dev/nvme1n1p1";
|
||||||
# fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
#};
|
};
|
||||||
}
|
}
|
||||||
|
9
networking.nix
Normal file
9
networking.nix
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{ config, pkgs, ... }:
|
||||||
|
{
|
||||||
|
networking.hostName = "hypr-nix";
|
||||||
|
networking = {
|
||||||
|
interfaces = {
|
||||||
|
enp0s31f6.useDHCP = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
@ -73,9 +73,9 @@ in
|
|||||||
gzip
|
gzip
|
||||||
mangohud
|
mangohud
|
||||||
protonup
|
protonup
|
||||||
lutris
|
|
||||||
bottles
|
bottles
|
||||||
wine
|
wine
|
||||||
|
wine64
|
||||||
#peazip
|
#peazip
|
||||||
_7zz
|
_7zz
|
||||||
unrar
|
unrar
|
||||||
@ -102,6 +102,10 @@ in
|
|||||||
unstable.zed-editor
|
unstable.zed-editor
|
||||||
unstable.hyprshot
|
unstable.hyprshot
|
||||||
guacamole-client
|
guacamole-client
|
||||||
|
mono
|
||||||
|
pika-backup
|
||||||
|
lutris
|
||||||
|
audacity
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user