re-organize

This commit is contained in:
Henry Hiles 2025-03-22 21:31:51 -04:00
commit 350973f556
35 changed files with 8 additions and 8 deletions

View file

@ -1 +0,0 @@
{networking.hostName = "quadraticpc";}

View file

@ -1 +0,0 @@
{networking.hostName = "quadraticserver";}

View file

@ -1 +0,0 @@
{networking.hostName = "quadtop";}

View file

@ -40,12 +40,14 @@
modules = with dirUtils;
[
./wrappers
{networking.hostName = hostname;}
inputs.agenix.nixosModules.default
]
++ dirFiles ".nix" "${./clients}/${hostname}"
++ dirFiles ".nix" ./modules/common
++ opt (!isDesktop) (dirFiles ./modules/server)
++ opt isDesktop (
(dirFiles ".nix" ./modules/common-desktop)
(dirFiles ".nix" ./modules/desktop)
++ [
inputs.stylix.nixosModules.stylix
./stylix.nix
@ -56,10 +58,10 @@
);
};
in {
nixosConfigurations = {
"quadraticserver" = system "quadraticserver" false;
"quadraticpc" = system "quadraticpc" true;
"quadtop" = system "quadtop" true;
nixosConfigurations = builtins.mapAttrs (name: value: system name value) {
"quadraticserver" = false;
"quadraticpc" = true;
"quadtop" = true;
};
formatter.x86_64-linux = inputs.nixpkgs.legacyPackages.x86_64-linux.alejandra;

View file

@ -28,6 +28,7 @@
# NixOS
clean = "nh clean all";
rebuild = "nh os switch";
rebuildServer = "nixos-rebuild switch --flake ~/.config/nixos#quadraticserver --target-host quadradical@192.168.0.132 --use-remote-sudo";
update = "pushd ~/.config/nixos && nix flake update && popd && rebuild";
};
};

3
modules/desktop/adb.nix Normal file
View file

@ -0,0 +1,3 @@
{pkgs, ...}: {
services.udev.packages = [pkgs.android-udev-rules];
}

View file

@ -0,0 +1,7 @@
[burn-my-windows-profile]
fire-enable-effect=false
apparition-enable-effect=false
broken-glass-enable-effect=false
energize-a-enable-effect=false
energize-b-enable-effect=false
glide-enable-effect=true

View file

