mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
mjallen18
2025-11-20 16:18:28 -06:00
parent babe314199
commit 53a64aaf52
8 changed files with 151 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
homes/aarch64-darwin/mattjallen@macbook-pro/default.nix
View File

@@ -144,34 +144,34 @@ in
showIndicatorsForOpenApplications = true; showIndicatorsForOpenApplications = true;
showSuggestedAndRecentAppsInDock = false; showSuggestedAndRecentAppsInDock = false;
size = 64; # 16 - 128 size = 64; # 16 - 128
# persistentApps = [ # persistentApps = [
# { app = "/Applications/Clock.app"; } # { app = "/Applications/Clock.app"; }
# { folder = "/Applications"; } # { folder = "/Applications"; }
# { app = "/Applications/Safari.app"; } # { app = "/Applications/Safari.app"; }
# { app = "/Applications/Firefox.app"; } # { app = "/Applications/Firefox.app"; }
# { app = "/Applications/Tabby.app"; } # { app = "/Applications/Tabby.app"; }
# { app = "/Applications/Termius.app"; } # { app = "/Applications/Termius.app"; }
# { app = "/Applications/Muic.app"; } # { app = "/Applications/Muic.app"; }
# { app = "/Applications/Vesktop.app"; } # { app = "/Applications/Vesktop.app"; }
# { app = "/Applications/Messages.app"; } # { app = "/Applications/Messages.app"; }
# { app = "/Applications/Calendar.app"; } # { app = "/Applications/Calendar.app"; }
# { app = "/Applications/Reminders.app"; } # { app = "/Applications/Reminders.app"; }
# { app = "/Applications/Notes.app"; } # { app = "/Applications/Notes.app"; }
# { app = "/Applications/Weather.app"; } # { app = "/Applications/Weather.app"; }
# { app = "/Applications/Maps.app"; } # { app = "/Applications/Maps.app"; }
# { app = "/Applications/App Store.app"; } # { app = "/Applications/App Store.app"; }
# { app = "/Applications/System Settings.app"; } # { app = "/Applications/System Settings.app"; }
# { app = "/Applications/ChatGPT.app"; } # { app = "/Applications/ChatGPT.app"; }
# { app = "/Applications/Nextcloud.app"; } # { app = "/Applications/Nextcloud.app"; }
# { app = "/Applications/VSCodium.app"; } # { app = "/Applications/VSCodium.app"; }
# { app = "/Applications/Omnissa Horizon Client.app"; } # { app = "/Applications/Omnissa Horizon Client.app"; }
# { app = "/Applications/Proton Pass.app"; } # { app = "/Applications/Proton Pass.app"; }
# { app = "/Applications/OrcaSlicer.app"; } # { app = "/Applications/OrcaSlicer.app"; }
# { app = "/Applications/AlDente.app"; } # { app = "/Applications/AlDente.app"; }
# ]; # ];
# persistentOthers = [ # persistentOthers = [
# "~/Downloads" # "~/Downloads"
# ]; # ];
}; };
hotCorners = { hotCorners = {
# ["-" "Mission Control" "Application Windows" "Desktop" "Start Screen Saver" "Disable Screen Saver" "Dashboard" "Put Display to Sleep" "Launchpad" "Notification Center" "Lock Screen" "Quick Note"] # ["-" "Mission Control" "Application Windows" "Desktop" "Start Screen Saver" "Disable Screen Saver" "Dashboard" "Put Display to Sleep" "Launchpad" "Notification Center" "Lock Screen" "Quick Note"]
@@ -204,49 +204,49 @@ in
preferTabsWhenOpeningDocuments = "In Full Screen"; preferTabsWhenOpeningDocuments = "In Full Screen";
tiledWindowsHaveMargin = false; tiledWindowsHaveMargin = false;
}; };
};
focus = {
shareAcrossDevices = true;
};
general.dateAndTime."24HourTime" = false;
notifications = {
notificationCenter = {
showPreviews = "When Unlocked";
summarizeNotifications = true;
}; };
}; focus = {
sound = { shareAcrossDevices = true;
soundEffects = {
alertSound = "Boop";
alertVolume = 0.7;
playFeedbackWhenVolumeIsChanged = true;
playUserInterfaceSoundEffects = true;
}; };
}; general.dateAndTime."24HourTime" = false;
spotlight = { notifications = {
helpAppleImproveSearch = false; notificationCenter = {
# searchResults = { showPreviews = "When Unlocked";
# applications = true; summarizeNotifications = true;
# calculator = true; };
# contacts = true; };
# conversion = true; sound = {
# definition = true; soundEffects = {
# developer = true; alertSound = "Boop";
# documents = true; alertVolume = 0.7;
# eventsAndReminders = true; playFeedbackWhenVolumeIsChanged = true;
# folders = true; playUserInterfaceSoundEffects = true;
# fonts = false; };
# images = true; };
# mailAndMessages = true; spotlight = {
# movies = true; helpAppleImproveSearch = false;
# music = true; # searchResults = {
# other = false; # applications = true;
# pdfDocuments = true; # calculator = true;
# presentations = true; # contacts = true;
# siriSuggestions = false; # conversion = true;
# systemSettings = true; # definition = true;
# tips = false; # developer = true;
# websites = true; # documents = true;
# eventsAndReminders = true;
# folders = true;
# fonts = false;
# images = true;
# mailAndMessages = true;
# movies = true;
# music = true;
# other = false;
# pdfDocuments = true;
# presentations = true;
# siriSuggestions = false;
# systemSettings = true;
# tips = false;
# websites = true;
}; };
}; };
}; };

18
modules/darwin/home/default.nix
View File

@@ -1,10 +1,8 @@
{ {
config,
lib, lib,
options, options,
namespace, namespace,
inputs, inputs,
system,
... ...
}: }:
{ {
@@ -43,17 +41,13 @@
}; };
# Make ALL external HM modules available globally # Make ALL external HM modules available globally
sharedModules = sharedModules = with inputs; [
with inputs; sops-nix.homeManagerModules.sops
[ nix-plist-manager.homeManagerModules.default
sops-nix.homeManagerModules.sops # Add any other external HM modules here
nix-plist-manager.homeManagerModules.default ];
# Add any other external HM modules here
];
users."mattjallen" = users."mattjallen" = lib.mkAliasDefinitions options.${namespace}.home.extraOptions;
lib.mkAliasDefinitions
options.${namespace}.home.extraOptions;
verbose = true; verbose = true;
}; };

4
modules/darwin/programs/ssh/default.nix
View File

@@ -1,4 +1,4 @@
{ config, ... }: { ... }:
{ {
config = { config = {
programs.ssh.knownHosts = { programs.ssh.knownHosts = {
@@ -10,4 +10,4 @@
}; };
}; };
}; };
} }

19
modules/home/programs/waybar/default.nix
View File

@@ -24,16 +24,15 @@ let
border-radius: 0rem 1rem 1rem 0rem; border-radius: 0rem 1rem 1rem 0rem;
margin-right: 0.5rem; margin-right: 0.5rem;
''; '';
borderLeft = borderLeft = ''
palette.tokens.borderLeft or '' padding-top: 0.2rem;
padding-top: 0.2rem; padding-bottom: 0.2rem;
padding-bottom: 0.2rem; padding-left: 0.5rem;
padding-left: 0.5rem; padding-right: 0.5rem;
padding-right: 0.5rem; margin: 3px 0;
margin: 3px 0; border-radius: 1rem 0rem 0rem 1rem;
border-radius: 1rem 0rem 0rem 1rem; margin-left: 0.5rem;
margin-left: 0.5rem; '';
'';
baseStyle = baseStyle =
if cfg.style.file != null then if cfg.style.file != null then

2
modules/nixos/hardware/battery/default.nix
View File

@@ -40,4 +40,4 @@ in
}; };
}; };
}; };
} }

2
modules/nixos/home/default.nix
View File

@@ -67,7 +67,7 @@ in
# Add any other external HM modules here # Add any other external HM modules here
] ]
++ (if (!isArm) then with inputs; [ steam-rom-manager.homeManagerModules.default ] else [ ]) ++ (if (!isArm) then with inputs; [ steam-rom-manager.homeManagerModules.default ] else [ ])
++ (if (isDarwin) then with inputs; [ ] else [ ]); ++ (if (isDarwin) then with inputs; [ ] else [ ]);
users.${config.${namespace}.user.name} = users.${config.${namespace}.user.name} =
lib.mkAliasDefinitions lib.mkAliasDefinitions

61
packages/librepods-beta/default.nix
View File

