k/nixos_configs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixfmt

Browse Source
This commit is contained in:
k 2024-09-25 16:39:04 -04:00
parent 235b382535
commit 7ce35c7655
11 changed files with 109 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
flake.nix
View File

@ -13,40 +13,39 @@
};
outputs = { self, nixpkgs, nixos-hardware, ... }@inputs:
let
system = "x86_64-linux";
pkg = nixpkgs.legacyPackages.${system};
in
{
nixosConfigurations = {
laptop = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = [
./hosts/laptop/configuration.nix
inputs.home-manager.nixosModules.default
inputs.stylix.nixosModules.stylix
nixos-hardware.nixosModules.lenovo-thinkpad-x13-yoga
];
};
let
system = "x86_64-linux";
pkg = nixpkgs.legacyPackages.${system};
in {
nixosConfigurations = {
laptop = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
modules = [
./hosts/laptop/configuration.nix
inputs.home-manager.nixosModules.default
inputs.stylix.nixosModules.stylix
nixos-hardware.nixosModules.lenovo-thinkpad-x13-yoga
];
};
server = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = [
./hosts/server/configuration.nix
inputs.home-manager.nixosModules.default
nixos-hardware.nixosModules.system76
];
};
server = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
modules = [
./hosts/server/configuration.nix
inputs.home-manager.nixosModules.default
nixos-hardware.nixosModules.system76
];
};
tablet = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = [
./hosts/tablet/configuration.nix
inputs.home-manager.nixosModules.default
nixos-hardware.nixosModules.microsoft-surface-pro-intel
];
};
tablet = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
modules = [
./hosts/tablet/configuration.nix
inputs.home-manager.nixosModules.default
nixos-hardware.nixosModules.microsoft-surface-pro-intel
];
};
};
};
};
};
}

4
hosts/home/gnome.nix
View File

@ -10,8 +10,8 @@
# `gnome-extensions list` for a list
enabled-extensions = [
"Vitals@CoreCoding.com"
"blur-my-shell@aunetx"
"search-light@icedman.github.com"
"blur-my-shell@aunetx"
"search-light@icedman.github.com"
];
};
};

2
hosts/home/home_common.nix
View File

