Skip to content

Commit 4564534

Browse files
committed
format repo
1 parent daa040d commit 4564534

File tree

74 files changed

+802
-1272
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+802
-1272
lines changed

flake.nix

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,18 @@
5151

5252
# Vault Integration
5353
vault-service = {
54-
url = "github:DeterminateSystems/nixos-vault-service/a9f2a1c5577491da73d2c13f9bafff529445b760";
54+
url =
55+
"github:DeterminateSystems/nixos-vault-service/a9f2a1c5577491da73d2c13f9bafff529445b760";
5556
inputs.nixpkgs.follows = "nixpkgs";
5657
};
5758

5859
# Flake Hygiene
5960
flake-checker = {
60-
url = "github:DeterminateSystems/flake-checker/46b02e6172ed961113d336a035688ac12c96d9f4";
61+
url =
62+
"github:DeterminateSystems/flake-checker/46b02e6172ed961113d336a035688ac12c96d9f4";
6163
inputs.nixpkgs.follows = "nixpkgs";
6264
};
6365

64-
6566
# # Backup management
6667
# icehouse = {
6768
# url = "github:snowfallorg/icehouse";
@@ -86,32 +87,29 @@
8687
inputs.nixpkgs.follows = "nixpkgs";
8788
};
8889

89-
musnix = { url = "github:musnix/musnix"; };
90+
musnix = { url = "github:musnix/musnix"; };
9091
};
9192

