From 24aaaa13b20c45cdf8a85134aa092d33ac3bfa8b Mon Sep 17 00:00:00 2001 From: Nickiel12 Date: Tue, 8 Nov 2022 19:08:54 -0800 Subject: [PATCH] straight copy segregation --- configuration.nix | 179 ------------------ flake.nix | 36 +--- hosts/configuration.nix | 71 +++++++ hosts/default.nix | 36 ++++ .../hardware-configuration.nix | 0 home.nix => hosts/home.nix | 3 +- hosts/laptop/default.nix | 20 ++ hosts/laptop/hardware-configuration.nix | 43 +++++ hosts/laptop/home.nix | 0 modules/kmonad.nix | 24 +++ modules/plasma_desktop.nix | 35 ++++ 11 files changed, 235 insertions(+), 212 deletions(-) delete mode 100644 configuration.nix create mode 100644 hosts/configuration.nix create mode 100644 hosts/default.nix rename hardware-configuration.nix => hosts/hardware-configuration.nix (100%) rename home.nix => hosts/home.nix (97%) create mode 100644 hosts/laptop/default.nix create mode 100644 hosts/laptop/hardware-configuration.nix create mode 100644 hosts/laptop/home.nix create mode 100644 modules/kmonad.nix create mode 100644 modules/plasma_desktop.nix diff --git a/configuration.nix b/configuration.nix deleted file mode 100644 index c48a0c4..0000000 --- a/configuration.nix +++ /dev/null @@ -1,179 +0,0 @@ -# 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, lib, pkgs, inputs, ... }: - -let - user = "nixolas"; -in -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - boot.supportedFilesystems = [ "nfts" ]; - boot.loader.systemd-boot.configurationLimit = 5; - boot.loader = { - efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/boot"; - }; - grub = { - devices = [ "nodev" ]; - efiSupport = true; - enable = true; - version = 2; - # useOSProber = true; - }; - }; - - networking.hostName = "NicksNixOs"; # Define your hostname. - # Pick only one of the below networking options. - networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. - - # Set your time zone. - time.timeZone = "America/Los_Angeles"; - - i18n.defaultLocale = "en_US.UTF-8"; - console = { - font = "Lat2-Terminus16"; - useXkbConfig = true; # use xkbOptions in tty. - }; - - # Enable the X11 windowing system. - services.xserver = { - enable = true; - displayManager = { - lightdm.enable = true; - }; - desktopManager.plasma5.enable = true; - }; - - - # Configure keymap in X11 - services.xserver.layout = "us"; - services.xserver.xkbOptions = "caps:super"; - services.kmonad = { - enable = true; - - keyboards.internal = { - device = "/dev/input/by-path/platform-i8042-serio-0-event-kbd"; - config = builtins.readFile ./rsrcs/keyboard.kbd; - - - defcfg = { - enable = true; - fallthrough = true; - allowCommands = true; - }; - }; - }; - - security.pam.services = { - lightdm.enableKwallet = true; - }; - - nixpkgs.config.allowUnfree = true; - - # Enable CUPS to print documents. - services.printing.enable = true; - - # Enable sound. - sound = { - enable = true; - mediaKeys.enable = true; - }; - hardware.pulseaudio.enable = true; - - # Enable touchpad support (enabled default in most desktopManager). - services.xserver.libinput = { - enable = true; - touchpad = { - tapping = true; - naturalScrolling = true; - disableWhileTyping = true; - tappingDragLock = true; - - additionalOptions = '' - Option "TappingButtonMap" "lmr" - ''; - }; - }; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.${user} = { - isNormalUser = true; - extraGroups = [ "wheel" "video" "audio" "networkmanager" "lp" "scanner" "input" "uinput" ]; # Enable ‘sudo’ for the user. - shell = pkgs.zsh; - password = "password"; - }; - - # 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 - ]; - - fonts.fonts = with pkgs; [ - dejavu_fonts - meslo-lgs-nf - ]; - - - system.autoUpgrade.enable = true; - - nix.settings.auto-optimise-store = true; - nix.gc = { - automatic = true; - dates = "monthly"; - options = "--delete-older-than 30d"; - }; - - nix = { - package = pkgs.nixVersions.stable; - extraOptions = "experimental-features = nix-command flakes"; - }; - - services.udev.extraRules = - '' - # KMonad user access to /dev/uinput - KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput" - ''; - - # 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; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - - # 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 = "22.05"; # Did you read the comment? - -} - diff --git a/flake.nix b/flake.nix index bf0794b..23638c1 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "Nick's Nix Flake"; + description = "Nick's NixOS Configuration"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -11,39 +11,13 @@ kmonad.url = "github:kmonad/kmonad?dir=nix"; }; - outputs = { self, nixpkgs, home-manager, kmonad }: + outputs = inputs@{ self, nixpkgs, home-manager, kmonad }: let user = "nixolas"; - system = "x86_64-linux"; - pkgs = import nixpkgs { - inherit system; - config.allowUnfree = true; - }; - lib = nixpkgs.lib; - in { - nixosConfigurations = { - laptop = lib.nixosSystem { - inherit system; - specialArgs = { inherit user; }; - modules = [ - ./configuration.nix - kmonad.nixosModules.default - home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.${user} = { - imports = [ - ./home.nix - ./modules/git.nix - ./modules/urxvt.nix - ./modules/vim.nix - ./modules/zsh.nix - ]; - }; - } - ]; - }; + nixosConfigurations = import ./hosts { + inherit (nixpkgs) lib; + inherit inputs nixpkgs home-manager user kmonad; }; }; } diff --git a/hosts/configuration.nix b/hosts/configuration.nix new file mode 100644 index 0000000..16b934e --- /dev/null +++ b/hosts/configuration.nix @@ -0,0 +1,71 @@ +# 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, lib, pkgs, user, inputs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + boot.supportedFilesystems = [ "nfts" ]; + + boot.loader.systemd-boot.configurationLimit = 5; + + nix.settings.auto-optimise-store = true; + nixpkgs.config.allowUnfree = true; + system.autoUpgrade.enable = true; + nix.gc = { + automatic = true; + options = "--delete-generations 8d"; + }; + + networking.hostName = "NicksNixOs"; + + users.users.${user} = { + isNormalUser = true; + extraGroups = [ "wheel" "video" "audio" "networkmanager" "lp" "scanner" "input" "uinput" ]; + shell = pkgs.zsh; + password = "password"; + }; + + fonts.fonts = with pkgs; [ + dejavu_fonts + meslo-lgs-nf + ]; + + time.timeZone = "America/Los_Angeles"; + + i18n.defaultLocale = "en_US.UTF-8"; + console = { + font = "Lat2-Terminus16"; + useXkbConfig = true; # use xkbOptions in tty. + }; + + hardware.opentabletdriver.enable = true; + hardware.pulseaudio.enable = true; + sound = { + enable = true; + mediaKeys.enable = true; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + nix = { + package = pkgs.nixVersions.stable; + extraOptions = "experimental-features = nix-command flakes"; + }; + + # 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 = "22.05"; # Did you read the comment? + +} + diff --git a/hosts/default.nix b/hosts/default.nix new file mode 100644 index 0000000..f33d048 --- /dev/null +++ b/hosts/default.nix @@ -0,0 +1,36 @@ +{ lib, inputs, nixpkgs, home-manager, user, kmonad, ... }: + +let + system = "x86_64-linux"; + pkgs = import nixpkgs { + inherit system; + config.allowUnfree = true; + }; + lib = nixpkgs.lib; +in { + NicksNixLaptop = lib.nixosSystem { + inherit system; + specialArgs = { inherit user; }; + modules = [ + ./configuration.nix + ./laptop + ../modules/plasma_desktop.nix + ../modules/kmonad.nix + kmonad.nixosModules.default + home-manager.nixosModules.home-manager { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = { inherit user; }; + home-manager.users.${user} = { + imports = [ + ./home.nix + ../modules/git.nix + ../modules/urxvt.nix + ../modules/vim.nix + ../modules/zsh.nix + ]; + }; + } + ]; + }; +} diff --git a/hardware-configuration.nix b/hosts/hardware-configuration.nix similarity index 100% rename from hardware-configuration.nix rename to hosts/hardware-configuration.nix diff --git a/home.nix b/hosts/home.nix similarity index 97% rename from home.nix rename to hosts/home.nix index c865b3d..f0e9b2c 100644 --- a/home.nix +++ b/hosts/home.nix @@ -1,7 +1,6 @@ -{ config, pkgs, ... }: +{ config, pkgs, user, ... }: let - user = "nixolas"; editor = "vim"; moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz); nixpkgs = import { diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix new file mode 100644 index 0000000..41d6774 --- /dev/null +++ b/hosts/laptop/default.nix @@ -0,0 +1,20 @@ +{ ... }: + +{ + imports = [ (import ./hardware-configuration.nix) ]; + + boot.loader = { + efi = { + canTouchEfiVariables = true; + efiSysMountPoint = "/boot"; + }; + grub = { + devices = [ "nodev" ]; + efiSupport = true; + enable = true; + version = 2; + # useOSProber = true; + }; + }; + +} diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/laptop/hardware-configuration.nix new file mode 100644 index 0000000..5e3ba62 --- /dev/null +++ b/hosts/laptop/hardware-configuration.nix @@ -0,0 +1,43 @@ +# 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 = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-label/HOME"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-label/BOOT"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-label/SWAP"; } + ]; + + # 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; + + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix new file mode 100644 index 0000000..e69de29 diff --git a/modules/kmonad.nix b/modules/kmonad.nix new file mode 100644 index 0000000..5e1eb58 --- /dev/null +++ b/modules/kmonad.nix @@ -0,0 +1,24 @@ +{ config, pkgs, ... }: + +{ + services.kmonad = { + enable = true; + + keyboards.internal = { + device = "/dev/input/by-path/platform-i8042-serio-0-event-kbd"; + config = builtins.readFile ../rsrcs/keyboard.kbd; + + defcfg = { + enable = true; + fallthrough = true; + allowCommands = true; + }; + }; + }; + + services.udev.extraRules = + '' + # KMonad user access to /dev/uinput + KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput" + ''; +} diff --git a/modules/plasma_desktop.nix b/modules/plasma_desktop.nix new file mode 100644 index 0000000..186e375 --- /dev/null +++ b/modules/plasma_desktop.nix @@ -0,0 +1,35 @@ +{ config, pkgs, ... }: + +{ + networking.networkmanager.enable = true; + + security.pam.services = { + lightdm.enableKwallet = true; + }; + + services.xserver = { + enable = true; + layout = "us"; + xkbOptions = "caps:super"; + + desktopManager.plasma5.enable = true; + displayManager = { + lightdm.enable = true; + }; + + libinput = { + enable = true; + touchpad = { + tapping = true; + naturalScrolling = true; + disableWhileTyping = true; + tappingDragLock = true; + + additionalOptions = '' + Option "TappingButtonMap" "lmr" + ''; + }; + }; + }; + +}