@ -13,7 +13,7 @@
userName = "k";
userEmail = "markers711@gmail.com";
};
tmux = {enable = true;};
tmux = { enable = true; };
starship.enable = true;
zsh = {
enable = true;

6
hosts/home/sway.nix
View File

@ -1,7 +1,7 @@
{ config, pkgs, inputs, ... }:
{
imports = [./waybar.nix];
imports = [ ./waybar.nix ];
wayland.windowManager.sway = {
enable = true;
@ -38,8 +38,8 @@
programs = {
rofi = { enable = true; };
mako = { enable = true; };
alacritty = {enable = true; };
foot = {enable = true; };
alacritty = { enable = true; };
foot = { enable = true; };
};
}

23
hosts/home/waybar.nix
View File

@ -1,5 +1,4 @@
{ config, pkgs, ... }:
{
{ config, pkgs, ... }: {
programs.waybar = {
enable = true;
systemd.enable = true;
@ -7,13 +6,11 @@
mainBar = {
layer = "bottom";
position = "bottom";
output = [
"eDP-1"
];
output = [ "eDP-1" ];
modules-left = ["sway/workspaces" "sway/mode"];
modules-center = ["clock"];
modules-right = ["pulseaudio" "network" "battery"];
modules-left = [ "sway/workspaces" "sway/mode" ];
modules-center = [ "clock" ];
modules-right = [ "pulseaudio" "network" "battery" ];
cpu = {
interval = 15;
@ -38,7 +35,7 @@
phone = "";
portable = "";
car = "";
default = ["" ""];
default = [ "" "" ];
};
scroll-step = 1;
on-click = "pavucontrol";
@ -56,7 +53,7 @@
format = "{ifname}";
format-wifi = "{essid} ({signalStrength}%) ";
format-ethernet = "{ipaddr}/{cidr} 󰊗";
format-disconnected = "󰤮";
format-disconnected = "󰤮";
tooltip-format = "{ifname} via {gwaddr} 󰊗";
tooltip-format-wifi = "{essid} ({signalStrength}%) ";
tooltip-format-ethernet = "{ifname} ";
@ -66,12 +63,10 @@
battery = {
format = "{capacity}% {icon}";
"format-icons" = ["" "" "" "" ""];
"format-icons" = [ "" "" "" "" "" ];
};
clock = {
"format-alt" = "{:%a, %d. %b %H:%M}";
};
clock = { "format-alt" = "{:%a, %d. %b %H:%M}"; };
};
};
};

6
hosts/laptop/configuration.nix
View File

@ -61,9 +61,9 @@
image = ./wallpaper.png;
base16Scheme = "${pkgs.base16-schemes}/share/themes/brushtrees.yaml";
opacity = {
terminal = .85;
popups = .75;
desktop = .75;
terminal = 0.85;
popups = 0.75;
desktop = 0.75;
};
cursor = {

9
hosts/laptop/home.nix
View File

@ -1,15 +1,10 @@
{ config, pkgs, inputs, ... }:
{
imports = [
../home/home_common.nix
../home/gnome.nix
../home/sway.nix
];
imports = [ ../home/home_common.nix ../home/gnome.nix ../home/sway.nix ];
nixpkgs.config.allowUnfree = true;
home = {
packages = with pkgs; [
nerdfonts

26
hosts/server/configuration.nix
View File

@ -27,24 +27,20 @@
home-manager = { users = { "k" = import ./home.nix; }; };
environment.systemPackages = with pkgs; [
microcodeIntel
];
environment.systemPackages = with pkgs; [ microcodeIntel ];
hardware.opengl = {
enable = true;
extraPackages = with pkgs; [
intel-compute-runtime
intel-media-driver
vaapiIntel
vaapiVdpau
libvdpau-va-gl
vpl-gpu-rt
];
enable = true;
extraPackages = with pkgs; [
intel-compute-runtime
intel-media-driver
vaapiIntel
vaapiVdpau
libvdpau-va-gl
vpl-gpu-rt
];
};
services.xserver.videoDrivers = ["intel"];
services.xserver.videoDrivers = [ "intel" ];
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions

52
hosts/tablet/configuration.nix
View File

@ -5,14 +5,12 @@
{ config, pkgs, inputs, nixos-hardware, ... }:
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
];
nix.settings.experimental-features = ["nix-command" "flakes"];
imports = [ # Include the results of the hardware scan.
./hardware-configuration.nix
];
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nixpkgs.config.allowUnfree = true;
networking.networkmanager.enable = true;
# Set your time zone.
@ -33,19 +31,18 @@
LC_TIME = "en_US.UTF-8";
};
# Enable the X11 windowing system.
#services.xserver.enable = true;
# Enable the GNOME Desktop Environment.
services.xserver.desktopManager.phosh = {
enable = true;
group = "";
user = "k";
phocConfig.xwayland = "immediate";
};
# Enable CUPS to print documents.
enable = true;
group = "";
user = "k";
phocConfig.xwayland = "immediate";
};
# Enable CUPS to print documents.
services.printing.enable = true;
services.auto-cpufreq.enable = true;
services.thermald.enable = true;
@ -63,38 +60,33 @@
pulse.enable = true;
jack.enable = true;
};
# Enable touchpad support (enabled default in most desktopManager).
# 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’.
programs.zsh.enable = true;
programs.zsh.enable = true;
users.users.k = {
isNormalUser = true;
description = "k";
extraGroups = [ "networkmanager" "wheel" ];
packages = with pkgs; [zsh];
packages = with pkgs; [ zsh ];
shell = pkgs.zsh;
};
home-manager = {
users = {
"k" = import ./home.nix;
};
};
home-manager = { users = { "k" = import ./home.nix; }; };
system.autoUpgrade.enable = true;
nix.gc.automatic = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
intel-vaapi-driver
intel-compute-runtime
intel-media-driver
microcodeIntel
gnome-console
neovim
intel-vaapi-driver
intel-compute-runtime
intel-media-driver
microcodeIntel
gnome-console
neovim
];
boot.kernelModules = [ "soc_button_array" ];

31
hosts/tablet/hardware-configuration.nix
View File

@ -4,11 +4,10 @@
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules =
[ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
@ -20,21 +19,18 @@
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
fileSystems."/" = {
device = "/dev/disk/by-uuid/479b497e-7807-48e4-82e6-d6468549a281";
fsType = "ext4";
};
fileSystems."/" =
{ device = "/dev/disk/by-uuid/479b497e-7807-48e4-82e6-d6468549a281";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/DACA-E1BC";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/DACA-E1BC";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/19941c01-ac8c-4609-a834-20259f3ee32e"; }
];
[{ device = "/dev/disk/by-uuid/19941c01-ac8c-4609-a834-20259f3ee32e"; }];
# 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
@ -44,5 +40,6 @@
# networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
}

22
hosts/tablet/home.nix
View File

@ -25,17 +25,15 @@
enableCompletion = true;
syntaxHighlighting.enable = true;
autocd = true;
plugins = [
{
name = "zsh-nix-shell";
file = "nix-shell.plugin.zsh";
src = pkgs.fetchFromGitHub {
owner = "chisui";
repo = "zsh-nix-shell";
rev = "v0.8.0";
sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
};
}
];
plugins = [{
name = "zsh-nix-shell";
file = "nix-shell.plugin.zsh";
src = pkgs.fetchFromGitHub {
owner = "chisui";
repo = "zsh-nix-shell";
rev = "v0.8.0";
sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
};
}];
};
}