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

Compare commits

base: k:8114541671fc5493a18cc080fd3e0678832c285f
Branches Tags
k:master
..
compare: k:5f4da82057dabd210a4a8bea9ce90a844703cd29
Branches Tags
k:master

No commits in common. "8114541671fc5493a18cc080fd3e0678832c285f" and "5f4da82057dabd210a4a8bea9ce90a844703cd29" have entirely different histories.
8114541671 ... 5f4da82057

12 changed files with 120 additions and 237 deletions
Show Stats Expand all files Collapse all files

69
flake.nix
View File

@ -13,39 +13,40 @@
};
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
];
};
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
];
};
};
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
];
};
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"
];
};
};

1
hosts/home/home_common.nix
View File

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

37
hosts/home/sway.nix
View File

@ -1,37 +0,0 @@
{ config, pkgs, inputs, ... }:
{
imports = [ ./waybar.nix ./tile.nix ];
wayland.windowManager.sway = {
enable = true;
config = {
modifier = "Mod4";
floating.border = 0;
window.border = 1;
window.titlebar = false;
terminal = "${pkgs.foot}/bin/foot";
menu = "${pkgs.rofi}/bin/rofi -show drun -modi drun";
bars = [];
gaps = {
inner = 10;
outer = 5;
};
};
};
home.sessionVariables = {
MOZ_ENABLE_WAYLAND = "1";
MOZ_USE_XINPUT2 = "1";
XDG_SESSION_TYPE = "wayland";
SDL_VIDEODRIVER = "wayland";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
_JAVA_AWT_WM_NONREPARENTING = 1;
};
services = {
swayidle = { enable = true; };
};
}

19
hosts/home/tile.nix
View File

@ -1,19 +0,0 @@
{ config, pkgs, inputs, ... }:
{
services = {
mako = { enable = true; };
};
programs = {
mako = { enable = true; };
foot = { enable = true; };
swaylock = {enable = true;};
rofi = {
enable = true;
package = pkgs.rofi-wayland;
};
};
}

73
hosts/home/waybar.nix
View File

@ -1,73 +0,0 @@
{ config, pkgs, ... }: {
programs.waybar = {
enable = true;
systemd.enable = true;
settings = {
mainBar = {
layer = "bottom";
position = "bottom";
output = [ "eDP-1" ];
modules-left = [ "sway/workspaces" "sway/mode" ];
modules-center = [ "clock" ];
modules-right = [ "pulseaudio" "network" "battery" ];
cpu = {
interval = 15;
format = " {}%";
max-length = 15;
};
memory = {
interval = 30;
format = " {}%";
max-length = 15;
};
"pulseaudio" = {
format = "{volume}% {icon}";
format-bluetooth = "{volume}% {icon}";
format-muted = "";
format-icons = {
headphone = "";
hands-free = "";
headset = "";
phone = "";
portable = "";
car = "";
default = [ "" "" ];
};
scroll-step = 1;
on-click = "pavucontrol";
};
backlight = {
tooltip = false;
format = " {}%";
interval = 1;
on-scroll-up = "brightnessctl s 1515";
on-scroll-down = "brightnessctl s 1";
};
network = {
format = "{ifname}";
format-wifi = "{essid} ({signalStrength}%) ";
format-ethernet = "{ipaddr}/{cidr} 󰊗";
format-disconnected = "󰤮";
tooltip-format = "{ifname} via {gwaddr} 󰊗";
tooltip-format-wifi = "{essid} ({signalStrength}%) ";
tooltip-format-ethernet = "{ifname} ";
tooltip-format-disconnected = "Disconnected";
max-length = 50;
};
battery = {
format = "{capacity}% {icon}";
"format-icons" = [ "" "" "" "" "" ];
};
clock = { "format-alt" = "{:%a, %d. %b %H:%M}"; };
};
};
};
}

9
hosts/laptop/configuration.nix
View File

@ -7,8 +7,6 @@
system.autoUpgrade.enable = true;
time.timeZone = "America/New_York";
security.rtkit.enable = true;
security.polkit.enable = true;
security.pam.services.swaylock = {};
powerManagement.enable = true;
nix = {
@ -58,16 +56,13 @@
stylix = {
enable = true;
autoEnable = true;
polarity = "light";
image = ./wallpaper.png;
base16Scheme = "${pkgs.base16-schemes}/share/themes/brushtrees.yaml";
opacity = {
terminal = 0.85;
popups = 0.75;
desktop = 0.75;
terminal = .85;
popups = .75;
};
cursor = {
package = pkgs.adwaita-icon-theme;
name = "Adwaita";

12
hosts/laptop/home.nix
View File

@ -1,7 +1,12 @@
{ config, pkgs, inputs, ... }:
{
imports = [ ../home/home_common.nix ../home/gnome.nix ../home/sway.nix ];
imports = [
../home/home_common.nix
../home/gnome.nix
];
stylix.enable = true;
nixpkgs.config.allowUnfree = true;
@ -41,9 +46,4 @@
defaultEditor = true;
};
};
stylix = {
enable = true;
autoEnable = true;
};
}

26
hosts/server/configuration.nix
View File

@ -27,20 +27,24 @@
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

46
hosts/tablet/configuration.nix
View File

@ -5,12 +5,14 @@
{ 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.
@ -31,18 +33,19 @@
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 = true;
group = "";
user = "k";
phocConfig.xwayland = "immediate";
};
# Enable CUPS to print documents.
# Enable CUPS to print documents.
services.printing.enable = true;
services.auto-cpufreq.enable = true;
services.thermald.enable = true;
@ -61,7 +64,7 @@
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’.
@ -70,23 +73,28 @@
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,10 +4,11 @@
{ 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 = [ ];
@ -19,18 +20,21 @@
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."/boot" = {
device = "/dev/disk/by-uuid/DACA-E1BC";
fsType = "vfat";
};
fileSystems."/" =
{ device = "/dev/disk/by-uuid/479b497e-7807-48e4-82e6-d6468549a281";
fsType = "ext4";
};
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
@ -40,6 +44,5 @@
# 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,15 +25,17 @@
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";
};
}
];
};
}