@ -0,0 +1,131 @@
{
lib,
pkgs,
...
}: {
programs.dconf.profiles.user.databases = [
{
# Can't lock because of home manager
# lockAll = true;
settings = lib.mapAttrs (_:
lib.mapAttrs (name: value:
if builtins.isInt value
then lib.gvariant.mkInt32 value
else value)) (with lib.gvariant; {
"org/gnome/shell/extensions/rounded-window-corners-reborn" = {
border-width = -5;
skip-libadwaita-app = false;
skip-libhandy-app = false;
};
"org/gnome/shell/extensions/pop-shell" = rec {
active-hint = true;
tile-by-default = true;
active-hint-border-radius = mkUint32 16;
gap-inner = mkUint32 3;
gap-outer = gap-inner;
};
"org/gnome/shell/extensions/just-perfection" = {
accessibility-menu = false;
activities-button = true;
calendar = true;
clock-menu = true;
clock-menu-position = 0;
dash = false;
dash-app-running = false;
dash-separator = false;
events-button = false;
keyboard-layout = false;
panel-size = 0;
power-icon = true;
quick-settings = true;
quick-settings-dark-mode = false;
show-apps-button = false;
startup-status = 0;
window-menu-take-screenshot-button = false;
window-picker-icon = true;
workspace = true;
workspace-switcher-size = 0;
world-clock = false;
};
"org/gnome/shell/extensions/display-brightness-ddcutil" = {
allow-zero-brightness = true;
button-location = 1;
ddcutil-binary-path = lib.meta.getExe pkgs.ddcutil;
ddcutil-queue-ms = 130.0;
ddcutil-sleep-multiplier = 40.0;
decrease-brightness-shortcut = ["XF86MonBrightnessDown"];
increase-brightness-shortcut = ["XF86MonBrightnessUp"];
hide-system-indicator = true;
only-all-slider = true;
position-system-menu = 3.0;
show-internal-slider = false;
show-all-slider = true;
show-display-name = false;
show-osd = true;
show-value-label = false;
step-change-keyboard = 2.0;
};
"org/gnome/shell/extensions/burn-my-windows".active-profile = toString ./burn-my-windows.conf;
"org/gnome/desktop/wm/preferences".focus-mode = "mouse";
"org/gnome/shell" = {
disable-user-extensions = true;
enabled-extensions = [
"blur-my-shell@aunetx"
"caffeine@patapon.info"
"pop-shell@system76.com"
"rounded-window-corners@fxgn"
"burn-my-windows@schneegans.github.com"
"fullscreen-avoider@noobsai.github.com"
"appindicatorsupport@rgcjonas.gmail.com"
"compiz-windows-effect@hermes83.github.com"
"user-theme@gnome-shell-extensions.gcampax.github.com"
"display-brightness-ddcutil@themightydeity.github.com"
"system-monitor@gnome-shell-extensions.gcampax.github.com"
"launch-new-instance@gnome-shell-extensions.gcampax.github.com"
];
disabled-extensions = [
"just-perfection-desktop@just-perfection"
];
};
"org/gnome/settings-daemon/plugins/media-keys".custom-keybindings = ["/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"];
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
binding = "<Super>e";
command = "nautilus";
name = "Files";
};
"org/gnome/desktop/search-providers".sort-order = ["org.gnome.Contacts.desktop" "org.gnome.Documents.desktop" "org.gnome.Nautilus.desktop"];
"org/gnome/desktop/interface" = rec {
color-scheme = "prefer-dark";
enable-animations = true;
cursor-theme = "GoogleDot-Blue";
cursor-size = 24;
gtk-theme = "adw-gtk3";
icon-theme = "Papirus";
toolkit-accessibility = false;
font-hinting = "slight";
font-antialiasing = "grayscale";
font-name = "Cantarell 11";
document-font-name = font-name;
monospace-font-name = "FiraCode Nerd Font 11";
};
# "org/gnome/Ptyxis".default-profile-uuid = "quadradical";
#
# "org/gnome/Ptyxis/Profiles/quadradical".palette = "nord";
});
}
];
}

View file

@ -0,0 +1,10 @@
{
environment.sessionVariables.NIXOS_OZONE_WL = "1";
services.xserver = {
enable = true;
displayManager.gdm.enable = true;
desktopManager.gnome.enable = true;
xkb.layout = "us";
};
}

View file

