diff --git a/flake.lock b/flake.lock index 3aba1bd..bb91030 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,26 @@ "type": "github" } }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722740924, + "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=", + "owner": "nix-community", + "repo": "nix-index-database", + "rev": "97ca0a0fca0391de835f57e44f369a283e37890f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-index-database", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1722813957, @@ -56,6 +76,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" } diff --git a/flake.nix b/flake.nix index 3905cea..11d6ceb 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,10 @@ # Home manager home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + + # nix-index + nix-index-database.url = "github:nix-community/nix-index-database"; + nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = @@ -47,6 +51,13 @@ ./nixos/enoko/configuration.nix ]; }; + + yukari = lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; + modules = [ + ./nixos/yukari/configuration.nix + ]; + }; }; homeConfigurations = { diff --git a/home/global.nix b/home/global.nix index 9409bc3..f616d05 100644 --- a/home/global.nix +++ b/home/global.nix @@ -1,5 +1,6 @@ { inputs, lib, pkgs, config, outputs, ... }: { imports = [ + inputs.nix-index-database.hmModules.nix-index ./common/cli ./common/universal ] ++ (builtins.attrValues outputs.homeManagerModules); @@ -24,7 +25,12 @@ programs = { home-manager.enable = true; - git.enable = true; + }; + + programs.git = { + enable = true; + userEmail = "shadows@with.al"; + userName = "liv"; }; home = { diff --git a/home/yukari.nix b/home/yukari.nix index 07725d8..14c3359 100644 --- a/home/yukari.nix +++ b/home/yukari.nix @@ -1,5 +1,8 @@ # yukari is an arch-based (for now) distro running in Windows under WSL # as such, it does not have or need a graphical shell { inputs, lib, pkgs, ... }: { - # nothing here yet... + imports = [ + ./global.nix + ./desktop/hyprland + ]; } diff --git a/nixos/common/audio.nix b/nixos/common/audio.nix new file mode 100644 index 0000000..9c91853 --- /dev/null +++ b/nixos/common/audio.nix @@ -0,0 +1,12 @@ +{ inputs, config, pkgs, ... }: { + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + environment.systemPackages = with pkgs; [ + pavucontrol + ]; +} diff --git a/nixos/common/default.nix b/nixos/common/default.nix new file mode 100644 index 0000000..2b53c32 --- /dev/null +++ b/nixos/common/default.nix @@ -0,0 +1,5 @@ +{ ... }: { + imports = [ + ./audio.nix + ]; +} diff --git a/nixos/enoko/configuration.nix b/nixos/enoko/configuration.nix index 47dc02f..5cf6689 100644 --- a/nixos/enoko/configuration.nix +++ b/nixos/enoko/configuration.nix @@ -7,6 +7,7 @@ ... }: { imports = [ + ../common ./hardware-configuration.nix ]; diff --git a/nixos/yukari/configuration.nix b/nixos/yukari/configuration.nix new file mode 100644 index 0000000..d6bfbbe --- /dev/null +++ b/nixos/yukari/configuration.nix @@ -0,0 +1,89 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + imports = [ + ../common + ./hardware-configuration.nix + ]; + + nixpkgs = { + config = { + allowUnfree = true; + }; + }; + + nix = let + flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs; + in { + settings = { + experimental-features = "nix-command flakes"; + flake-registry = ""; + nix-path = config.nix.nixPath; + }; + channel.enable = false; + + registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs; + nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs; + }; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "yukari"; + + time.timeZone = "Europe/Berlin"; + + i18n.defaultLocale = "en_US.UTF-8"; + i18n.extraLocaleSettings = { + LC_ADDRESS = "de_DE.UTF-8"; + LC_IDENTIFICATION = "de_DE.UTF-8"; + LC_MEASUREMENT = "de_DE.UTF-8"; + LC_MONETARY = "de_DE.UTF-8"; + LC_NAME = "de_DE.UTF-8"; + LC_NUMERIC = "de_DE.UTF-8"; + LC_PAPER = "de_DE.UTF-8"; + LC_TELEPHONE = "de_DE.UTF-8"; + LC_TIME = "de_DE.UTF-8"; + }; + + services.xserver = { + layout = "us"; + xkbVariant = ""; + }; + + users.users = { + lu = { + shell = pkgs.fish; + isNormalUser = true; + extraGroups = ["wheel"]; + }; + }; + + # network stuff + networking.networkmanager = { + enable = true; + }; + + # fish shell + programs.fish = { + enable = true; + vendor = { + completions.enable = true; + config.enable = true; + functions.enable = true; + }; + }; + + # hyprland stuff + programs.hyprland = { + enable = true; + }; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + system.stateVersion = "23.11"; +} diff --git a/nixos/yukari/hardware-configuration.nix b/nixos/yukari/hardware-configuration.nix new file mode 100644 index 0000000..7663dea --- /dev/null +++ b/nixos/yukari/hardware-configuration.nix @@ -0,0 +1,41 @@ +# 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" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/d8551435-6a35-4ae9-b977-fd5a261c9be7"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/5704-1642"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/d52209e9-f625-46a9-800a-88598ed6fcd5"; } + ]; + + # 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.enp7s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}