refactor everything
This commit is contained in:
parent
8955b0a13f
commit
d3c4933628
26 changed files with 40 additions and 270 deletions
|
|
@ -77,8 +77,7 @@
|
|||
inherit modules pkgs;
|
||||
extraSpecialArgs = { inherit inputs outputs; };
|
||||
};
|
||||
in
|
||||
rec {
|
||||
in {
|
||||
# Your custom packages
|
||||
# Acessible through 'nix build', 'nix shell', etc
|
||||
packages = forAllSystems (system:
|
||||
|
|
@ -135,8 +134,8 @@
|
|||
# Keylime Lab
|
||||
keylime = mkNixos [ ./nixos/hosts/keylime ];
|
||||
|
||||
# HP Spectre
|
||||
drone = mkNixos [ ./nixos/hosts/drone ];
|
||||
# HP Spectre
|
||||
drone = mkNixos [ ./nixos/hosts/drone ];
|
||||
};
|
||||
|
||||
darwinConfigurations = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, lib, ... }: {
|
||||
{ ... }: {
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
enableBashIntegration = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... }: {
|
||||
{ ... }: {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, lib, ... }: {
|
||||
{ lib, ... }: {
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
shellIntegration.mode = "enabled";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... }: with builtins; {
|
||||
{ pkgs, ... }: {
|
||||
|
||||
home.packages = [ pkgs.vesktop ];
|
||||
|
||||
|
|
|
|||
|
|
@ -43,6 +43,21 @@
|
|||
barbar.enable = true;
|
||||
gitgutter.enable = true;
|
||||
persistence.enable = true;
|
||||
nvim-cmp.enable = true;
|
||||
cmp-nvim-lsp.enable = true;
|
||||
cmp_luasnip.enable = true;
|
||||
luasnip.enable = true;
|
||||
|
||||
|
||||
lsp = {
|
||||
enable = true;
|
||||
servers = {
|
||||
nil_ls.enable = true;
|
||||
rust-analyzer.enable = true;
|
||||
rust-analyzer.installRustc = false; # use rustc in nix shells, maybe?
|
||||
rust-analyzer.installCargo = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
extraPlugins = with pkgs.vimPlugins; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, config, ... }:
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
inherit (pkgs.stdenv) isDarwin;
|
||||
homeDirectory = if isDarwin then "/Users/noe" else "/home/noe";
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
pod = import ./pod.nix;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,59 +0,0 @@
|
|||
{ pkgs, config, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.pods;
|
||||
|
||||
podOpts = with lib; {
|
||||
container = mkOption {
|
||||
type = types.attrsOf (types.submodule ({ options = podContainerOpts; }));
|
||||
};
|
||||
|
||||
exportPorts = mkOption {
|
||||
type = types.listOf types.str;
|
||||
};
|
||||
|
||||
routes = mkOption {
|
||||
type = types.attrsOf (types.submodule ({ options = routeOpts; }));
|
||||
};
|
||||
};
|
||||
|
||||
podContainerOpts = with lib; {
|
||||
image = mkOption {
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
ports = mkOption {
|
||||
type = types.listOf types.str;
|
||||
};
|
||||
|
||||
environment = mkOption {
|
||||
type = types.attrsOf types.str;
|
||||
};
|
||||
|
||||
secrets = mkOption {
|
||||
type = types.attrsOf types.path;
|
||||
};
|
||||
|
||||
volumes = mkOption {
|
||||
type = types.attrsOf types.str;
|
||||
};
|
||||
};
|
||||
|
||||
routeOpts = with lib; {
|
||||
port = mkOption {
|
||||
type = types.str;
|
||||
};
|
||||
};
|
||||
in {
|
||||
options.pods = with lib; {
|
||||
enable = mkEnableOption "Enable pod support";
|
||||
|
||||
pods = mkOption {
|
||||
type = types.attrsOf (types.submodule ({ options = podOpts; }));
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Things every machine will have...
|
||||
|
||||
{ inputs, outputs, lib, config, pkgs, ... }: {
|
||||
{ inputs, outputs, lib, pkgs, ... }: {
|
||||
imports = [
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
./users/noe.nix
|
||||
|
|
@ -63,10 +63,8 @@
|
|||
gc.automatic = true;
|
||||
settings = {
|
||||
experimental-features = "nix-command flakes";
|
||||
#auto-optimize-store = true;
|
||||
auto-optimise-store = true;
|
||||
trusted-users = [ "root" "@wheel" ];
|
||||
};
|
||||
};
|
||||
|
||||
# system.copySystemConfiguration = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
{ pkgs, inputs, ... }: {
|
||||
#imports = [
|
||||
# inputs.kde2nix.nixosModules.plasma6
|
||||
#];
|
||||
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
displayManager.sddm = {
|
||||
enable = true;
|
||||
wayland.enable = true;
|
||||
};
|
||||
desktopManager.plasma5 = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
programs.xwayland.enable = true;
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{pkgs, ...}: {
|
||||
{...}: {
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
#recommendedTlsSettings = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, ... }: {
|
||||
{ ... }: {
|
||||
|
||||
virtualisation = {
|
||||
docker.enable = false;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, lib, ... }: {
|
||||
{ lib, ... }: {
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = lib.mkDefault true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ config, ... }: {
|
||||
|
||||
sops.secrets.tailscale_auth_key = {};
|
||||
services.tailscale = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, ... }: {
|
||||
{ ... }: {
|
||||
|
||||
networking.networkmanager = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, ... }: {
|
||||
{ ... }: {
|
||||
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, inputs, ... }: {
|
||||
{ pkgs, inputs, ... }: {
|
||||
imports = [
|
||||
inputs.apple-silicon.nixosModules.apple-silicon-support
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, config, pkgs, outputs, ... }: {
|
||||
{ ... }: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
../../client.nix
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, config, pkgs, outputs, ... }: {
|
||||
{ ... }: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
../../client.nix
|
||||
|
|
|
|||
|
|
@ -1,163 +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, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
../../client.nix
|
||||
];
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.kernelPackages = pkgs.linuxPackages_zen;
|
||||
|
||||
networking.hostName = "thonkpad"; # Define your hostname.
|
||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
|
||||
# Configure network proxy if necessary
|
||||
|
||||
|
||||
# Enable networking
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
services.tailscale = {
|
||||
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";
|
||||
};
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
|
||||
|
||||
# Configure keymap in X11
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
displayManager = {
|
||||
defaultSession = "xfce";
|
||||
sddm.enable = true;
|
||||
#sddm.wayland.enable = true;
|
||||
};
|
||||
desktopManager = {
|
||||
xterm.enable = false;
|
||||
xfce.enable = true;
|
||||
};
|
||||
layout = "us";
|
||||
xkbVariant = "";
|
||||
};
|
||||
|
||||
# Enable CUPS to print documents.
|
||||
#services.printing.enable = true;
|
||||
|
||||
# Enable sound with pipewire.
|
||||
sound.enable = true;
|
||||
hardware.pulseaudio.enable = false;
|
||||
security.rtkit.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;
|
||||
|
||||
# use the example session manager (no others are packaged yet so this is enabled by default,
|
||||
# no need to redefine it in your config for now)
|
||||
#media-session.enable = true;
|
||||
};
|
||||
|
||||
# Enable touchpad support (enabled default in most desktopManager).
|
||||
# services.xserver.libinput.enable = true;
|
||||
|
||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||
users.users.noe = {
|
||||
isNormalUser = true;
|
||||
description = "noe";
|
||||
extraGroups = [ "networkmanager" "wheel" ];
|
||||
packages = with pkgs; [
|
||||
firefox
|
||||
];
|
||||
};
|
||||
|
||||
# Allow unfree packages
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
environment.systemPackages = with pkgs; [
|
||||
curl
|
||||
kitty
|
||||
git
|
||||
zsh
|
||||
];
|
||||
|
||||
# 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 = "24.05"; # Did you read the comment?
|
||||
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
};
|
||||
|
||||
fonts = {
|
||||
packages = with pkgs; [
|
||||
atkinson-hyperlegible
|
||||
(nerdfonts.override { fonts = [ "FiraCode" ]; })
|
||||
];
|
||||
fontDir.enable = true;
|
||||
enableDefaultPackages = true;
|
||||
fontconfig.defaultFonts = {
|
||||
sansSerif = [ "Atkinson Hyperlegible" ];
|
||||
serif = [ "Atkinson Hyperlegible" ];
|
||||
monospace = [ "FiraCode Nerd Font" "Fira Code" ];
|
||||
};
|
||||
};
|
||||
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
}
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
pod = { pkgs, ... }: podName: containers: ports: {
|
||||
systemd.services."ensure-pod_${podName}" = let
|
||||
in {
|
||||
systemd.services."ensure-pod_${podName}" = {
|
||||
serviceConfig.Type = "oneshot";
|
||||
wantedBy = map (x: "podman-${x}.service") containers;
|
||||
script = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, config, modulesPath, lib, ... }: {
|
||||
{ pkgs, modulesPath, lib, ... }: {
|
||||
imports = [
|
||||
(modulesPath + "/virtualisation/proxmox-lxc.nix")
|
||||
../users/noe.nix
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# A nixpkgs instance that is grabbed from the pinned nixpkgs commit in the lock file
|
||||
# This is useful to avoid using channels when using legacy nix commands
|
||||
let lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked;
|
||||
in
|
||||
import (fetchTarball {
|
||||
let
|
||||
lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked;
|
||||
in import (fetchTarball {
|
||||
url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz";
|
||||
sha256 = lock.narHash;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,3 +1,2 @@
|
|||
{ pkgs ? (import ../nixpkgs.nix) { }, ... }: rec {
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
age
|
||||
ssh-to-age
|
||||
bun
|
||||
nil
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue