From e4e1084e45ebc0b18c109fa325e2850f7a150392 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 4 Sep 2023 20:28:12 -0600 Subject: added base desktop config --- machines/khad/configuration.nix | 122 +++++++++++++++++++++++++++++++ machines/khad/hardware-configuration.nix | 50 +++++++++++++ 2 files changed, 172 insertions(+) create mode 100644 machines/khad/configuration.nix create mode 100644 machines/khad/hardware-configuration.nix (limited to 'machines/khad') diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix new file mode 100644 index 0000000..73e29dd --- /dev/null +++ b/machines/khad/configuration.nix @@ -0,0 +1,122 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running `nixos-help`). + +{ config, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Use the systemd-boot EFI boot loader. + # boot.loader.grub.enable = true; + # boot.loader.grub.efiSupport = true; + # boot.loader.grub.devices = [ + # "/dev/sda" + # ]; + # boot.loader.grub.theme = pkgs.nixos-grub2-theme; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.systemd-boot.graceful = true; + + networking.hostName = "khad"; # Define your hostname. + # Pick only one of the below networking options. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + # Set your time zone. + time.timeZone = "US/Mountain"; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + # i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; + # useXkbConfig = true; # use xkbOptions in tty. + # }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + + # Enable the Plasma 5 Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + + + # Configure keymap in X11 + # services.xserver.layout = "us"; + # services.xserver.xkbOptions = "eurosign:e,caps:escape"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + sound.enable = true; + # hardware.pulseaudio.enable = true; + + # 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.defin= { + # isNormalUser = true; + # description = "Devin finlinson"; + # extraGroups = [ "wheel" "builders" "video" "input"]; # Enable ‘sudo’ for the user. + # shell = pkgs.nushell; + # hashedPassword = "$6$UljPNAdxZ22lP3Bc$8VaEAacZxtXM3Zji2IA7Jf5fXs9pFnAVQff1d8IbfFOKCvjibceyopOAjRXa8lXtpOSJgPW1OO1dzOspqhWnz0"; + # packages = with pkgs; [ + # firefox + # nushell + # tree + # ]; + # }; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + helix + wget + ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + programs.mtr.enable = true; + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # 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.05"; # Did you read the comment? + +} + diff --git a/machines/khad/hardware-configuration.nix b/machines/khad/hardware-configuration.nix new file mode 100644 index 0000000..d1e49e9 --- /dev/null +++ b/machines/khad/hardware-configuration.nix @@ -0,0 +1,50 @@ +# 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, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/d7025289-0e65-4ff8-a774-1a8a7b104858"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/0873-40C7"; + fsType = "vfat"; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/9aa90dd0-4123-4caf-ac6e-8a299dda3ad4"; + fsType = "ext4"; + }; + + fileSystems."/home/devinf/Drives" = + { device = "/dev/disk/by-uuid/ba4e233d-d31a-4e5a-9054-0241bd58ba8e"; + fsType = "ext4"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/74384a53-3895-4c6b-ba89-ff7ff82323a4"; } + ]; + + # 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 + # 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.enp0s20u4.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} -- cgit v1.2.3 From 34f99957e3632ab408eafaf66f6f16afea1542e7 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 4 Sep 2023 20:31:10 -0600 Subject: removed unecessary options from khad --- machines/khad/configuration.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'machines/khad') diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix index 73e29dd..e60e949 100644 --- a/machines/khad/configuration.nix +++ b/machines/khad/configuration.nix @@ -42,12 +42,12 @@ # }; # Enable the X11 windowing system. - services.xserver.enable = true; + # services.xserver.enable = true; # Enable the Plasma 5 Desktop Environment. - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; + # services.xserver.displayManager.sddm.enable = true; + # services.xserver.desktopManager.plasma5.enable = true; # Configure keymap in X11 @@ -80,14 +80,15 @@ # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - helix - wget + # environment.systemPackages = with pkgs; [ + # # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # helix + # wget ]; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. + programs.light.enable = true; programs.mtr.enable = true; programs.gnupg.agent = { enable = true; -- cgit v1.2.3 From 30280b0882bc38412c7723d56ed950d6e326f825 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 4 Sep 2023 20:36:13 -0600 Subject: fixed another typo --- machines/khad/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'machines/khad') diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix index e60e949..cabc361 100644 --- a/machines/khad/configuration.nix +++ b/machines/khad/configuration.nix @@ -84,7 +84,7 @@ # # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # helix # wget - ]; + # ]; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. -- cgit v1.2.3 From 50cd2425ac59f126d9ce462231e2f18b60a06ed1 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 4 Sep 2023 20:44:19 -0600 Subject: allow unfree --- machines/khad/configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'machines/khad') diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix index cabc361..3b1e98f 100644 --- a/machines/khad/configuration.nix +++ b/machines/khad/configuration.nix @@ -26,6 +26,12 @@ # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + nixpkgs = { + # texlive.combined.scheme-medium; + system = "x84_64-linux"; + config.allowUnfree = true; + }; + # Set your time zone. time.timeZone = "US/Mountain"; -- cgit v1.2.3 From daaf7b4f9e0189de5a0da4c27d16e57d4dda5a8b Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 4 Sep 2023 21:41:47 -0600 Subject: testing boot loader fix --- machines/khad/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'machines/khad') diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix index 3b1e98f..6f7e415 100644 --- a/machines/khad/configuration.nix +++ b/machines/khad/configuration.nix @@ -18,7 +18,7 @@ # ]; # boot.loader.grub.theme = pkgs.nixos-grub2-theme; boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + # boot.loader.efi.canTouchEfiVariables = true; boot.loader.systemd-boot.graceful = true; networking.hostName = "khad"; # Define your hostname. -- cgit v1.2.3 From a933e77443bfa3d918b6e04339464d4ae41f86b2 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 4 Sep 2023 22:27:22 -0600 Subject: moved an env config to configs enabled users for nix generated new hardware config to hopefully prevent emergency mode --- machines/khad/configuration.nix | 8 +++++--- machines/khad/hardware-configuration.nix | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'machines/khad') diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix index 6f7e415..abc703b 100644 --- a/machines/khad/configuration.nix +++ b/machines/khad/configuration.nix @@ -32,6 +32,8 @@ config.allowUnfree = true; }; + environment.shellInit = ''export NIXPATH="/nix/var/nix/profiles/per-user/$USER/channels:nixos-config=/etc/nixos/machines/khad/configuration.nix"''; + # Set your time zone. time.timeZone = "US/Mountain"; @@ -48,12 +50,12 @@ # }; # Enable the X11 windowing system. - # services.xserver.enable = true; + services.xserver.enable = true; # Enable the Plasma 5 Desktop Environment. - # services.xserver.displayManager.sddm.enable = true; - # services.xserver.desktopManager.plasma5.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; # Configure keymap in X11 diff --git a/machines/khad/hardware-configuration.nix b/machines/khad/hardware-configuration.nix index d1e49e9..dc32bab 100644 --- a/machines/khad/hardware-configuration.nix +++ b/machines/khad/hardware-configuration.nix @@ -8,7 +8,7 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" "sr_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; @@ -19,7 +19,7 @@ }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/0873-40C7"; + { device = "/dev/disk/by-uuid/B741-9318"; fsType = "vfat"; }; @@ -28,13 +28,13 @@ fsType = "ext4"; }; - fileSystems."/home/devinf/Drives" = + fileSystems."/home/defin/Drives" = { device = "/dev/disk/by-uuid/ba4e233d-d31a-4e5a-9054-0241bd58ba8e"; fsType = "ext4"; }; swapDevices = - [ { device = "/dev/disk/by-uuid/74384a53-3895-4c6b-ba89-ff7ff82323a4"; } + [ { device = "/dev/disk/by-uuid/e75daaf1-d6c6-43c3-8a61-ff26b4304f71"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking -- cgit v1.2.3 From dddd3cb2679b10f16d9f651af106a88fbd21ba55 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Tue, 5 Sep 2023 09:05:13 -0600 Subject: removed reduntant lines --- machines/khad/configuration.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'machines/khad') diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix index abc703b..e4f5c96 100644 --- a/machines/khad/configuration.nix +++ b/machines/khad/configuration.nix @@ -49,13 +49,13 @@ # useXkbConfig = true; # use xkbOptions in tty. # }; - # Enable the X11 windowing system. - services.xserver.enable = true; + # # Enable the X11 windowing system. + # services.xserver.enable = true; - # Enable the Plasma 5 Desktop Environment. - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; + # # Enable the Plasma 5 Desktop Environment. + # services.xserver.displayManager.sddm.enable = true; + # services.xserver.desktopManager.plasma5.enable = true; # Configure keymap in X11 -- cgit v1.2.3 From 08f5c83ab9461727d1d31b2d035d2745e8b48c80 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Tue, 5 Sep 2023 09:23:11 -0600 Subject: added gpu drivers and opengl --- machines/khad/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'machines/khad') diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix index e4f5c96..7a754cf 100644 --- a/machines/khad/configuration.nix +++ b/machines/khad/configuration.nix @@ -32,6 +32,8 @@ config.allowUnfree = true; }; + services.xserver.videoDrivers = [ "nvidia" ]; + hardware.opengl.driSupport32Bit = true; environment.shellInit = ''export NIXPATH="/nix/var/nix/profiles/per-user/$USER/channels:nixos-config=/etc/nixos/machines/khad/configuration.nix"''; # Set your time zone. -- cgit v1.2.3