From a146ff81c892c00589799251eeaa4c5d132b5478 Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Tue, 4 Jul 2023 12:32:48 +0200 Subject: [PATCH 1/6] Added gnome config to jupiter --- machines/jupiter/configuration.nix | 41 ++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/machines/jupiter/configuration.nix b/machines/jupiter/configuration.nix index cc0c801..7be29b3 100644 --- a/machines/jupiter/configuration.nix +++ b/machines/jupiter/configuration.nix @@ -9,7 +9,48 @@ ]; networking.hostName = "jupiter"; + + boot.loader.grub = { + enable = true; + device = "/dev/nvme0n1"; + useOSProber = true; + }; + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the GNOME Desktop Environment. + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + + # Configure keymap in X11 + services.xserver = { + layout = "de"; + xkbVariant = ""; + }; + + # Configure console keymap + console.keyMap = "de"; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; system = { stateVersion = "23.05"; From 069711977d38ea41a2bee40e9cb85f9f0774a28e Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Tue, 4 Jul 2023 12:40:23 +0200 Subject: [PATCH 2/6] Updated Jupiter Bootloader --- machines/jupiter/configuration.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/machines/jupiter/configuration.nix b/machines/jupiter/configuration.nix index 7be29b3..441d155 100644 --- a/machines/jupiter/configuration.nix +++ b/machines/jupiter/configuration.nix @@ -10,11 +10,8 @@ networking.hostName = "jupiter"; - boot.loader.grub = { - enable = true; - device = "/dev/nvme0n1"; - useOSProber = true; - }; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; # Enable the X11 windowing system. services.xserver.enable = true; From 7b4d03d15a332fb9681f83f937b2657badc9d8f9 Mon Sep 17 00:00:00 2001 From: Finn Date: Tue, 4 Jul 2023 12:44:04 +0200 Subject: [PATCH 3/6] Generated Hardware Infor for Jupiter --- machines/jupiter/disks.nix | 11 ++++++++--- machines/jupiter/hardware-configuration.nix | 20 ++++++++++++++++---- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/machines/jupiter/disks.nix b/machines/jupiter/disks.nix index 6f11613..f4a0c75 100644 --- a/machines/jupiter/disks.nix +++ b/machines/jupiter/disks.nix @@ -3,8 +3,13 @@ #TODO: CHECK THIS OUT: https://github.com/nix-community/disko its kinda better but felix does not support it { - fileSystems."/" = - { device = "/dev/disk/by-uuid/5c778ca7-57fb-44be-ac8c-ae5d2486b7ad"; + fileSystems."/" = + { device = "/dev/disk/by-uuid/f4901cbb-db30-4f14-8d8e-9dbb55aaf098"; fsType = "ext4"; }; -} \ No newline at end of file + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/1121-FAE5"; + fsType = "vfat"; + }; +} diff --git a/machines/jupiter/hardware-configuration.nix b/machines/jupiter/hardware-configuration.nix index 388cfd3..10e9d3c 100644 --- a/machines/jupiter/hardware-configuration.nix +++ b/machines/jupiter/hardware-configuration.nix @@ -4,15 +4,25 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = [ ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/5c778ca7-57fb-44be-ac8c-ae5d2486b7ad"; + { device = "/dev/disk/by-uuid/f4901cbb-db30-4f14-8d8e-9dbb55aaf098"; fsType = "ext4"; }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/1121-FAE5"; + fsType = "vfat"; + }; + swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -20,7 +30,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.enp0s3.useDHCP = lib.mkDefault true; + # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } From dd14951d5a1278ad220d4b0d62826a43af67718b Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Tue, 4 Jul 2023 12:46:40 +0200 Subject: [PATCH 4/6] Removed Grub Bootloader from Core --- machines/core/core.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/machines/core/core.nix b/machines/core/core.nix index 1920013..794cb67 100644 --- a/machines/core/core.nix +++ b/machines/core/core.nix @@ -41,7 +41,6 @@ time.timeZone = "Europe/Berlin"; services.timesyncd.enable = true; - boot.loader.grub.enable = true; # Enable networking networking.networkmanager.enable = true; From 537da46c40edbf0acdde05c57f02af594e860b6b Mon Sep 17 00:00:00 2001 From: Finn Date: Tue, 4 Jul 2023 13:33:34 +0200 Subject: [PATCH 5/6] Added hardware flag to jupiter --- machines/jupiter/hardware-configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/machines/jupiter/hardware-configuration.nix b/machines/jupiter/hardware-configuration.nix index 10e9d3c..070c0bc 100644 --- a/machines/jupiter/hardware-configuration.nix +++ b/machines/jupiter/hardware-configuration.nix @@ -12,6 +12,7 @@ boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; + hardware.enableRedistributableFirmware = true; fileSystems."/" = { device = "/dev/disk/by-uuid/f4901cbb-db30-4f14-8d8e-9dbb55aaf098"; From 9db8fc644a77fa58fffd5dda855390a0dd340785 Mon Sep 17 00:00:00 2001 From: Finn Date: Tue, 4 Jul 2023 14:49:01 +0200 Subject: [PATCH 6/6] Added Apps PAcakge for Gnome Config and Extentions --- machines/jupiter/environments.nix | 1 + modules/environments/apps/default.nix | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 9655e58..5988e31 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -10,6 +10,7 @@ in apps = { desktop_apps = true; dev_apps = true; + gnome_apps = true; }; }; } \ No newline at end of file diff --git a/modules/environments/apps/default.nix b/modules/environments/apps/default.nix index 2b7d48d..654086c 100644 --- a/modules/environments/apps/default.nix +++ b/modules/environments/apps/default.nix @@ -9,6 +9,7 @@ let options.my.profiles.apps = with lib; { desktop_apps = mkEnableOption "Basic Apps"; dev_apps = mkEnableOption "Development Apps"; + gnome_apps = mkEnableOption "Gnome Extentions and Configuration"; }; config = lib.mkIf cfg.desktop_apps { @@ -27,6 +28,10 @@ let jetbrains.goland jetbrains.pycharm-professional jetbrains.idea-ultimate + ] ++ lib.optionals cfg.gnome_apps [ + gnomeExtensions.tweaks-in-system-menu + gnomeExtensions.wireless-hid + gnome.gnome-tweaks ]; }; } \ No newline at end of file