@ -0,0 +1,136 @@
@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@media (prefers-color-scheme: dark) {
:root {
/* Browser area before a page starts loading */
--gnome-browser-before-load-background: #2e3440;
/* Accent */
--gnome-accent-bg: #3584e4;
--gnome-accent: #78aeed;
/* Toolbars */
--gnome-toolbar-background: var(--gnome-headerbar-background);
--gnome-toolbar-color: #d8dee9;
--gnome-toolbar-border-color: rgba(0, 0, 0, 0.36);
--gnome-toolbar-icon-fill: #eeeeec;
--gnome-inactive-toolbar-color: #919190;
--gnome-inactive-toolbar-background: var(
--gnome-inactive-headerbar-background
);
--gnome-inactive-toolbar-border-color: var(
--gnome-toolbar-border-color
);
--gnome-inactive-toolbar-icon-fill: #919190;
/* Sidebar */
--gnome-sidebar-background: var(--gnome-toolbar-background);
--gnome-inactive-sidebar-background: var(--gnome-sidebar-background);
/* Menus */
--gnome-menu-background: #3b4252;
--gnome-menu-border-color: rgba(0, 0, 0, 0.14);
--gnome-menu-shadow: 0 1px 5px 1px rgba(0, 0, 0, 0.09),
0 2px 14px 3px rgba(0, 0, 0, 0.05);
--gnome-menu-button-hover-background: var(--gnome-button-background);
--gnome-menu-separator-color: rgba(255, 255, 255, 0.1);
/* Header bar */
--gnome-headerbar-background: #2e3440;
--gnome-headerbar-border-color: var(--gnome-toolbar-border-color);
/* --gnome-inactive-headerbar-background: var(--gnome-browser-before-load-background);*/
--gnome-inactive-headerbar-background: #3b4252;
--gnome-inactive-headerbar-border-color: var(
--gnome-inactive-toolbar-border-color
);
/* Buttons */
--gnome-button-background: rgba(255, 255, 255, 0.1);
--gnome-button-hover-background: rgba(255, 255, 255, 0.15);
--gnome-button-active-background: rgba(255, 255, 255, 0.3);
--gnome-button-flat-hover-background: rgba(255, 255, 255, 0.07);
--gnome-button-flat-active-background: rgba(255, 255, 255, 0.1);
--gnome-button-suggested-action-background: var(--gnome-accent-bg);
--gnome-button-destructive-action-background: #e01b24;
--gnome-button-close-background: var(
--gnome-button-flat-hover-background
);
--gnome-button-hover-close-background: var(
--gnome-button-hover-background
);
--gnome-button-active-close-background: var(
--gnome-button-active-background
);
--gnome-toolbar-star-button: #f8e45c;
/* Entries */
--gnome-entry-background: rgba(255, 255, 255, 0.1);
--gnome-entry-color: #d8dee9;
--gnome-inactive-entry-color: #d6d6d6;
--gnome-focused-urlbar-border-color: rgba(
120,
174,
237,
0.5
); /* Same as --gnome-accent but with opacity*/
/* Switch */
--gnome-switch-background: rgba(255, 255, 255, 0.15);
--gnome-switch-slider-background: #d2d2d2;
--gnome-switch-active-background: var(--gnome-accent-bg);
--gnome-switch-active-slider-background: #d8dee9;
/* Tabs */
--gnome-tabbar-background: var(--gnome-headerbar-background);
--gnome-tabbar-tab-separator-color: rgba(255, 255, 255, 0.15);
--gnome-tabbar-tab-hover-background: #3a404b; /* Hardcoded color */
--gnome-tabbar-tab-active-background: #3f4551; /* Hardcoded color */
--gnome-tabbar-tab-active-background-contrast: #616979; /* Hardcoded color */
--gnome-tabbar-tab-active-hover-background: #444a56; /* Hardcoded color */
--gnome-inactive-tabbar-background: var(
--gnome-inactive-headerbar-background
);
--gnome-inactive-tabbar-tab-hover-background: #404857; /* Hardcoded color */
--gnome-inactive-tabbar-tab-active-background: #434a59; /* Hardcoded color */
--gnome-tab-button-background: rgba(0, 0, 0, 0.5);
--gnome-tab-button-hover-background: rgba(0, 0, 0, 0.6);
--gnome-tabbar-tab-identity-base-opacity: 0;
--gnome-tabbar-tab-needs-attetion: #546f8e;
}
/* Private window colors */
:root {
--gnome-private-accent: #71a1db;
/* Toolbars */
--gnome-private-toolbar-background: #1c2438;
--gnome-private-inactive-toolbar-background: var(
--gnome-private-toolbar-background
);
/* Menus */
--gnome-private-menu-background: #252f49;
/* Header bar */
--gnome-private-headerbar-background: #252f49;
--gnome-private-inactive-headerbar-background: var(
--gnome-private-toolbar-background
);
/* Tabs */
--gnome-private-tabbar-tab-hover-background: #343e56; /* Hardcoded color */
--gnome-private-tabbar-tab-active-background: #343e56; /* Hardcoded color */
--gnome-private-tabbar-tab-active-background-contrast: #495675; /* Hardcoded color */
--gnome-private-tabbar-tab-active-hover-background: #414a61; /* Hardcoded color */
--gnome-private-inactive-tabbar-tab-hover-background: #242c3f; /* Hardcoded color */
--gnome-private-inactive-tabbar-tab-active-background: #272e41; /* Hardcoded color */
/* Text color for Firefox Logo in new private tab */
--gnome-private-wordmark: #fbfbfe;
/* New private tab background */
--gnome-private-in-content-page-background: #1c2438;
/* Private browsing info box */
--gnome-private-text-primary-color: #fbfbfe;
}
}

View file

@ -0,0 +1 @@
customChrome.css

