Skip to content

Commit

Permalink
chore(nix): Rename isLaptop variable to isThinkpad for clarity
Browse files Browse the repository at this point in the history
  • Loading branch information
mrjones2014 committed Nov 25, 2024
1 parent 7c54c7c commit 5808e95
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
13 changes: 7 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
inherit inputs;
isServer = true;
isLinux = true;
isLaptop = false;
isThinkpad = false;
isDarwin = false;
};
system = "x86_64-linux";
Expand All @@ -60,7 +60,7 @@
inherit inputs;
isServer = true;
isLinux = true;
isLaptop = false;
isThinkpad = false;
isDarwin = false;
};
};
Expand All @@ -73,7 +73,7 @@
isServer = false;
isDarwin = false;
isLinux = true;
isLaptop = false;
isThinkpad = false;
};
system = "x86_64-linux";
modules = [
Expand All @@ -90,7 +90,7 @@
isServer = false;
isDarwin = false;
isLinux = true;
isLaptop = false;
isThinkpad = false;
};
};
}
Expand All @@ -102,7 +102,7 @@
isServer = false;
isDarwin = false;
isLinux = true;
isLaptop = true;
isThinkpad = true;
};
system = "x86_64-linux";
modules = [
Expand All @@ -119,7 +119,7 @@
isServer = false;
isDarwin = false;
isLinux = true;
isLaptop = true;
isThinkpad = true;
};
};
}
Expand All @@ -133,6 +133,7 @@
isServer = false;
isDarwin = true;
isLinux = false;
isThinkpad = false;
};
pkgs = nixpkgs.legacyPackages.aarch64-darwin;
modules = [ ./home-manager/home.nix ];
Expand Down
6 changes: 3 additions & 3 deletions home-manager/modules/fish.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, lib, isDarwin, isLinux, isServer, isLaptop, ... }: {
{ pkgs, lib, isDarwin, isLinux, isServer, isThinkpad, ... }: {
home.sessionVariables = {
DOTNET_CLI_TELEMETRY_OPTOUT = "1";
HOMEBREW_NO_ANALYTICS = "1";
Expand Down Expand Up @@ -107,9 +107,9 @@
"home-manager switch --flake ~/git/dotfiles/.#mac"
else if isServer then
"sudo nixos-rebuild switch --flake ~/git/dotfiles/.#server"
else if isLaptop then
else if isThinkpad then
"sudo nixos-rebuild switch --flake ~/git/dotfiles/.#laptop"
else
else
"sudo nixos-rebuild switch --flake ~/git/dotfiles/.#pc"}
'';
};
Expand Down
4 changes: 2 additions & 2 deletions home-manager/modules/gnome/dconf.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, lib, isLaptop, ... }:
{ pkgs, lib, isThinkpad, ... }:
let
wallpaperImg = pkgs.fetchurl {
url =
Expand Down Expand Up @@ -39,7 +39,7 @@ in {
"signal-desktop.desktop"
"firefox.desktop"
"vesktop.desktop"
] ++ lib.lists.optionals (!isLaptop) [ "steam.desktop" ];
] ++ lib.lists.optionals (!isThinkpad) [ "steam.desktop" ];
inherit enabled-extensions;
};
"org/gnome/desktop/interface" = {
Expand Down

0 comments on commit 5808e95

Please sign in to comment.