Skip to content

Commit

Permalink
formatting...
Browse files Browse the repository at this point in the history
  • Loading branch information
mardukpill committed Jul 17, 2024
1 parent 4e0406d commit 9feca95
Show file tree
Hide file tree
Showing 54 changed files with 1,725 additions and 1,605 deletions.
114 changes: 57 additions & 57 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";

# Home manager
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
# Home manager
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};

# snowfall
snowfall-lib = {
url = "github:snowfallorg/lib";
inputs.nixpkgs.follows = "nixpkgs";
};
# snowfall
snowfall-lib = {
url = "github:snowfallorg/lib";
inputs.nixpkgs.follows = "nixpkgs";
};

# hyprland
hyprland = {
# hyprland
hyprland = {
type = "git";
url = "https://github.com/hyprwm/Hyprland";
submodules = true;
Expand All @@ -25,60 +25,60 @@
inputs.hyprland.follows = "hyprland";
};
hyprland-contrib.url = "github:hyprwm/contrib";
# TODO
# TODO

# spicetify
# spicetify
spicetify-nix = {
url = "github:the-argus/spicetify-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
url = "github:the-argus/spicetify-nix";
inputs.nixpkgs.follows = "nixpkgs";
};

hardware.url = "github:nixos/nixos-hardware";
razer-laptop-control.url = "github:Razer-Linux/razer-laptop-control-no-dkms";

nixvim.url = "github:nix-community/nixvim";
nixvim.url = "github:nix-community/nixvim";
swww.url = "github:LGFae/swww";
nix-colors.url = "github:misterio77/nix-colors";
};
};

outputs = inputs:
let
inherit (inputs) snowfall-lib;
lib = snowfall-lib.mkLib {
inherit inputs;
src = ./.;
outputs =
inputs:
let
inherit (inputs) snowfall-lib;
lib = snowfall-lib.mkLib {
inherit inputs;
src = ./.;

snowfall = {
namespace = "dotties";
meta = { # for use with Frost
name = "dotties";
title = "dotties";
};
};
};
in
lib.mkFlake {
channels-config = {
allowUnfree = true;
};
homes.modules = with inputs; [
nixvim.homeManagerModules.nixvim
spicetify-nix.homeManagerModules.default
nix-colors.homeManagerModules.default
];

systems.modules.nixos = with inputs; [
home-manager.nixosModules.home-manager
snowfall = {
namespace = "dotties";
meta = {
# for use with Frost
name = "dotties";
title = "dotties";
};
};
};
in
lib.mkFlake {
channels-config = {
allowUnfree = true;
};
homes.modules = with inputs; [
nixvim.homeManagerModules.nixvim
spicetify-nix.homeManagerModules.default
nix-colors.homeManagerModules.default
];

systems.hosts.blade.modules = with inputs; [
hardware.nixosModules.common-cpu-intel
hardware.nixosModules.common-pc-laptop
hardware.nixosModules.common-pc-laptop-ssd
razer-laptop-control.nixosModules.default
];
systems.modules.nixos = with inputs; [ home-manager.nixosModules.home-manager ];

deploy = lib.mkDeploy { inherit (inputs) self; };
outputs-builder = channels: { formatter = channels.nixpkgs.nixfmt-rfc-style; };
};
systems.hosts.blade.modules = with inputs; [
hardware.nixosModules.common-cpu-intel
hardware.nixosModules.common-pc-laptop
hardware.nixosModules.common-pc-laptop-ssd
razer-laptop-control.nixosModules.default
];

deploy = lib.mkDeploy { inherit (inputs) self; };
outputs-builder = channels: { formatter = channels.nixpkgs.nixfmt-rfc-style; };
};
}
97 changes: 49 additions & 48 deletions homes/x86_64-linux/mike@blade/default.nix
Original file line number Diff line number Diff line change
@@ -1,62 +1,63 @@
{
config,
lib,
namespace,
inputs,
pkgs,
...
config,
lib,
namespace,
inputs,
pkgs,
...
}:
let
inherit (lib.${namespace}) enabled;
in {
snowfallorg.user = {
name = "mike";
enable = true;
};
dotties = {
cli = {
neovim = enabled;
tools = enabled;
fish = enabled;
};
apps = {
spotify = {
enable = true;
spicetify = true;
};
alacritty = enabled;
imv = enabled;
mpv = enabled;
};
inherit (lib.${namespace}) enabled;
in
{
snowfallorg.user = {
name = "mike";
enable = true;
};
dotties = {
cli = {
neovim = enabled;
tools = enabled;
fish = enabled;
};
apps = {
spotify = {
enable = true;
spicetify = true;
};
alacritty = enabled;
imv = enabled;
mpv = enabled;
};

wms.hyprland = enabled;
};

wms.hyprland = enabled;
};

home.packages = with pkgs; [
vesktop
keepassxc
home.packages = with pkgs; [
vesktop
keepassxc

firefox
thunderbird
firefox
thunderbird

playerctl
playerctl

ffmpeg # media management
yt-dlp
imagemagick
ffmpeg # media management
yt-dlp
imagemagick

zathura
viewnior
gobble
zathura
viewnior
gobble

libreoffice-fresh
godot_4
];
libreoffice-fresh
godot_4
];

services.syncthing.enable = true;
services.syncthing.enable = true;
services.playerctld.enable = true;

services.ssh-agent.enable = true;
services.ssh-agent.enable = true;
programs.ssh = {
matchBlocks = {
"github.com-mardukpill" = {
Expand All @@ -67,5 +68,5 @@ in {
};
};

home.stateVersion = "23.05";
home.stateVersion = "23.05";
}
18 changes: 12 additions & 6 deletions lib/module/default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
{lib, ...}:
with lib; rec {
mkOpt = type: default: description:
mkOption {inherit type default description;};
{ lib, ... }:
with lib;
rec {
mkOpt =
type: default: description:
mkOption { inherit type default description; };

mkOpt' = type: default: mkOpt type default null;

mkBoolOpt = mkOpt types.bool;

mkBoolOpt' = mkOpt' types.bool;

enabled = {enable = true;};
enabled = {
enable = true;
};

disabled = {enable = false;};
disabled = {
enable = false;
};
}
Loading

0 comments on commit 9feca95

Please sign in to comment.