View file

@ -0,0 +1,168 @@
{
lib,
pkgs,
inputs,
...
}: {
# From https://hedgedoc.grimmauld.de/s/rVnTq0-Rs
nixpkgs.overlays = lib.singleton (final: prev: {
firefox = prev.firefox.overrideAttrs (old: {
nativeBuildInputs = (old.nativeBuildInputs or []) ++ (with prev; [zip unzip gnused]);
buildCommand =
''
export buildRoot="$(pwd)"
''
+ old.buildCommand
+ ''
pushd $buildRoot
unzip $out/lib/firefox/browser/omni.ja -d patched_omni || ret=$?
if [[ $ret && $ret -ne 2 ]]; then
echo "unzip exited with unexpected error"
exit $ret
fi
rm $out/lib/firefox/browser/omni.ja
cd patched_omni
sed -i 's/"enterprise_only"\s*:\s*true,//' modules/policies/schema.sys.mjs
zip -0DXqr $out/lib/firefox/browser/omni.ja * # potentially qr9XD
popd
'';
});
});
systemd.tmpfiles.settings.firefox = {
# "/home/quadradical/.mozilla/firefox/quadradical"."d".user = "quadradical";
"/home/quadradical/.mozilla/firefox/profiles.ini"."f+".argument = builtins.toJSON (lib.generators.toINI {} {
General = {
StartWithLastProfile = 1;
};
Profile0 = rec {
Default = 1;
IsRelative = 1;
Name = "quadradical";
Path = Name;
};
});
"/home/quadradical/.mozilla/firefox/quadradical/chrome"."L+".argument =
toString
(pkgs.symlinkJoin {
name = "firefox-gnome-theme";
paths = [./. inputs.firefox-gnome-theme];
});
};
programs.firefox = {
enable = true;
# autoConfig = lib.concatStringsSep "\n" (lib.mapAttrsToList (pref: value: "lockPref(\"${pref}\", ${builtins.toJSON value});") {
preferences = {
"browser.aboutConfig.showWarning" = false;
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
"browser.uiCustomization.state" = "{\"placements\":{\"widget-overflow-fixed-list\":[],\"unified-extensions-area\":[],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"PersonalToolbar\":[\"personal-bookmarks\"]},\"seen\":[\"save-to-pocket-button\",\"developer-button\"],\"dirtyAreaCache\":[\"nav-bar\",\"PersonalToolbar\",\"toolbar-menubar\",\"TabsToolbar\"],\"currentVersion\":19}";
};
policies = {
ShowHomeButton = false;
DisablePocket = true;
DisableTelemetry = true;
DisableFirefoxStudies = true;
DisableFirefoxScreenshots = true;
DisableSetDesktopBackground = true;
DisableMasterPasswordCreation = true;
DontCheckDefaultBrowser = true;
HttpsOnlyMode = "force_enabled";
DisplayMenuBar = "never";
DisplayBookmarksToolbar = "never";
DNSOverHTTPS.Enabled = false;
EnableTrackingProtection = {
Value = true;
Locked = true;
Cryptomining = true;
Fingerprinting = true;
};
UserMessaging = {
WhatsNew = false;
ExtensionRecommendations = false;
FeatureRecommendations = false;
UrlbarInterventions = false;
SkipOnboarding = true;
MoreFromMozilla = false;
FirefoxLabs = false;
};
FirefoxHome = {
TopSites = true;
SponsoredTopSites = false;
Pocket = false;
Snippets = false;
Highlights = false;
Locked = true;
};
FirefoxSuggest = {
WebSuggestions = false;
SponsoredSuggestions = false;
ImproveSuggest = false;
Locked = true;
};
ExtensionSettings = lib.mkForce (lib.listToAttrs (map (id: {
name = id;
value = {
install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${id}/latest.xpi";
installation_mode = "force_installed";
};
}) [
"historyblock@kain"
"uBlock0@raymondhill.net"
"sponsorBlocker@ajay.app"
"jid1-MnnxcxisBPnSXQ@jetpack" # Privacy Badger
"frankerfacez@frankerfacez.com"
"7esoorv3@alefvanoon.anonaddy.me" # LibRedirect
"{4ce83447-8255-43c2-b8f7-e02eb8c2cc39}" # Draw on Page
"{ac34afe8-3a2e-4201-b745-346c0cf6ec7d}" # Better Youtube Shorts
"{2327d818-55d3-441d-aea2-8b44aa2cb9aa}" # Toggle Website Colors
"{a6c4a591-f1b2-4f03-b3ff-767e5bedf4e7}" # User-Agent Switcher and Manager
"enhancerforyoutube@maximerf.addons.mozilla.org"
]));
SearchEngines = {
Default = "DuckDuckGo";
Remove = ["Bing" "Google" "Amazon.ca" "eBay"];
Add = [
{
Name = "Nix Package Search";
URLTemplate = "https://search.nixos.org/packages?channel=unstable&query={searchTerms}";
IconURL = "https://github.com/NixOS/nixos-artwork/raw/refs/heads/master/logo/nix-snowflake-white.svg";
Alias = "np";
preferences = {
"gnomeTheme.oledBlack" = true; # Enable nord theme
"svg.context-properties.content.enabled" = true;
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
"browser.uiCustomization.state" = "{\"placements\":{\"widget-overflow-fixed-list\":[],\"unified-extensions-area\":[],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"PersonalToolbar\":[\"personal-bookmarks\"]},\"seen\":[\"save-to-pocket-button\",\"developer-button\"],\"dirtyAreaCache\":[\"nav-bar\",\"PersonalToolbar\",\"toolbar-menubar\",\"TabsToolbar\"],\"currentVersion\":19}";
};
}
{
Name = "NixOS Option Search";
URLTemplate = "https://search.nixos.org/options?channel=unstable&query={searchTerms}";
IconURL = "https://github.com/NixOS/nixos-artwork/raw/refs/heads/master/logo/nix-snowflake-white.svg";
Alias = "no";
}
{
Name = "NixOS Wiki";
URLTemplate = "https://nixos.wiki/index.php?search={searchTerms}";
IconURL = "https://github.com/NixOS/nixos-artwork/raw/refs/heads/master/logo/nix-snowflake-white.svg";
Alias = "nw";
}
];
};
};
};
}

