commit e81d8c9be4d71f09cb6f35f484e0e9a447a86e05 Author: muon Date: Tue May 28 15:55:10 2024 +0000 Add minimal modular setup diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..153dfbb --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +# nixos-rebuild buildvm --flake .# +result +*.qcow2 diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..81db457 --- /dev/null +++ b/flake.lock @@ -0,0 +1,48 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716457508, + "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..16e0561 --- /dev/null +++ b/flake.nix @@ -0,0 +1,28 @@ +{ + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = { nixpkgs, home-manager, ... }@inputs: + let + system = "x86_64-linux"; + + pkgs = import inputs.nixpkgs { + inherit system; + }; + + utils = import ./utils.nix { inherit pkgs inputs system; }; + in with utils; { + nixosConfigurations = { + muon = mkHost ./hosts/muon/configuration.nix; + }; + + homeConfigurations = { + muon = mkHome ./hosts/muon/home.nix; + }; + }; +} diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix new file mode 100644 index 0000000..e8cf4af --- /dev/null +++ b/hosts/muon/configuration.nix @@ -0,0 +1,20 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.mods; +in { + # Hardware + imports = [ + ./hardware-configuration.nix + ]; + + # System + mods.user.name = "muon"; + networking.hostName = cfg.user.name; + + # Modules + mods.desktop.enable = true; + services.xserver.windowManager.qtile.enable = true; + + # Version of first install + system.stateVersion = "23.05"; +} diff --git a/hosts/muon/hardware-configuration.nix b/hosts/muon/hardware-configuration.nix new file mode 100644 index 0000000..7e274c2 --- /dev/null +++ b/hosts/muon/hardware-configuration.nix @@ -0,0 +1,48 @@ +# 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" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/03e49688-cc62-49c9-a906-e2ea87a38891"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-86769693-b61c-4712-852d-e0fba612d260".device = "/dev/disk/by-uuid/86769693-b61c-4712-852d-e0fba612d260"; + + fileSystems."/mnt/bulk" = + { device = "/dev/disk/by-uuid/11c2c896-d49a-4d9b-a846-b0a550128395"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/CCCC-449E"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + 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.docker0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.tun0.useDHCP = lib.mkDefault true; + # networking.interfaces.vboxnet0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/muon/home.nix b/hosts/muon/home.nix new file mode 100644 index 0000000..555dbf1 --- /dev/null +++ b/hosts/muon/home.nix @@ -0,0 +1,77 @@ +{ config, pkgs, ... }: +let + cfg = config.mods; +in { + # Home Manager needs a bit of information about you and the paths it should + # manage. + home.username = cfg.user.name; + home.homeDirectory = "/home/${cfg.user.name}"; + + # This value determines the Home Manager release that your configuration is + # compatible with. This helps avoid breakage when a new Home Manager release + # introduces backwards incompatible changes. + # + # You should not change this value, even if you update Home Manager. If you do + # want to update the value, then make sure to first check the Home Manager + # release notes. + home.stateVersion = "23.05"; # Please read the comment before changing. + + # The home.packages option allows you to install Nix packages into your + # environment. + home.packages = [ + # # Adds the 'hello' command to your environment. It prints a friendly + # # "Hello, world!" when run. + # pkgs.hello + + # # It is sometimes useful to fine-tune packages, for example, by applying + # # overrides. You can do that directly here, just don't forget the + # # parentheses. Maybe you want to install Nerd Fonts with a limited number of + # # fonts? + # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) + + # # You can also create simple shell scripts directly inside your + # # configuration. For example, this adds a command 'my-hello' to your + # # environment: + # (pkgs.writeShellScriptBin "my-hello" '' + # echo "Hello, ${config.home.username}!" + # '') + ]; + + # Home Manager is pretty good at managing dotfiles. The primary way to manage + # plain files is through 'home.file'. + home.file = { + # # Building this configuration will create a copy of 'dotfiles/screenrc' in + # # the Nix store. Activating the configuration will then make '~/.screenrc' a + # # symlink to the Nix store copy. + # ".screenrc".source = dotfiles/screenrc; + + # # You can also set the file content immediately. + # ".gradle/gradle.properties".text = '' + # org.gradle.console=verbose + # org.gradle.daemon.idletimeout=3600000 + # ''; + }; + + # Home Manager can also manage your environment variables through + # 'home.sessionVariables'. These will be explicitly sourced when using a + # shell provided by Home Manager. If you don't want to manage your shell + # through Home Manager then you have to manually source 'hm-session-vars.sh' + # located at either + # + # ~/.nix-profile/etc/profile.d/hm-session-vars.sh + # + # or + # + # ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh + # + # or + # + # /etc/profiles/per-user/muon/etc/profile.d/hm-session-vars.sh + # + home.sessionVariables = { + # EDITOR = "emacs"; + }; + + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; +} diff --git a/modules/nixos/core/boot.nix b/modules/nixos/core/boot.nix new file mode 100644 index 0000000..3a439cd --- /dev/null +++ b/modules/nixos/core/boot.nix @@ -0,0 +1,4 @@ +{ pkgs, lib, ... }: { + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; +} diff --git a/modules/nixos/core/default.nix b/modules/nixos/core/default.nix new file mode 100644 index 0000000..2c424f5 --- /dev/null +++ b/modules/nixos/core/default.nix @@ -0,0 +1,7 @@ +{ pkgs, lib, ... }: { + imports = [ + ./boot.nix + ./network.nix + ./user.nix + ]; +} diff --git a/modules/nixos/core/network.nix b/modules/nixos/core/network.nix new file mode 100644 index 0000000..bdf9dbc --- /dev/null +++ b/modules/nixos/core/network.nix @@ -0,0 +1,5 @@ +{ pkgs, lib, ... }: { + config = { + networking.networkmanager.enable = true; + }; +} diff --git a/modules/nixos/core/user.nix b/modules/nixos/core/user.nix new file mode 100644 index 0000000..94952d0 --- /dev/null +++ b/modules/nixos/core/user.nix @@ -0,0 +1,16 @@ +{ pkgs, lib, config, ... }: { + options = { + mods.user.name = lib.mkOption { + default = "muon"; + description = "username of the main system user"; + }; + }; + + config = { + users.users.${config.mods.user.name} = { + isNormalUser = true; + extraGroups = [ "wheel" ]; + initialPassword = "changeme"; + }; + }; +} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix new file mode 100644 index 0000000..013e66e --- /dev/null +++ b/modules/nixos/default.nix @@ -0,0 +1,7 @@ +{ pkgs, lib, ... }: { + imports = [ + ./core + ./system + ./desktop + ]; +} diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix new file mode 100644 index 0000000..9cba61f --- /dev/null +++ b/modules/nixos/desktop/default.nix @@ -0,0 +1,15 @@ +{ pkgs, lib, config, ... }: { + imports = [ + ./xorg.nix + ./sound.nix + ]; + + options = { + mods.desktop.enable = lib.mkEnableOption "enables sound"; + }; + + config = lib.mkIf config.mods.desktop.enable { + mods.xorg.enable = true; + mods.sound.enable = true; + }; +} diff --git a/modules/nixos/desktop/sound.nix b/modules/nixos/desktop/sound.nix new file mode 100644 index 0000000..1553209 --- /dev/null +++ b/modules/nixos/desktop/sound.nix @@ -0,0 +1,12 @@ +{ pkgs, lib, config, ... }: { + options = { + mods.sound.enable = lib.mkEnableOption "enables sound"; + }; + + config = lib.mkIf config.mods.sound.enable { + services.pipewire = { + enable = true; + pulse.enable = true; + }; + }; +} diff --git a/modules/nixos/desktop/xorg.nix b/modules/nixos/desktop/xorg.nix new file mode 100644 index 0000000..a4fa701 --- /dev/null +++ b/modules/nixos/desktop/xorg.nix @@ -0,0 +1,11 @@ +{ pkgs, lib, config, ... }: { + options = { + mods.xorg.enable = lib.mkEnableOption "enables xorg"; + }; + + config = lib.mkIf config.mods.xorg.enable { + services.xserver.enable = true; + services.xserver.xkb.layout = "us"; + services.xserver.xkb.options = "caps:escape"; + }; +} diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix new file mode 100644 index 0000000..0710033 --- /dev/null +++ b/modules/nixos/system/default.nix @@ -0,0 +1,7 @@ +{ pkgs, lib, ... }: { + imports = [ + ./locale.nix + ./programs.nix + ./services.nix + ]; +} diff --git a/modules/nixos/system/locale.nix b/modules/nixos/system/locale.nix new file mode 100644 index 0000000..280795b --- /dev/null +++ b/modules/nixos/system/locale.nix @@ -0,0 +1,10 @@ +{ pkgs, lib, config, ... }: { + time.timeZone = "Etc/UTC"; + + i18n.defaultLocale = "en_US.UTF-8"; + console = if config.mods.xorg.enable then { + useXkbConfig = true; + } else { + keymap = "us"; + }; +} diff --git a/modules/nixos/system/programs.nix b/modules/nixos/system/programs.nix new file mode 100644 index 0000000..0999f11 --- /dev/null +++ b/modules/nixos/system/programs.nix @@ -0,0 +1,11 @@ +{ pkgs, lib, ... }: { + environment.systemPackages = with pkgs; [ + vim + wget + ]; + + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; +} diff --git a/modules/nixos/system/services.nix b/modules/nixos/system/services.nix new file mode 100644 index 0000000..23c8388 --- /dev/null +++ b/modules/nixos/system/services.nix @@ -0,0 +1,3 @@ +{ pkgs, lib, ... }: { + services.openssh.enable = true; +} diff --git a/utils.nix b/utils.nix new file mode 100644 index 0000000..625e94c --- /dev/null +++ b/utils.nix @@ -0,0 +1,19 @@ +{ pkgs, inputs, system, ... }: { + mkHost = host: inputs.nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs system pkgs; }; + + modules = [ + host + ./modules/nixos + ]; + }; + + mkHome = host: inputs.home-manager.lib.homeMangerConfiguration { + inherit pkgs; + + modules = [ + host + ./modules/home + ]; + }; +}