Skip to content

Commit dfef5e7

Browse files
committed
framework: fix some evaluation warnings
1 parent 021b61c commit dfef5e7

File tree

5 files changed

+11
-19
lines changed

5 files changed

+11
-19
lines changed

flake.lock

Lines changed: 3 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
url = "github:nix-community/home-manager";
1010
inputs.nixpkgs.follows = "nixpkgs";
1111
};
12-
stylix.url = "github:danth/stylix";
12+
stylix = {
13+
url = "github:danth/stylix";
14+
inputs.nixpkgs.follows = "nixpkgs";
15+
};
1316
nix-index-database = {
1417
url = "github:nix-community/nix-index-database";
1518
inputs.nixpkgs.follows = "nixpkgs";

hosts/framework/home/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
};
6969
ssh = {
7070
enable = true;
71+
enableDefaultConfig = false;
7172
matchBlocks = {
7273
"*" = {
7374
identitiesOnly = true;

modules/home/firefox.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ in
1212
options.my.programs.firefox.enable = lib.mkEnableOption "firefox";
1313

1414
config = lib.mkIf cfg.enable {
15+
# Currently using a theme
16+
stylix.targets.firefox.enable = false;
1517
programs.firefox = {
1618
enable = true;
1719

modules/home/git/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ in
5656

5757
programs.git = {
5858
enable = true;
59-
extraConfig = {
59+
settings = {
6060
core = {
6161
whitespace = "trailing-space, space-before-tab";
6262
quotepath = "off"; # https://stackoverflow.com/a/22828826

0 commit comments

Comments
 (0)