From 01cf05bfe6afa8d1142a9580cb68b7ad611f998d Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Tue, 10 Oct 2023 14:27:41 -0600 Subject: trying to fix dpi issues on zenbook --- machines/zenbook/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'machines') diff --git a/machines/zenbook/configuration.nix b/machines/zenbook/configuration.nix index 77e7fe6..db16c3c 100644 --- a/machines/zenbook/configuration.nix +++ b/machines/zenbook/configuration.nix @@ -19,6 +19,10 @@ environment.shellInit = ''export NIXPATH="/nix/var/nix/profiles/per-user/$USER/channels:nixos-config=/etc/nixos/machines/zenbook/configuration.nix"''; + services.xserver.displayManager.sddm.settings = { + ServerArguments = { "-nolisten tcp -dpi 170"}; + } + networking = { firewall = { # Open ports in the firewall. -- cgit v1.2.3 From 9ffaa0e08522f6dc10adf152e492da8f96beb9a1 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Tue, 10 Oct 2023 14:30:09 -0600 Subject: typo --- machines/zenbook/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'machines') diff --git a/machines/zenbook/configuration.nix b/machines/zenbook/configuration.nix index db16c3c..5274432 100644 --- a/machines/zenbook/configuration.nix +++ b/machines/zenbook/configuration.nix @@ -20,8 +20,8 @@ environment.shellInit = ''export NIXPATH="/nix/var/nix/profiles/per-user/$USER/channels:nixos-config=/etc/nixos/machines/zenbook/configuration.nix"''; services.xserver.displayManager.sddm.settings = { - ServerArguments = { "-nolisten tcp -dpi 170"}; - } + ServerArguments = { "-nolisten tcp -dpi 170" }; + }; networking = { firewall = { -- cgit v1.2.3 From 097b748f469c4afa8c556b665dc90d5d25556473 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sun, 15 Oct 2023 18:01:27 -0600 Subject: hoping to fix dpi issues --- machines/zenbook/configuration.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'machines') diff --git a/machines/zenbook/configuration.nix b/machines/zenbook/configuration.nix index 5274432..23947f5 100644 --- a/machines/zenbook/configuration.nix +++ b/machines/zenbook/configuration.nix @@ -19,8 +19,11 @@ environment.shellInit = ''export NIXPATH="/nix/var/nix/profiles/per-user/$USER/channels:nixos-config=/etc/nixos/machines/zenbook/configuration.nix"''; - services.xserver.displayManager.sddm.settings = { - ServerArguments = { "-nolisten tcp -dpi 170" }; + services.xserver.displayManager.sddm = { + enableHidpi = true; + settings = { + serverArguments = "-nolisten tcp -dpi 170"; + }; }; networking = { -- cgit v1.2.3 From 151e6a8ed066a419921d140bc8adcd27802e3c38 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sun, 15 Oct 2023 22:48:30 -0600 Subject: Added bosco (server) machine. --- machines/bosco/configuration.nix | 118 ++++++++++++++++++++++++++++++ machines/bosco/hardware-configuration.nix | 35 +++++++++ 2 files changed, 153 insertions(+) create mode 100644 machines/bosco/configuration.nix create mode 100644 machines/bosco/hardware-configuration.nix (limited to 'machines') diff --git a/machines/bosco/configuration.nix b/machines/bosco/configuration.nix new file mode 100644 index 0000000..46aebce --- /dev/null +++ b/machines/bosco/configuration.nix @@ -0,0 +1,118 @@ +# 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.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "bosco"; # 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; + extraGroups = [ "wheel" "builders" ]; # Enable ‘sudo’ for the user. + hashedPassword = "$6$UljPNAdxZ22lP3Bc$8VaEAacZxtXM3Zji2IA7Jf5fXs9pFnAVQff1d8IbfFOKCvjibceyopOAjRXa8lXtpOSJgPW1OO1dzOspqhWnz0"; + shell = pkgs.nushell; + packages = with pkgs; [ + nushell + tree + ]; + openssh.authorizedKeys.keyFiles = [ + (builtins.fetchurl { + url = "https://gitlab.com/dFinlinson.keys"; + sha256 = "05mmvw190j6dp756bsqp3ssjyv2hq6r8cpc03wzvzgf2bhdg4dvb"; + }) + ]; + }; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + helix # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + 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/bosco/hardware-configuration.nix b/machines/bosco/hardware-configuration.nix new file mode 100644 index 0000000..f768a3f --- /dev/null +++ b/machines/bosco/hardware-configuration.nix @@ -0,0 +1,35 @@ +# 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 = [ "ehci_pci" "megaraid_sas" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/9fb0c7c8-8ee8-48ca-bd3a-3246838d3780"; + fsType = "btrfs"; + }; + + swapDevices = [ ]; + + # 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.eno2.useDHCP = lib.mkDefault true; + # networking.interfaces.eno3.useDHCP = lib.mkDefault true; + # networking.interfaces.eno4.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} -- cgit v1.2.3