diff --git a/configuration.nix b/configuration.nix index 3452169..08aec43 100644 --- a/configuration.nix +++ b/configuration.nix @@ -12,6 +12,7 @@ ./mnt.nix ./docker.nix ./hyprland.nix + ./networking.nix ]; # Bootloader. @@ -23,7 +24,6 @@ # boot.supportedFilesystems = [ "zfs" ]; # boot.zfs.forceImportRoot = false; # networking.hostId = "a44f5fde"; - networking.hostName = "hypr-nix"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # Enable networking @@ -52,14 +52,17 @@ # services.xserver.enable = true; services.xserver = { enable = true; - layout = "gb"; - xkbVariant = ""; + xkb.layout = "gb"; + xkb.variant = ""; }; + services.xserver.videoDrivers = ["amdgpu"]; # Enable the GNOME Desktop Environment. services.xserver.displayManager.gdm.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 console.keyMap = "uk"; @@ -89,7 +92,7 @@ # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; - + # Define a user account. Don't forget to set a password with ‘passwd’. users.users.micqdf = { isNormalUser = true; @@ -98,20 +101,20 @@ }; # Install programs config - programs.java.enable = true; + programs.java.enable = true; programs.sway.enable = true; - + programs.fish.enable = true; users.defaultUserShell = pkgs.fish; - + # Allow unfree packages nixpkgs.config.allowUnfree = true; # List packages installed in system profile. To search, run: # $ nix search wget - - + + #hardware.opengl.driSupport = true; # This is already enabled by default hardware.bluetooth.enable = true; # enables support for Bluetooth 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.gamemode.enable = true; @@ -160,6 +162,6 @@ # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "24.05"; # Did you read the comment? system.autoUpgrade.enable = true; - system.autoUpgrade.allowReboot = true; + system.autoUpgrade.allowReboot = false; } diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 0f629f5..07ea629 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -8,7 +8,7 @@ [ (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.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; @@ -25,8 +25,10 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - networking.interfaces.wlp9s0.useDHCP = lib.mkDefault true; + # networking.interfaces.docker0.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"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/mnt.nix b/mnt.nix index cc7bf2e..b2ea5aa 100644 --- a/mnt.nix +++ b/mnt.nix @@ -1,9 +1,27 @@ { 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" = { # device = "10.27.27.239:/BigNAS"; # fsType = "nfs"; + # options = [ "x-systemd.automount" "noauto" ]; #}; #fileSystems."/mnt/MainPool" = { @@ -11,8 +29,8 @@ # fsType = "nfs"; #}; - #fileSystems."/mnt/NV1" = { - # device = "/dev/nvme1n1p2"; - # fsType = "btrfs"; - #}; + fileSystems."/mnt/NV1" = { + device = "/dev/nvme1n1p1"; + fsType = "btrfs"; + }; } diff --git a/networking.nix b/networking.nix new file mode 100644 index 0000000..fe407e4 --- /dev/null +++ b/networking.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: +{ + networking.hostName = "hypr-nix"; + networking = { + interfaces = { + enp0s31f6.useDHCP = true; + }; + }; +} diff --git a/packages.nix b/packages.nix index 1189f7c..596282a 100644 --- a/packages.nix +++ b/packages.nix @@ -73,9 +73,9 @@ in gzip mangohud protonup - lutris bottles wine + wine64 #peazip _7zz unrar @@ -102,6 +102,10 @@ in unstable.zed-editor unstable.hyprshot guacamole-client + mono + pika-backup + lutris + audacity ]; }