panotaka/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Began aggresively formatting project

Browse Source
This commit is contained in:
Thomas Syms
2023-12-19 17:16:03 -04:00
parent 38b461ae65
commit 22dc9f16fb
31 changed files with 177 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
devenv.nix
View File

@@ -1,6 +1,7 @@
{pkgs, ...}: {
pre-commit.hooks = {
alejandra.enable = true;
deadnix.enable = true;
};
packages = with pkgs; [nixpkgs-fmt nixfmt];

27
flake.nix
View File

@@ -18,16 +18,22 @@
# Theming
stylix.url = "github:danth/stylix";
};
outputs = inputs@{ self, nixpkgs, stylix, home-manager, ... }:
let
outputs = inputs @ {
nixpkgs,
stylix,
home-manager,
...
}: let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
in
{
in {
nixosConfigurations = {
Equinox = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; inherit system; };
specialArgs = {
inherit inputs;
inherit system;
};
modules = [
# Theme
stylix.nixosModules.stylix
@@ -39,8 +45,7 @@
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs =
{
home-manager.extraSpecialArgs = {
inherit inputs;
inherit system;
};
@@ -54,15 +59,17 @@
Blackbird = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; inherit system; };
specialArgs = {
inherit inputs;
inherit system;
};
modules = [
./hosts/Blackbird
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs =
{
home-manager.extraSpecialArgs = {
inherit inputs;
inherit system;
};

4
home/default.nix
View File

@@ -1,6 +1,4 @@
{ config, pkgs, ... }:
{
{...}: {
# Home Manager needs a bit of information about you and the
# paths it should manage.
home = {

5
home/desktop/browsers.nix
View File

@@ -1,7 +1,4 @@
{ pkgs
, config
, ...
}: {
{pkgs, ...}: {
programs = {
chromium = {
enable = true;

7
home/desktop/default.nix
View File

@@ -1,9 +1,4 @@
{ inputs
, system
, config
, pkgs
, ...
}: {
{...}: {
imports = [
./common.nix
./browsers.nix

18
home/desktop/vscode/default.nix
View File

@@ -1,22 +1,17 @@
{ inputs
, system
, config
, pkgs
, home-manager
, ...
}:
{
inputs,
system,
pkgs,
...
}: {
imports = [
./nix.nix
];
programs.vscode = {
enable = true;
package = pkgs.vscodium;
extensions = with inputs.nix-vscode-extensions.extensions.${system};
[
extensions = with inputs.nix-vscode-extensions.extensions.${system}; [
# General extensions
## Code Completion
@@ -40,7 +35,6 @@
vscode-marketplace.mrmlnc.vscode-duplicate
vscode-marketplace.qcz.text-power-tools
# Language extensions
## CSV

2
home/desktop/vscode/nix.nix
View File

@@ -1,9 +1,7 @@
{
inputs,
system,
config,
pkgs,
home-manager,
...
}: {
home.packages = with pkgs; [

5
home/shell/btop.nix
View File

@@ -1,7 +1,4 @@
{ config
, ...
}:
{
{...}: {
programs.btop = {
enable = true;
};

5
home/shell/common.nix
View File

@@ -1,7 +1,4 @@
{ pkgs
, ...
}:
{
{pkgs, ...}: {
home.shellAliases = {
sudo = "sudo --preserve-env=PATH";
};

4
home/shell/default.nix
View File

@@ -1,5 +1,4 @@
{ config, ... }:
{
{...}: {
imports = [
./atuin.nix
./autojump.nix
@@ -18,5 +17,4 @@
./zoxide.nix
./zsh
];
}

5
home/shell/eza.nix
View File

@@ -1,7 +1,4 @@
{ config
, ...
}:
{
{...}: {
programs.eza = {
enable = true;
enableAliases = true;

8
home/shell/fish/default.nix
View File

@@ -1,13 +1,8 @@
{ config
, pkgs
, ...
}:
{
{pkgs, ...}: {
home.packages = with pkgs; [
grc
];
programs.fish = {
enable = true;
@@ -19,5 +14,4 @@
}
];
};
}

4
home/shell/git.nix
View File

@@ -1,6 +1,4 @@
{ pkgs
, ...
}: {
{pkgs, ...}: {
home.packages = [pkgs.gh];
programs.git = {

5
home/shell/htop.nix
View File

@@ -1,7 +1,4 @@
{ config
, ...
}:
{
{...}: {
programs.htop = {
enable = true;
};

6
home/shell/rmtrash.nix
View File

@@ -1,8 +1,4 @@
{ config
, pkgs
, ...
}:
{
{pkgs, ...}: {
home.packages = with pkgs; [
rmtrash
];

4
home/shell/starship.nix
View File

@@ -1,5 +1,4 @@
{ config, lib, ... }: {
{...}: {
programs.starship = {
enable = true;
settings = {
@@ -277,7 +276,6 @@
zig = {
symbol = "zig ";
};
};
};
}

5
home/shell/zoxide.nix
View File

@@ -1,7 +1,4 @@
{ config
, ...
}:
{
{...}: {
programs.zoxide = {
enable = true;
};

8
home/shell/zsh/default.nix
View File

@@ -1,8 +1,4 @@
{ config
, lib
, ...
}:
{
{lib, ...}: {
programs.zsh = lib.mkForce {
enable = true;
@@ -20,9 +16,7 @@
}
#{ name = "marlonrichert/zsh-autocomplete"; }
{name = "hlissner/zsh-autopair";}
];
};
};
}

20
hosts/Blackbird/default.nix
View File

@@ -1,36 +1,31 @@
{ config, pkgs, inputs, lib, ... }:
let
hostname = "Blackbird";
in
{
inputs,
lib,
...
}: let
hostname = "Blackbird";
in {
# System version
system.stateVersion = "23.11";
imports = [
# Import hardware configuration
inputs.nixos-hardware.nixosModules.gpd-pocket-3
inputs.disko.nixosModules.disko
./disko.nix
# Import system configuration
../../modules/system.nix
../../modules/harden.nix
../../modules/kde.nix
];
# Set networking
hardware.enableRedistributableFirmware = true;
networking.hostName = hostname;
networking.networkmanager.enable = true;
networking.useDHCP = lib.mkDefault true;
# Bootloader configuration
boot = {
kernelModules = ["kvm-intel"];
@@ -57,7 +52,6 @@ in
};
};
# Setup Audio
sound.enable = true;
hardware.pulseaudio.enable = false;
@@ -69,8 +63,6 @@ in
pulse.enable = true;
};
# Setup bluetooth
hardware.bluetooth.enable = true;
}

20
hosts/Equinox/default.nix
View File

@@ -1,15 +1,13 @@
{ config, pkgs, inputs, lib, ... }:
let
hostname = "Equinox";
in
{
inputs,
lib,
...
}: let
hostname = "Equinox";
in {
# System version
system.stateVersion = "23.11";
imports = [
# Import hardware configuration
inputs.nixos-hardware.nixosModules.dell-xps-15-9510
@@ -17,21 +15,18 @@ in
inputs.disko.nixosModules.disko
./disko.nix
# Import system configuration
../../modules/system.nix
../../modules/harden.nix
../../modules/kde.nix
];
# Set networking
hardware.enableRedistributableFirmware = true;
networking.hostName = hostname;
networking.networkmanager.enable = true;
networking.useDHCP = lib.mkDefault true;
# Bootloader configuration
boot = {
kernelModules = ["kvm-intel"];
@@ -58,7 +53,6 @@ in
};
};
# Setup Audio
sound.enable = true;
hardware.pulseaudio.enable = false;
@@ -70,8 +64,6 @@ in
pulse.enable = true;
};
# Setup bluetooth
hardware.bluetooth.enable = true;
}

6
modules/i3.nix
View File

@@ -1,8 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
# i3 related options
environment.pathsToLink = ["/libexec"]; # links /libexec from derivations to /run/current-system/sw
services.xserver = {

3
modules/kde.nix
View File

@@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{...}: {
services.xserver.enable = true;
services.xserver.displayManager.sddm.enable = true;
services.xserver.displayManager.defaultSession = "plasmawayland";

6
modules/system.nix
View File

@@ -1,6 +1,8 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
nix.settings.experimental-features = ["nix-command" "flakes"];
# Enable CUPS to print documents.

7
themes/sandstone-forest/default.nix
View File

@@ -1,6 +1,9 @@
{ system, inputs, config, pkgs, ... }:
{
system,
inputs,
pkgs,
...
}: {
stylix.image = ./wallpaper.jpg;
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml";

4
themes/spaceduck/default.nix
View File

@@ -1,6 +1,4 @@
{ config, pkgs, ... }:
{
{pkgs, ...}: {
stylix.image = ./DotGrid.svg;
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/spaceduck.yaml";