From 37879cd9e705fc2cbe89bdcd61e3b8ee59244496 Mon Sep 17 00:00:00 2001 From: chest Date: Fri, 11 Apr 2025 14:16:29 +0300 Subject: [PATCH] Impreza --- flake.nix | 15 +++++++++ host/Impreza/configuration.nix | 27 +++++++++++++++ host/Impreza/hardware-configuration.nix | 44 +++++++++++++++++++++++++ host/Impreza/modules/grub.nix | 13 ++++++++ host/Impreza/secrets | 1 + modules/user.nix | 1 - user/chest/modules/style.nix | 2 +- 7 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 host/Impreza/configuration.nix create mode 100644 host/Impreza/hardware-configuration.nix create mode 100644 host/Impreza/modules/grub.nix create mode 120000 host/Impreza/secrets diff --git a/flake.nix b/flake.nix index a35b02e..cfb47e4 100644 --- a/flake.nix +++ b/flake.nix @@ -86,6 +86,21 @@ }; modules = [ ./host/Eclipse/configuration.nix ]; }; + + Impreza = nixpkgs.lib.nixosSystem { + specialArgs = { + pkgs-stable = import nixpkgs-stable { + inherit system; + config.allowUnfree = true; + }; + pkgs-fixed = import nixpkgs-fixed { + inherit system; + config.allowUnfree = true; + }; + inherit inputs system; + }; + modules = [ ./host/Impreza/configuration.nix ]; + }; }; devShells."${system}".default = let diff --git a/host/Impreza/configuration.nix b/host/Impreza/configuration.nix new file mode 100644 index 0000000..d3a6187 --- /dev/null +++ b/host/Impreza/configuration.nix @@ -0,0 +1,27 @@ +{ config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, ...}: { + imports = [ + ./secrets/secrets.nix + ./modules/grub.nix + + (import ../modules/common.nix { + inherit lib; + inherit inputs; + hostname = "Impreza"; + }) + + (import ../../user/common.nix { + inherit config; + inherit pkgs; + inherit pkgs-stable; + inherit pkgs-fixed; + inherit lib; + inherit inputs; + name = "chest"; + }) + ]; + + nixpkgs.config.allowBroken = true; + programs.gamemode.enable = true; + hardware.bluetooth.enable = true; + host.laptop = true; +} diff --git a/host/Impreza/hardware-configuration.nix b/host/Impreza/hardware-configuration.nix new file mode 100644 index 0000000..8e57cf3 --- /dev/null +++ b/host/Impreza/hardware-configuration.nix @@ -0,0 +1,44 @@ +# 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" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/31247de4-e9c0-4690-8bce-8380377b6872"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/328A-299C"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + fileSystems."/mnt/Windows" = + { device = "/dev/disk/by-uuid/84E48B00E48AF428"; + fsType = "ntfs"; + options = [ "umask=0022" "gid=100" "uid=1000" "nofail" ]; + }; + + 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.wlp0s20f3.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/host/Impreza/modules/grub.nix b/host/Impreza/modules/grub.nix new file mode 100644 index 0000000..0ad09e8 --- /dev/null +++ b/host/Impreza/modules/grub.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: let + theme = pkgs.fetchFromGitHub { + owner = "OliveThePuffin"; + repo = "yorha-grub-theme"; + rev = "4d9cd37baf56c4f5510cc4ff61be278f11077c81"; + hash = "sha256-XVzYDwJM7Q9DvdF4ZOqayjiYpasUeMhAWWcXtnhJ0WQ="; + }; +in { + boot.loader.grub = { + gfxmodeEfi = "1920x1080"; + theme = "${theme}/yorha-1920x1080"; + }; +} diff --git a/host/Impreza/secrets b/host/Impreza/secrets new file mode 120000 index 0000000..a4b096b --- /dev/null +++ b/host/Impreza/secrets @@ -0,0 +1 @@ +../Eclipse/secrets \ No newline at end of file diff --git a/modules/user.nix b/modules/user.nix index f414261..29a265b 100644 --- a/modules/user.nix +++ b/modules/user.nix @@ -12,7 +12,6 @@ ./user/wofi.nix ./user/mako.nix ./user/ghostty.nix - ./user/packages/art.nix ./user/packages/desktop.nix ./user/packages/coding.nix ./user/packages/utils.nix diff --git a/user/chest/modules/style.nix b/user/chest/modules/style.nix index bdcec25..4d4eb35 100644 --- a/user/chest/modules/style.nix +++ b/user/chest/modules/style.nix @@ -23,7 +23,7 @@ cursor = { name = "catppuccin-mocha-peach-cursors"; - size = 24; + size = 16; package = pkgs.catppuccin-cursors.mochaPeach; };