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

✨ Moved modules and hm dir to hosts dir. Moved some code to shared and extended lib with custom functions

Browse Source
This commit is contained in:
Martin Berg Alstad
2025-04-12 17:05:38 +02:00
parent df5bea9cc0
commit e3a1dd36d7
99 changed files with 550 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
flake.nix
View File

@ -1,75 +1,108 @@
{
description = "NixOS configuration";
description = "Martin's NixOS configuration - Based on EmergentMind/nix-config";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
#
# ========= Official NixOS and HM Package Sources =========
#
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
# The next two are for pinning to stable vs unstable regardless of what the above is set to
# This is particularly useful when an upcoming stable release is in beta because you can effectively
# keep 'nixpkgs-stable' set to stable for critical packages while setting 'nixpkgs' to the beta branch to
# get a jump start on deprecation changes.
# See also 'stable-packages' and 'unstable-packages' overlays at 'overlays/default.nix"
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
catppuccin = {
url = "github:catppuccin/nix";
};
home-manager = {
url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};
#
# ========= Utilities =========
#
# Secrets management
sops-nix = {
url = "github:mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
# Catppuccin theming
catppuccin = {
url = "github:catppuccin/nix";
};
# vim
nixvim = {
url = "github:nix-community/nixvim/nixos-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};
# Bar
hyprpanel = {
url = "github:Jas-SinghFSU/HyprPanel";
};
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
# Spotify
spicetify-nix = {
url = "github:Gerg-L/spicetify-nix";
inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
# Browser
zen-browser.url = "github:0xc000022070/zen-browser-flake";
# Video aggregator
grayjay.url = "github:rishabh5321/grayjay-flake";
};
outputs =
inputs@{
self, # Get a ref to outputs
{
self,
nixpkgs,
nixpkgs-unstable,
home-manager,
...
}:
}@inputs:
let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
inherit (self) outputs;
common = import ./common.nix;
theme = import ./theme.nix;
common = import ./shared/common.nix;
theme = import ./shared/theme.nix;
#
# ========= Architectures =========
#
forAllSystems = nixpkgs.lib.genAttrs [
"x86_64-linux"
"aarch64-linux"
];
# ========== Extend lib with lib.custom ==========
# NOTE: This approach allows lib.custom to propagate into hm
# see: https://github.com/nix-community/home-manager/pull/3454
customLib = (_self: _super: { custom = import ./lib { inherit (nixpkgs) lib; }; });
lib = nixpkgs.lib.extend customLib;
libHm = home-manager.lib.extend customLib;
in
{
defaultPackage.${system} = home-manager.defaultPackage.${system};
#
# ========= Overlays =========
#
# Custom modifications/overrides to upstream packages
overlays = import ./overlays.nix { inherit inputs; };
# The minimum amount of dependencies in order to run 'just switch-now'
devShells.${system}.default = pkgs.mkShell {
packages = with pkgs; [
just
git
git-crypt
nh
];
};
# Adds the nix fmt command to format nix files
formatter.${system} = pkgs.nixfmt-rfc-style;
nixosConfigurations.${common.hostname} = nixpkgs.lib.nixosSystem {
system = system;
#
# ========= Host Configurations =========
#
nixosConfigurations.desktop = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit
outputs
inputs
common
theme
lib
;
}; # Pass args to modules
isDarwin = false;
};
modules = [
./configuration.nix
./hosts/desktop
home-manager.nixosModules.home-manager
{
home-manager = {
@ -78,22 +111,40 @@
useGlobalPkgs = true;
useUserPackages = true;
# Passes inputs as an argument to home-manager
extraSpecialArgs = { inherit inputs common theme; };
users.${common.username} = import ./home-manager;
extraSpecialArgs = {
inherit
inputs
common
theme
libHm
;
};
users.${common.username} = import ./hosts/desktop/home-manager;
};
}
./overlays.nix
{
nixpkgs.overlays = with inputs; [
hyprpanel.overlay
];
}
];
};
overlays = {
# Gives access to unstable packages everywhere
unstable-packages = final: _prev: {
unstable = import nixpkgs-unstable {
system = final.system;
config.allowUnfree = true;
};
};
};
#
# ========= Formatting =========
#
# Nix formatter available through 'nix fmt' https://github.com/NixOS/nixfmt
formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);
#
# ========= DevShell =========
#
# Custom shell for bootstrapping on new hosts, modifying nix-config, and secrets management
devShells = forAllSystems (
system:
import ./shell.nix {
pkgs = nixpkgs.legacyPackages.${system};
}
);
};
}