View file

@ -0,0 +1,3 @@
{
services.flatpak.enable = true;
}

41
modules/desktop/gnome.nix Normal file
View file

@ -0,0 +1,41 @@
{pkgs, ...}: {
programs.nautilus-open-any-terminal = {
enable = true;
terminal = "ptyxis";
};
environment = {
sessionVariables.XDG_CURRENT_DESKTOP = "GNOME";
systemPackages = with pkgs.gnomeExtensions; [
caffeine
pop-shell
appindicator
blur-my-shell
just-perfection
burn-my-windows
fullscreen-avoider
compiz-windows-effect
rounded-window-corners-reborn
brightness-control-using-ddcutil
];
gnome.excludePackages = with pkgs; [
yelp
totem
xterm
evince
snapshot
epiphany
gnome-logs
gnome-tour
gnome-music
gnome-console
gnome-calendar
gnome-software
gnome-characters
gnome-text-editor
gnome-system-monitor
];
};
}

View file

@ -0,0 +1 @@
{hardware.graphics.enable = true;}

3
modules/desktop/ipad.nix Normal file
View file

@ -0,0 +1,3 @@
{
services.usbmuxd.enable = true;
}

View file

@ -0,0 +1 @@
{hardware.keyboard.qmk.enable = true;}

View file

@ -0,0 +1 @@
{environment.etc."launch-rl.bat".source = ./launch-rl.bat;}

View file

@ -0,0 +1,12 @@
@echo off
set RL_PATH="Z:\home\quadradical\Documents\Games\rocketleague\Binaries\Win64"
echo Launching BakkesMod...
C:
cd "C:\Program Files\BakkesMod"
start BakkesMod.exe
echo BakkesMod started, starting Rocket League
Z:
cd %RL_PATH%
RocketLeague.exe %*

3
modules/desktop/mac.nix Normal file
View file

@ -0,0 +1,3 @@
{
networking.networkmanager.wifi.macAddress = "random";
}

Some files were not shown because too many files have changed in this diff Show more