93+
outputs = inputs:
94+
let
95+
lib = inputs.snowfall-lib.mkLib {
96+
inherit inputs;
97+
src = ./.;
9298

93-
outputs = inputs: let
94-
lib = inputs.snowfall-lib.mkLib {
95-
inherit inputs;
96-
src = ./.;
99+
snowfall = {
100+
meta = {
101+
name = "caramelmint";
102+
title = "Caramel Mint";
103+
};
97104

98-
snowfall = {
99-
meta = {
100-
name = "caramelmint";
101-
title = "Caramel Mint";
105+
namespace = "caramelmint";
102106
};
103-
104-
namespace = "caramelmint";
105107
};
106-
};
107-
in
108-
lib.mkFlake {
108+
in lib.mkFlake {
109109
channels-config = {
110110
allowUnfree = true;
111111
# This version of Electron is EOL, but latest Obsidian still uses it.
112-
permittedInsecurePackages = [
113-
"electron-25.9.0"
114-
];
112+
permittedInsecurePackages = [ "electron-25.9.0" ];
115113
};
116114

117115
systems.modules.nixos = with inputs; [
@@ -122,9 +120,8 @@
122120
musnix.nixosModules.musnix
123121
];
124122

125-
homes.users."hfahmi@nixos".modules = with inputs; [
126-
nix-colors.homeManagerModules.default
127-
];
123+
homes.users."hfahmi@nixos".modules = with inputs;
124+
[ nix-colors.homeManagerModules.default ];
128125

129126
# deploy = lib.mkDeploy {inherit (inputs) self;};
130127

homes/x86_64-linux/hfahmi@nixos/default.nix

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,9 @@
1-
{
2-
lib,
3-
pkgs,
4-
config,
5-
osConfig ? {},
6-
format ? "unknown",
7-
inputs,
8-
...
9-
}:
1+
{ lib, pkgs, config, osConfig ? { }, format ? "unknown", inputs, ... }:
102
with lib;
113
with lib.caramelmint; {
124
colorScheme = inputs.nix-colors.colorSchemes.gruvbox-light-medium;
135
caramelmint = {
14-
tools = {
15-
zellij = enabled;
16-
};
6+
tools = { zellij = enabled; };
177
desktop = {
188
addons = {
199
alacritty = enabled;

lib/default.nix

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
{
2-
lib,
3-
inputs,
4-
snowfall-inputs,
5-
}:
1+
{ lib, inputs, snowfall-inputs, }:
62

73
rec {
84
## Override a package's metadata
@@ -17,9 +13,6 @@ rec {
1713
## ```
1814
##
1915
#@ Attrs -> Package -> Package
20-
override-meta =
21-
meta: package:
22-
package.overrideAttrs (attrs: {
23-
meta = (attrs.meta or { }) // meta;
24-
});
25-
}
16+
override-meta = meta: package:
17+
package.overrideAttrs (attrs: { meta = (attrs.meta or { }) // meta; });
18+
}

lib/module/default.nix

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
{ lib, ... }:
22

3-
with lib;
4-
rec {
3+
with lib; rec {
54
## Create a NixOS module option.
65
##
76
## ```nix
87
## lib.mkOpt nixpkgs.lib.types.str "My default" "Description of my option."
98
## ```
109
##
1110
#@ Type -> Any -> String
12-
mkOpt =
13-
type: default: description:
11+
mkOpt = type: default: description:
1412
mkOption { inherit type default description; };
1513

1614
## Create a NixOS module option without a description.
@@ -61,4 +59,4 @@ rec {
6159
#@ false
6260
enable = false;
6361
};
64-
}
62+
}

modules/home/desktop/addons/alacritty/default.nix

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
1-
{
2-
options,
3-
config,
4-
lib,
5-
pkgs,
6-
inputs,
7-
...
8-
}:
1+
{ options, config, lib, pkgs, inputs, ... }:
92
with lib;
10-
with lib.caramelmint; let
11-
cfg = config.caramelmint.desktop.addons.alacritty;
3+
with lib.caramelmint;
4+
let cfg = config.caramelmint.desktop.addons.alacritty;
125
in {
136
options.caramelmint.desktop.addons.alacritty = with types; {
14-
enable = mkBoolOpt false "Whether or not to enable and configure alacritty.";
15-
defaultTerm = mkBoolOpt false "Whether to make the default terminal for WM.";
7+
enable =
8+
mkBoolOpt false "Whether or not to enable and configure alacritty.";
9+
defaultTerm =
10+
mkBoolOpt false "Whether to make the default terminal for WM.";
1611
};
1712

1813
config = mkIf cfg.enable {

modules/home/desktop/addons/clipmenu/default.nix

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
{
2-
options,
3-
config,
4-
pkgs,
5-
lib,
6-
...
7-
}:
1+
{ options, config, pkgs, lib, ... }:
82
with lib;
9-
with lib.caramelmint; let
10-
cfg = config.caramelmint.desktop.addons.clipmenu;
3+
with lib.caramelmint;
4+
let cfg = config.caramelmint.desktop.addons.clipmenu;
115
in {
126
options.caramelmint.desktop.addons.clipmenu = with types; {
13-
enable = mkBoolOpt false "Whether or not to install and configure clipmenu.";
7+
enable =
8+
mkBoolOpt false "Whether or not to install and configure clipmenu.";
149
};
1510

1611
config = mkIf cfg.enable {

modules/home/desktop/addons/gamma-step/default.nix

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
{
2-
options,
3-
config,
4-
pkgs,
5-
lib,
6-
...
7-
}:
1+
{ options, config, pkgs, lib, ... }:
82
with lib;
9-
with lib.caramelmint; let
10-
cfg = config.caramelmint.desktop.addons.gammastep;
3+
with lib.caramelmint;
4+
let cfg = config.caramelmint.desktop.addons.gammastep;
115
in {
126
options.caramelmint.desktop.addons.gammastep = with types; {
13-
enable = mkBoolOpt false "Whether or not to install and configure gamma step.";
7+
enable =
8+
mkBoolOpt false "Whether or not to install and configure gamma step.";
149
};
1510

1611
config = mkIf cfg.enable {

modules/home/desktop/addons/kanshi/default.nix

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
1-
{
2-
options,
3-
config,
4-
lib,
5-
pkgs,
6-
...
7-
}:
1+
{ options, config, lib, pkgs, ... }:
82
with lib;
9-
with lib.caramelmint; let
10-
cfg = config.caramelmint.desktop.addons.kanshi;
3+
with lib.caramelmint;
4+
let cfg = config.caramelmint.desktop.addons.kanshi;
115
in {
126
options.caramelmint.desktop.addons.kanshi = with types; {
137
enable =
@@ -21,15 +15,13 @@ in {
2115
enable = true;
2216
profiles = {
2317
laptop = {
24-
outputs = [
25-
{
26-
mode = "1920x1080@60Hz";
27-
scale = 1.2;
28-
position = "0,0";
29-
status = "enable";
30-
criteria = "eDP-1";
31-
}
32-
];
18+
outputs = [{
19+
mode = "1920x1080@60Hz";
20+
scale = 1.2;
21+
position = "0,0";
22+
status = "enable";
23+
criteria = "eDP-1";
24+
}];
3325
};
3426
};
3527
};

modules/home/desktop/addons/mako/default.nix

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
1-
{
2-
options,
3-
config,
4-
lib,
5-
pkgs,
6-
...
7-
}:
1+
{ options, config, lib, pkgs, ... }:
82
with lib;
9-
with lib.caramelmint; let
10-
cfg = config.caramelmint.desktop.addons.mako;
3+
with lib.caramelmint;
4+
let cfg = config.caramelmint.desktop.addons.mako;
115
in {
126
options.caramelmint.desktop.addons.mako = with types; {
137
enable = mkBoolOpt false "Whether to enable Mako in Sway.";
148
};
159

1610
config = mkIf cfg.enable {
17-
home.packages = with pkgs; [mako libnotify];
11+
home.packages = with pkgs; [ mako libnotify ];
1812

1913
systemd.user.services.mako = {
2014
Unit = {
2115
Description = "Mako notification daemon";
22-
WantedBy = ["graphical-session.target"];
23-
PartOf = ["graphical-session.target"];
24-
After = ["graphical-session.target"];
16+
WantedBy = [ "graphical-session.target" ];
17+
PartOf = [ "graphical-session.target" ];
18+
After = [ "graphical-session.target" ];
2519
};
2620

2721
Service = {

modules/home/desktop/addons/waybar/default.nix

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
1-
{
2-
options,
3-
config,
4-
lib,
5-
pkgs,
6-
...
7-
}:
1+
{ options, config, lib, pkgs, ... }:
82
with lib;
9-
with lib.caramelmint; let
10-
cfg = config.caramelmint.desktop.addons.waybar;
3+
with lib.caramelmint;
4+
let cfg = config.caramelmint.desktop.addons.waybar;
115
in {
126
options.caramelmint.desktop.addons.waybar = with types; {
137
enable =
148
mkBoolOpt false "Whether to enable Waybar in the desktop environment.";
159
};
1610

1711
config = mkIf cfg.enable {
18-
home.packages = with pkgs; [waybar];
12+
home.packages = with pkgs; [ waybar ];
1913

2014
# TODO: Will leave jake's config and add mine later.
2115
xdg.configFile."waybar/config".source = ./config;

0 commit comments

Comments
 (0)