From e6f179edccff9b7b28eadbf3264884386323e9bc Mon Sep 17 00:00:00 2001 From: vitrial Date: Wed, 9 Oct 2024 14:41:59 -0400 Subject: [PATCH] initial commit --- flake.lock | 27 +++++ flake.nix | 16 +++ nixos/configuration.nix | 175 +++++++++++++++++++++++++++++++ nixos/configuration.nix.bak | 128 ++++++++++++++++++++++ nixos/hardware-configuration.nix | 38 +++++++ nixos/modules/layout.nix | 36 +++++++ nixos/modules/ratpoison.nix | 0 nixos/test | 2 + 8 files changed, 422 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 nixos/configuration.nix create mode 100644 nixos/configuration.nix.bak create mode 100644 nixos/hardware-configuration.nix create mode 100644 nixos/modules/layout.nix create mode 100644 nixos/modules/ratpoison.nix create mode 100644 nixos/test diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..a4593ca --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1711333969, + "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..02c9f82 --- /dev/null +++ b/flake.nix @@ -0,0 +1,16 @@ +{ + description = "Nixos config flake"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + }; + + outputs = { self, nixpkgs, ... }@inputs: { + nixosConfigurations.nixos= nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs;}; + modules = [ + ./nixos/configuration.nix + ]; + }; + }; +} diff --git a/nixos/configuration.nix b/nixos/configuration.nix new file mode 100644 index 0000000..76fe531 --- /dev/null +++ b/nixos/configuration.nix @@ -0,0 +1,175 @@ +# 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. + ./modules/layout.nix + ./hardware-configuration.nix + ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "nixos"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + services.xserver.enable = true; + + services.xserver.displayManager = { + startx.enable = true; + lightdm.enable = false; + }; + + # Enable networking + networking.networkmanager.enable = true; + #networking.wireless.enable = true; + #networking.wireless.userControlled.enable = true; + + # Set your time zone. + time.timeZone = "America/New_York"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; + + # Configure keymap in X11 + services.xserver = { + xkb.layout = "us"; + #xkb.variant = "colemak_dh_iso"; + excludePackages = [ pkgs.xterm ]; + }; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.vitrial = { + isNormalUser = true; + description = "vitrial"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; []; + }; + + security.sudo.wheelNeedsPassword = false; + + programs.nano.enable = false; + + programs.steam.enable = true; + + services.fprintd.enable = true; + services.fprintd.tod.enable = true; + services.fprintd.tod.driver = pkgs.libfprint-2-tod1-vfs0090; + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # 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. + eza + wget + home-manager + xdotool + xorg.xkbcomp + xorg.libX11 + xorg.libXinerama + picom + ratpoison + arandr + pavucontrol + zoom-us + (python3.withPackages (ps: with ps; [ scapy ])) + (st.overrideAttrs (oldAttrs: rec { + buildInputs = oldAttrs.buildInputs ++ [ harfbuzz ]; + patches = [ + (fetchpatch { + url = "https://software.vitrial.xyz/nix-st.diff"; + sha256 = "1ph4nb8d9vkaq1rcdzlavhppxp1ikqygljqbnkpmx6j80khvjz3h"; + }) + ]; + })) + ]; + + fonts.packages = with pkgs; [ + (nerdfonts.override { fonts = [ "FiraCode" ]; }) + ]; + + console.colors = [ + "1E2127" + "E06C75" + "98C379" + "D19A66" + "5B9BB3" + "C678DD" + "56B6C2" + "ABB2BF" + "5C6370" + "E06C75" + "98C379" + "D19A66" + "5B9BB3" + "C678DD" + "56B6C2" + "FFFFFF" + ]; + + # 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; + + hardware.bluetooth.enable = true; # enables support for Bluetooth + hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot +services.blueman.enable = true; +services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; +}; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # 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 = "23.11"; # Did you read the comment? + +} diff --git a/nixos/configuration.nix.bak b/nixos/configuration.nix.bak new file mode 100644 index 0000000..19a39b4 --- /dev/null +++ b/nixos/configuration.nix.bak @@ -0,0 +1,128 @@ +# 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 + ]; + + # Bootloader. + boot.loader.grub.enable = true; + boot.loader.grub.device = "/dev/vda"; + boot.loader.grub.useOSProber = true; + + networking.hostName = "nixos"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + services.xserver.enable = true; + + services.xserver.displayManager = { + startx.enable = true; + lightdm.enable = false; + }; + + services.xserver.windowManager.ratpoison.enable = true; + + # Enable networking + networking.networkmanager.enable = false; + networking.wireless.enable = true; + networking.wireless.userControlled.enable = true; + + # Set your time zone. + time.timeZone = "America/New_York"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; + + # Configure keymap in X11 + services.xserver = { + xkb.layout = "us"; + xkb.variant = ""; + excludePackages = [ pkgs.xterm ]; + }; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.vitrial = { + isNormalUser = true; + description = "vitrial"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; []; + }; + + programs.nano.enable = false; + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # 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. + eza + wget + home-manager + (st.overrideAttrs (oldAttrs: rec { + buildInputs = oldAttrs.buildInputs ++ [ harfbuzz ]; + patches = [ + (fetchpatch { + url = "https://software.vitrial.xyz/nix-st.diff"; + sha256 = "1ph4nb8d9vkaq1rcdzlavhppxp1ikqygljqbnkpmx6j80khvjz3h"; + }) + ]; + })) + ]; + + fonts.packages = with pkgs; [ + (nerdfonts.override { fonts = [ "FiraCode" ]; }) + ]; + + # 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; + + # 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 = "23.11"; # Did you read the comment? + +} diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix new file mode 100644 index 0000000..cf0ec49 --- /dev/null +++ b/nixos/hardware-configuration.nix @@ -0,0 +1,38 @@ +# 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" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/acf26d7a-5f3c-4b2f-8ad7-7d17286d9b0a"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/4749-C6CD"; + fsType = "vfat"; + }; + + 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.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/nixos/modules/layout.nix b/nixos/modules/layout.nix new file mode 100644 index 0000000..3933436 --- /dev/null +++ b/nixos/modules/layout.nix @@ -0,0 +1,36 @@ +# 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, ... }: + +{ + services.keyd = { + enable = true; + keyboards.default.settings.main = { + e = "f"; + r = "p"; + t = "b"; + y = "j"; + u = "l"; + i = "u"; + o = "y"; + p = "semicolon"; + s = "r"; + d = "s"; + f = "t"; + h = "m"; + j = "n"; + k = "e"; + l = "i"; + semicolon = "o"; + v = "d"; + b = "v"; + n = "k"; + m = "h"; + capslock = "leftshift"; + leftshift = "escape"; + rightalt = "rightshift"; + }; + }; +} diff --git a/nixos/modules/ratpoison.nix b/nixos/modules/ratpoison.nix new file mode 100644 index 0000000..e69de29 diff --git a/nixos/test b/nixos/test new file mode 100644 index 0000000..317e967 --- /dev/null +++ b/nixos/test @@ -0,0 +1,2 @@ +hello +hello