Skip to content

Commit

Permalink
flake: formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
adfaure committed Jun 18, 2024
1 parent 47cfde0 commit 4867dd4
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 50 deletions.
94 changes: 48 additions & 46 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -129,55 +129,57 @@
# Simple VM so I don't need to reboot when I am experimenting
# nix build .#'nixosConfigurations.vm.config.system.build.vm' ; ./result/bin/run-nixos-vm
vm = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = {inherit my-dotfiles catppuccin;};
modules = [
# My overlay
self.nixosModules.overlay
# Import home-manager module
home-manager.nixosModules.home-manager
# top level module for this configuration
({modulesPath, lib, ...}: {
imports = [(modulesPath + "/virtualisation/qemu-vm.nix")];
nixpkgs.hostPlatform = "x86_64-linux";
virtualisation.memorySize = 4096;
virtualisation.cores = 4;

hardware.pulseaudio = {
enable = false;
# NixOS allows either a lightweight build (default) or full build of PulseAudio to be installed.
# Only the full build has Bluetooth support, so it must be selected here.
package = pkgs.pulseaudioFull;
extraModules = [];
extraConfig = ''
load-module module-udev-detect ignore_dB=1
'';
};

})
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
inherit system;
specialArgs = {inherit my-dotfiles catppuccin;};
modules = [
# My overlay
self.nixosModules.overlay
# Import home-manager module
home-manager.nixosModules.home-manager
# top level module for this configuration
({
modulesPath,
lib,
...
}: {
imports = [(modulesPath + "/virtualisation/qemu-vm.nix")];
nixpkgs.hostPlatform = "x86_64-linux";
virtualisation.memorySize = 4096;
virtualisation.cores = 4;

home-manager.users.adfaure = { ... }: {
imports = [
catppuccin.homeManagerModules.catppuccin
./homes/graphical.nix
./homes/base.nix
];
};
hardware.pulseaudio = {
enable = false;
# NixOS allows either a lightweight build (default) or full build of PulseAudio to be installed.
# Only the full build has Bluetooth support, so it must be selected here.
package = pkgs.pulseaudioFull;
extraModules = [];
extraConfig = ''
load-module module-udev-detect ignore_dB=1
'';
};
})
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;

home-manager.extraSpecialArgs = {
inherit catppuccin unstable my-dotfiles;
};
}
# Default linux configuration: users, fonts etc
nixos/profiles/common
# Server X configuration, also activate i3
nixos/profiles/graphical
];
};
home-manager.users.adfaure = {...}: {
imports = [
catppuccin.homeManagerModules.catppuccin
./homes/graphical.nix
./homes/base.nix
];
};

home-manager.extraSpecialArgs = {
inherit catppuccin unstable my-dotfiles;
};
}
# Default linux configuration: users, fonts etc
nixos/profiles/common
# Server X configuration, also activate i3
nixos/profiles/graphical
];
};
};

formatter.${system} = nixpkgs.legacyPackages.${system}.alejandra;
Expand Down
1 change: 0 additions & 1 deletion homes/base.nix
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@
tldr
# better git diff
difftastic

];
};
}
11 changes: 8 additions & 3 deletions homes/modules/eza/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{ lib, config, pkgs, home, ... }:
let
{
lib,
config,
pkgs,
home,
...
}: let
inherit (lib) mkEnableOption mkIf;
cfg = config.adfaure.home-modules.eza-alias;
in {
Expand All @@ -15,7 +20,7 @@ in {
};

home.packages = [
(pkgs.nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; })
(pkgs.nerdfonts.override {fonts = ["FiraCode" "DroidSansMono"];})
];
};
}

0 comments on commit 4867dd4

Please sign in to comment.