diff --git a/flake.lock b/flake.lock index 05ed3b7..123e473 100644 --- a/flake.lock +++ b/flake.lock @@ -16,7 +16,7 @@ }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -32,7 +32,7 @@ }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 7f4348b..44521f2 100644 --- a/flake.nix +++ b/flake.nix @@ -3,14 +3,14 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. # Home manager - home-manager.url = "github:nix-community/home-manager/release-23.05"; + home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # TODO: Add any other flake you might need @@ -59,7 +59,7 @@ # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { - pc-koen = nixpkgs.lib.nixosSystem { + luna = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < diff --git a/home-manager/home.nix b/home-manager/home.nix index 14d8122..97faf45 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -11,28 +11,13 @@ ]; nixpkgs = { - # You can add overlays here overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): outputs.overlays.additions outputs.overlays.modifications outputs.overlays.unstable-packages - - # You can also add overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # Or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) ]; - # Configure your nixpkgs instance config = { - # Disable if you don't want unfree packages allowUnfree = true; - # Workaround for https://github.com/nix-community/home-manager/issues/2942 allowUnfreePredicate = _: true; }; }; @@ -41,16 +26,15 @@ username = "horseman"; homeDirectory = "/home/horseman"; }; - - # Add stuff for your user as you see fit: - # programs.neovim.enable = true; # Enable programs home.packages = with pkgs; [ bitwarden discord + jetbrains.clion + jetbrains.pycharm-professional + jetbrains.idea-ultimate jetbrains.jdk - jetbrains-toolbox gimp gnome.gnome-tweaks gnomeExtensions.just-perfection diff --git a/machines/laptop/configuration.nix b/machines/laptop/configuration.nix index 2309552..9708e4c 100644 --- a/machines/laptop/configuration.nix +++ b/machines/laptop/configuration.nix @@ -123,5 +123,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "23.11"; } diff --git a/machines/pc/configuration.nix b/machines/pc/configuration.nix index 41e7b27..a5a6a9f 100644 --- a/machines/pc/configuration.nix +++ b/machines/pc/configuration.nix @@ -183,5 +183,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "23.11"; } diff --git a/nixos/configuration.nix b/nixos/configuration.nix index f2936d0..42dde33 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -1,3 +1,4 @@ + # This is your system's configuration file. # Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) { @@ -25,50 +26,6 @@ ./hardware-configuration.nix ]; - # NVIDIA Drivers - # Enable OpenGL - hardware.opengl = { - enable = true; - driSupport = true; - driSupport32Bit = true; - }; - - # Load nvidia driver for Xorg and Wayland - services.xserver.videoDrivers = ["nvidia"]; # or "nvidiaLegacy470 etc. - - hardware.nvidia = { - - # Modesetting is required. - modesetting.enable = true; - - # Nvidia power management. Experimental, and can cause sleep/suspend to fail. - # Enable this if you have graphical corruption issues or application crashes after waking - # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead - # of just the bare essentials. - powerManagement.enable = false; - - # Fine-grained power management. Turns off GPU when not in use. - # Experimental and only works on modern Nvidia GPUs (Turing or newer). - powerManagement.finegrained = false; - - # Use the NVidia open source kernel module (not to be confused with the - # independent third-party "nouveau" open source driver). - # Support is limited to the Turing and later architectures. Full list of - # supported GPUs is at: - # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus - # Only available from driver 515.43.04+ - # Currently alpha-quality/buggy, so false is currently the recommended setting. - open = false; - - # Enable the Nvidia settings menu, - # accessible via `nvidia-settings`. - nvidiaSettings = true; - - # Optionally, you may need to select the appropriate driver version for your specific GPU. - package = config.boot.kernelPackages.nvidiaPackages.stable; - }; - - home-manager = { extraSpecialArgs = { inherit inputs outputs; }; @@ -125,7 +82,7 @@ auto-optimise-store = true; }; - networking.hostName = "pc-koen"; + networking.hostName = "luna"; # time.timeZone = "Europe/Amsterdam"; @@ -136,23 +93,6 @@ services.xserver.displayManager.gdm.enable = true; boot.loader.systemd-boot.enable = true; -# systemd.timers."update-config" = { -# wantedBy = [ "timers.target" ]; -# timerConfig = { -# OnBootSec = "1m"; -# Unit = "update-config.service"; -# }; -# }; -# -# systemd.services."update-config" = { -# script = '' -# ''; -# serviceConfig = { -# Type = "oneshot"; -# User = "root"; -# }; -# }; - # TODO: Configure your system-wide user settings (groups, etc), add more users as needed. users.users = { @@ -183,5 +123,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "23.11"; } diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix index b2e1477..2c7eff5 100644 --- a/nixos/hardware-configuration.nix +++ b/nixos/hardware-configuration.nix @@ -8,23 +8,23 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; + boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/0854d787-c362-4077-8c4b-bea85a108eba"; + { device = "/dev/disk/by-uuid/5b1cef65-3c1b-4c46-b117-20271902390f"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/6978-DAA0"; + { device = "/dev/disk/by-uuid/0433-B98A"; fsType = "vfat"; }; swapDevices = - [ { device = "/dev/disk/by-uuid/728d324f-f856-4327-b868-bb1883172d77"; } + [ { device = "/dev/disk/by-uuid/6fbb72cf-415f-48f8-a850-5d91f6e7dae7"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -32,8 +32,9 @@ # 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.eno1.useDHCP = lib.mkDefault true; + # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }