diff --git a/flake.nix b/flake.nix index 6f2f12e..e09d374 100644 --- a/flake.nix +++ b/flake.nix @@ -91,7 +91,7 @@ in { # Please replace my-nixos with your hostname nixosConfigurations = { - "anzu" = mkNixOSConfigurations { + anzu = mkNixOSConfigurations { host = hosts.anzu; nixpkgs = inputs.nixpkgs; home-manager = inputs.home-manager; @@ -101,7 +101,7 @@ } ]; }; - "ichigo" = mkNixOSConfigurations { + ichigo = mkNixOSConfigurations { host = hosts.ichigo; nixpkgs = inputs.nixpkgs; home-manager = inputs.home-manager; @@ -111,6 +111,16 @@ } ]; }; + kuromi = mkNixOSConfigurations { + host = hosts.kuromi; + nixpkgs = inputs.nixpkgs; + home-manager = inputs.home-manager; + modules = [ + { + home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; + } + ]; + }; }; }; } diff --git a/hosts/anzu/configuration.nix b/hosts/anzu/configuration.nix index 1948ba4..3e885a7 100644 --- a/hosts/anzu/configuration.nix +++ b/hosts/anzu/configuration.nix @@ -6,6 +6,7 @@ imports = [ ./hardware-configuration.nix ../../nixos/desktop.nix + ../../nixos/hypr.nix ]; hardware.graphics = { diff --git a/hosts/ichigo/configuration.nix b/hosts/ichigo/configuration.nix index 1948ba4..3e885a7 100644 --- a/hosts/ichigo/configuration.nix +++ b/hosts/ichigo/configuration.nix @@ -6,6 +6,7 @@ imports = [ ./hardware-configuration.nix ../../nixos/desktop.nix + ../../nixos/hypr.nix ]; hardware.graphics = { diff --git a/hosts/kuromi/configuration.nix b/hosts/kuromi/configuration.nix new file mode 100644 index 0000000..d792a7f --- /dev/null +++ b/hosts/kuromi/configuration.nix @@ -0,0 +1,17 @@ +# 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 + ../../nixos/desktop.nix + ]; + + networking.hostName = "kuromi"; + + system.stateVersion = "25.05"; +} diff --git a/hosts/kuromi/hardware-configuration.nix b/hosts/kuromi/hardware-configuration.nix new file mode 100644 index 0000000..52ebffc --- /dev/null +++ b/hosts/kuromi/hardware-configuration.nix @@ -0,0 +1,40 @@ +# 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" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/612f8704-c020-4188-85a7-27127e9b9ff2"; + fsType = "btrfs"; + options = [ "subvol=@" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/2211-57BE"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + 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.eno0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/kuromi/home.nix b/hosts/kuromi/home.nix new file mode 100644 index 0000000..3c0aa01 --- /dev/null +++ b/hosts/kuromi/home.nix @@ -0,0 +1,12 @@ +{ + config, + pkgs, + ... +}: { + imports = [ + ../../home/desktop.nix + ../../home/plasma.nix + ]; + + home.stateVersion = "25.05"; +} diff --git a/nixos/desktop.nix b/nixos/desktop.nix index 60aab53..4cdfebc 100644 --- a/nixos/desktop.nix +++ b/nixos/desktop.nix @@ -28,20 +28,6 @@ kate ]; - # Cachix for Hyprland - nix.settings = { - substituters = ["https://hyprland.cachix.org"]; - trusted-substituters = ["https://hyprland.cachix.org"]; - trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; - }; - - # Hyprland - programs.hyprland = { - enable = true; - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; - portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; - }; - # Catppuccin catppuccin = { sddm = { diff --git a/nixos/hypr.nix b/nixos/hypr.nix new file mode 100644 index 0000000..e3ee307 --- /dev/null +++ b/nixos/hypr.nix @@ -0,0 +1,20 @@ +{ + config, + pkgs, + inputs, + ... +}: { + # Cachix for Hyprland + nix.settings = { + substituters = ["https://hyprland.cachix.org"]; + trusted-substituters = ["https://hyprland.cachix.org"]; + trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; + }; + + # Hyprland + programs.hyprland = { + enable = true; + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; + }; +}