extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2025-06-20 17:57:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

treewide: Switch from alejandra to nixpkgs-fmt

Browse Source 
Neither nixfmt nor alejandra support the "standard" way to syntax
highlight multi-line strings in Nix, so nixpkgs-fmt is the only viable
solution.
This commit is contained in:
Donovan Glover 2023-06-11 09:33:54 -04:00
parent 09f2ce62de
commit 43a07cc8d9
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
35 changed files with 247 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
containers/rar.nix
View File

@ -1,6 +1,7 @@
let
VARIABLES = import ../src/variables.nix;
in {
in
{
containers.rar = {
privateNetwork = true;
@ -11,10 +12,10 @@ in {
};
};
config = {
pkgs,
lib,
...
config =
{ pkgs
, lib
, ...
}: {
programs = {
fish.enable = true;

14
containers/wine.nix
View File

@ -1,7 +1,9 @@
{config, ...}: let
{ config, ... }:
let
VARIABLES = import ../src/variables.nix;
hostCfg = config;
in {
in
{
containers.wine = {
privateNetwork = true;
@ -23,10 +25,10 @@ in {
};
};
config = {
pkgs,
lib,
...
config =
{ pkgs
, lib
, ...
}: {
programs = {
fish.enable = true;

24
flake.nix
View File

@ -1,16 +1,18 @@
{
outputs = {
self,
nixpkgs,
home-manager,
hyprland,
stylix,
nix-gaming,
crystal-flake,
...
} @ attrs: let
outputs =
{ self
, nixpkgs
, home-manager
, hyprland
, stylix
, nix-gaming
, crystal-flake
, ...
} @ attrs:
let
VARIABLES = import ./src/variables.nix;
in {
in
{
formatter."${VARIABLES.system}" = nixpkgs.legacyPackages."${VARIABLES.system}".alejandra;
nixosConfigurations."${VARIABLES.hostname}" = nixpkgs.lib.nixosSystem {

9
hosts/laptop.nix
View File

@ -1,8 +1,7 @@
{
config,
lib,
modulesPath,
...
{ config
, lib
, modulesPath
, ...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")

6
modules/fish-starship/default.nix
View File

@ -1,6 +1,8 @@
{pkgs, ...}: let
{ pkgs, ... }:
let
VARIABLES = import ../../src/variables.nix;
in {
in
{
users.defaultUserShell = pkgs.fish;
environment.shells = [ pkgs.fish ];

6
modules/git/default.nix
View File

@ -1,6 +1,8 @@
{pkgs, ...}: let
{ pkgs, ... }:
let
VARIABLES = import ../../src/variables.nix;
in {
in
{
environment.systemPackages = with pkgs; [ tig git ];
home-manager.sharedModules = [

6
modules/hyprland/default.nix
View File

@ -1,6 +1,8 @@
{pkgs, ...}: let
{ pkgs, ... }:
let
VARIABLES = import ../../src/variables.nix;
in {
in
{
programs.hyprland.enable = true;
services.udisks2 = {
enable = true;

3
modules/kitty/default.nix
View File

@ -1,6 +1,7 @@
let
VARIABLES = import ../../src/variables.nix;
in {
in
{
home-manager.sharedModules = [
{
programs.kitty = {

3
modules/mime-apps/default.nix
View File

@ -1,6 +1,7 @@
let
VARIABLES = import ../../src/variables.nix;
in {
in
{
home-manager.sharedModules = [
{
xdg.mimeApps = {

6
modules/ncmpcpp/default.nix
View File

@ -1,6 +1,8 @@
{pkgs, ...}: let
{ pkgs, ... }:
let
VARIABLES = import ../../src/variables.nix;
in {
in
{
home-manager.sharedModules = [
{
services.mpd = {

6
modules/neovim/default.nix
View File

@ -1,4 +1,5 @@
{pkgs, ...}: let
{ pkgs, ... }:
let
vim-nix-rummik = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "vim-nix";
version = "0def8020f152a51c011a707680780dac61a8989a";
@ -9,7 +10,8 @@
sha256 = "sha256-Q+Jx6/MgeE2hsd/a6FqfXpAOaRcNymZW6t75hYCcH4E=";
};
};
in {
in
{
programs.neovim.enable = true;
home-manager.sharedModules = [

7
modules/waybar/default.nix
View File

@ -1,7 +1,6 @@
{
lib,
hyprland,
...
{ lib
, hyprland
, ...
}: {
home-manager.sharedModules = [
{

3
modules/xdg-user-dirs/default.nix
View File

@ -1,6 +1,7 @@
let
VARIABLES = import ../../src/variables.nix;
in {
in
{
home-manager.sharedModules = [
{
xdg.userDirs = {

12
packages/go-thumbnailer/default.nix
View File

@ -1,9 +1,9 @@
{
lib,
buildGoModule,
fetchFromGitHub,
pkg-config,
vips,
{ lib
, buildGoModule
, fetchFromGitHub
, pkg-config
, vips
,
}:
buildGoModule rec {
pname = "go-thumbnailer";

23
src/main.nix
View File

@ -1,15 +1,16 @@
{
pkgs,
lib,
hypr-contrib,
nix-gaming,
crystal-flake,
nixpkgs-hyprland-autoname-workspaces,
nixpkgs-srb2,
...
}: let
{ pkgs
, lib
, hypr-contrib
, nix-gaming
, crystal-flake
, nixpkgs-hyprland-autoname-workspaces
, nixpkgs-srb2
, ...
}:
let
VARIABLES = import ./variables.nix;
in {
in
{
imports = [
"${VARIABLES.hostHardwareConfiguration}"
../overlays