From 4c9aa15b49894fcc542676d671565267347b7824 Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Mon, 10 Jul 2023 11:49:55 +0300 Subject: [PATCH] Added hermes - my laptop Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com> --- flake.lock | 84 ++++++++++- flake.nix | 18 +++ hosts/hermes/configuration.nix | 184 ++++++++++++++++++++++++ hosts/hermes/hardware-configuration.nix | 54 +++++++ 4 files changed, 335 insertions(+), 5 deletions(-) create mode 100644 hosts/hermes/configuration.nix create mode 100644 hosts/hermes/hardware-configuration.nix diff --git a/flake.lock b/flake.lock index 5d8d073..993c23d 100644 --- a/flake.lock +++ b/flake.lock @@ -189,6 +189,28 @@ "type": "github" } }, + "everblush": { + "inputs": { + "flake-parts": "flake-parts", + "nix-filter": "nix-filter", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688978298, + "narHash": "sha256-kDfbUjqNQ3wJjlcaK6JbW9GDqb/NQG6RNAbaMZaJYII=", + "owner": "Ultra980", + "repo": "everblush-gtk-flake", + "rev": "7354d16a5037ad1bd2521dd47466061fce7d9c7a", + "type": "github" + }, + "original": { + "owner": "Ultra980", + "repo": "everblush-gtk-flake", + "type": "github" + } + }, "evil-collection": { "flake": false, "locked": { @@ -357,7 +379,25 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1688466019, + "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { "lastModified": 1687762428, @@ -595,8 +635,8 @@ }, "nix-but-gigachad": { "inputs": { - "flake-parts": "flake-parts", - "nix-filter": "nix-filter", + "flake-parts": "flake-parts_2", + "nix-filter": "nix-filter_2", "nixpkgs": [ "nixpkgs" ] @@ -675,6 +715,21 @@ "type": "github" } }, + "nix-filter_2": { + "locked": { + "lastModified": 1687178632, + "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nix-software-center": { "inputs": { "nixpkgs": [ @@ -744,6 +799,24 @@ } }, "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1688049487, + "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_2": { "locked": { "dir": "lib", "lastModified": 1682879489, @@ -761,7 +834,7 @@ "type": "github" } }, - "nixpkgs-lib_2": { + "nixpkgs-lib_3": { "locked": { "dir": "lib", "lastModified": 1685564631, @@ -914,7 +987,7 @@ }, "parts_2": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { "lastModified": 1683560683, @@ -964,6 +1037,7 @@ }, "root": { "inputs": { + "everblush": "everblush", "eww": "eww", "helix": "helix", "home-manager": "home-manager", diff --git a/flake.nix b/flake.nix index abc5dda..2e861a0 100644 --- a/flake.nix +++ b/flake.nix @@ -39,6 +39,10 @@ url = "github:viperML/nh"; inputs.nixpkgs.follows = "nixpkgs"; }; + everblush = { + url = "github:Ultra980/everblush-gtk-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, home-manager, ... }@inputs: { @@ -61,6 +65,20 @@ # { programs.hyprland.enable = true; } ]; }; + hermes = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; + modules = [ + ./hosts/hermes/configuration.nix + { + environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath; + nix.nixPath = [ + "nixpkgs=/etc/nix/inputs/nixpkgs" + "nixos-config=/home/ultra/.nixdotfiles" + ]; + } + ]; + }; ultrapi = nixpkgs.lib.nixosSystem { system = "aarch64-linux"; specialArgs = { inherit inputs; }; diff --git a/hosts/hermes/configuration.nix b/hosts/hermes/configuration.nix new file mode 100644 index 0000000..1505ef3 --- /dev/null +++ b/hosts/hermes/configuration.nix @@ -0,0 +1,184 @@ +# 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, lib, inputs, ... }: +let + everblush = inputs.everblush.packages.x86_64-linux.default; +in { + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + +# qt.platformTheme = lib.mkForce "gtk2"; +# qt.style = lib.mkForce "gtk2"; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # Setup keyfile + boot.initrd.secrets = { + "/crypto_keyfile.bin" = null; + }; + + boot.initrd.luks.devices."luks-81249bad-ab6b-490e-80e7-6ee8b30a1f80".keyFile = "/crypto_keyfile.bin"; + boot.initrd.luks.devices."luks-27206b13-54e2-4a55-8d9c-064dd9d4cd90".keyFile = "/crypto_keyfile.bin"; + # Enable swap on luks + boot.initrd.luks.devices."luks-9ef62943-d0b5-4a47-8b8b-a2460daab8f8".device = "/dev/disk/by-uuid/9ef62943-d0b5-4a47-8b8b-a2460daab8f8"; + boot.initrd.luks.devices."luks-9ef62943-d0b5-4a47-8b8b-a2460daab8f8".keyFile = "/crypto_keyfile.bin"; + + networking.hostName = "hermes"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable networking + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "Europe/Bucharest"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_GB.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "ro_RO.UTF-8"; + LC_IDENTIFICATION = "ro_RO.UTF-8"; + LC_MEASUREMENT = "ro_RO.UTF-8"; + LC_MONETARY = "ro_RO.UTF-8"; + LC_NAME = "ro_RO.UTF-8"; + LC_NUMERIC = "ro_RO.UTF-8"; + LC_PAPER = "ro_RO.UTF-8"; + LC_TELEPHONE = "ro_RO.UTF-8"; + LC_TIME = "ro_RO.UTF-8"; + }; + + # 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 = "ro"; + xkbVariant = ""; + }; + + # 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; + }; + + # 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.ultra = { + isNormalUser = true; + description = "Alex Stan"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; [ + firefox + wezterm + # thunderbird + ]; + shell = pkgs.fish; + }; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # 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. + # wget + gnomeExtensions.pop-shell + gnomeExtensions.blur-my-shell + gnomeExtensions.rounded-window-corners + gnomeExtensions.prime-indicator + nerdfonts + everblush + ]; + + # 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; + + # 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? + + #services.xserver.desktopManager.budgie.enable = true; + + # NVIDIA + hardware.opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + }; + + services.xserver.videoDrivers = [ "nvidia" ]; + + hardware.nvidia = { + modesetting.enable = true; + open = false; + nvidiaSettings = true; + package = config.boot.kernelPackages.nvidiaPackages.stable; + prime = { + offload = { + enable = true; + enableOffloadCmd = true; + }; + + intelBusId = "PCI:0:2:0"; + nvidiaBusId = "PCI:1:0:0"; + }; + }; + services.switcherooControl.enable = true; + + + services.xserver.libinput.touchpad.disableWhileTyping = false; + + programs.fish.enable = true; +} diff --git a/hosts/hermes/hardware-configuration.nix b/hosts/hermes/hardware-configuration.nix new file mode 100644 index 0000000..28ded9e --- /dev/null +++ b/hosts/hermes/hardware-configuration.nix @@ -0,0 +1,54 @@ +# 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" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/d15f08bb-62b0-469f-960e-8111e0cf2aab"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/9878-D9C9"; + fsType = "vfat"; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/b755988d-ff7d-4f20-8eca-34159e245f58"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-81249bad-ab6b-490e-80e7-6ee8b30a1f80".device = "/dev/disk/by-uuid/81249bad-ab6b-490e-80e7-6ee8b30a1f80"; + + fileSystems."/nix" = + { device = "/dev/disk/by-uuid/a2b1fa66-3f3c-460e-9128-2d8e555aa7d0"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-27206b13-54e2-4a55-8d9c-064dd9d4cd90".device = "/dev/disk/by-uuid/27206b13-54e2-4a55-8d9c-064dd9d4cd90"; + + swapDevices = + [ { device = "/dev/disk/by-uuid/f0696fb4-7cb7-4ce4-8edc-3c5ca4be7323"; } + ]; + + # 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.wlo1.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; +}