@@ -1,20 +1,21 @@
{ lib {
, rustPlatform lib,
, fetchFromGitHub rustPlatform,
, pkg-config fetchFromGitHub,
, makeWrapper pkg-config,
, dbus makeWrapper,
, libpulseaudio dbus,
, gtk4 libpulseaudio,
, libadwaita gtk4,
, glib libadwaita,
, bluez glib,
, wayland bluez,
, libxkbcommon wayland,
, libGL libxkbcommon,
, vulkan-loader libGL,
, xorg vulkan-loader,
, gsettings-desktop-schemas xorg,
gsettings-desktop-schemas,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@@ -58,18 +59,20 @@ rustPlatform.buildRustPackage rec {
# Create wrapper script instead of wrapping in-place # Create wrapper script instead of wrapping in-place
postInstall = '' postInstall = ''
mv $out/bin/librepods $out/bin/.librepods-unwrapped mv $out/bin/librepods $out/bin/.librepods-unwrapped
makeWrapper $out/bin/.librepods-unwrapped $out/bin/librepods \ makeWrapper $out/bin/.librepods-unwrapped $out/bin/librepods \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ --prefix LD_LIBRARY_PATH : "${
wayland lib.makeLibraryPath [
libxkbcommon wayland
libGL libxkbcommon
vulkan-loader libGL
xorg.libX11 vulkan-loader
xorg.libXcursor xorg.libX11
xorg.libXrandr xorg.libXcursor
xorg.libXi xorg.libXrandr
]}" \ xorg.libXi
]
}" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--set GDK_BACKEND "wayland,x11" --set GDK_BACKEND "wayland,x11"
''; '';
@@ -82,4 +85,4 @@ rustPlatform.buildRustPackage rec {
mainProgram = "librepods"; mainProgram = "librepods";
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

62
systems/aarch64-darwin/macbook-pro/settings.nix
View File

@@ -4,39 +4,39 @@
enable = true; enable = true;
options = { options = {
applications.systemSettings = { applications.systemSettings = {
# # allowWallpaperTintingInWindows = true; # # allowWallpaperTintingInWindows = true;
general = { general = {
softwareUpdate = { softwareUpdate = {
automaticallyDownloadNewUpdatesWhenAvailable = true; automaticallyDownloadNewUpdatesWhenAvailable = true;
automaticallyInstallMacOSUpdates = false; automaticallyInstallMacOSUpdates = false;
automaticallyInstallApplicationUpdatesFromTheAppStore = false; automaticallyInstallApplicationUpdatesFromTheAppStore = false;
automaticallyInstallSecurityResponseAndSystemFiles = true; automaticallyInstallSecurityResponseAndSystemFiles = true;
};
# dateAndTime = {
# # setTimeAndDateAutomatically = true;
# "24HourTime" = "System";
# # show24HourTimeOnLockScreen = false;
# # setTimeZoneAutomaticallyUsingCurrentLocation = true;
# };
# keyboard = {
# keyRepeatRate = 6; # 1-7
# keyRepeatDelay = 4; # 1-6
# adjustKeyboardBrightnessInLowLight = true;
# keyboardBrightness = 0.5;
# turnKeyboardBacklightOffAfterInactivity = "Never";
# pressGlobeKeyTo = "Show Emoji & Symbols";
# keyboardNavigation = false;
# useF1F2EtcAsStandardFunctionKeys = false;
# dictation.enabled = false;
# };
}; };
# dateAndTime = { # trackpad = {
# # setTimeAndDateAutomatically = true; # trackingSpeed = 4;
# "24HourTime" = "System"; # click = "Medium";
# # show24HourTimeOnLockScreen = false; # forceClickAndHapticFeedback = true;
# # setTimeZoneAutomaticallyUsingCurrentLocation = true; # tapToClick = true;
# }; # };
# keyboard = {
# keyRepeatRate = 6; # 1-7
# keyRepeatDelay = 4; # 1-6
# adjustKeyboardBrightnessInLowLight = true;
# keyboardBrightness = 0.5;
# turnKeyboardBacklightOffAfterInactivity = "Never";
# pressGlobeKeyTo = "Show Emoji & Symbols";
# keyboardNavigation = false;
# useF1F2EtcAsStandardFunctionKeys = false;
# dictation.enabled = false;
# };
}; };
# trackpad = {
# trackingSpeed = 4;
# click = "Medium";
# forceClickAndHapticFeedback = true;
# tapToClick = true;
# };
};
}; };
}; };
} }