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

View File

@ -16,8 +16,7 @@
let
system = "x86_64-linux";
pkg = nixpkgs.legacyPackages.${system};
in
{
in {
nixosConfigurations = {
laptop = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };

View File

@ -1,5 +1,4 @@
{ config, pkgs, ... }:
{
{ config, pkgs, ... }: {
programs.waybar = {
enable = true;
systemd.enable = true;
@ -7,9 +6,7 @@
mainBar = {
layer = "bottom";
position = "bottom";
output = [
"eDP-1"
];
output = [ "eDP-1" ];
modules-left = [ "sway/workspaces" "sway/mode" ];
modules-center = [ "clock" ];
@ -69,9 +66,7 @@
"format-icons" = [ "" "" "" "" "" ];
};
clock = {
"format-alt" = "{:%a, %d. %b %H:%M}";
};
clock = { "format-alt" = "{:%a, %d. %b %H:%M}"; };
};
};
};

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 = {

View File

@ -1,12 +1,7 @@
{ 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;

View File

@ -27,9 +27,7 @@
home-manager = { users = { "k" = import ./home.nix; }; };
environment.systemPackages = with pkgs; [
microcodeIntel
];
environment.systemPackages = with pkgs; [ microcodeIntel ];
hardware.opengl = {
enable = true;
extraPackages = with pkgs; [
@ -42,10 +40,8 @@
];
};
services.xserver.videoDrivers = [ "intel" ];
# 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. Its perfectly fine and recommended to leave

View File

@ -5,14 +5,12 @@
{ config, pkgs, inputs, nixos-hardware, ... }:
{
imports =
[ # Include the results of the hardware scan.
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,7 +31,6 @@
LC_TIME = "en_US.UTF-8";
};
# Enable the X11 windowing system.
#services.xserver.enable = true;
@ -76,16 +73,11 @@
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; [

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";
fileSystems."/" = {
device = "/dev/disk/by-uuid/479b497e-7807-48e4-82e6-d6468549a281";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/DACA-E1BC";
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;
}

View File

@ -25,8 +25,7 @@
enableCompletion = true;
syntaxHighlighting.enable = true;
autocd = true;
plugins = [
{
plugins = [{
name = "zsh-nix-shell";
file = "nix-shell.plugin.zsh";
src = pkgs.fetchFromGitHub {
@ -35,7 +34,6 @@
rev = "v0.8.0";
sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
};
}
];
}];
};
}