greyweather/nix-flake
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adapt config for use with standalone home-manager

Browse Source
This commit is contained in:
greyweather committed 2026-08-28 01:15:05 +01:00
1 parent 765f346eb6
commit 3af64e993c
19 files changed
+418 -287
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

modules/capabilities/graphics.nix
+15
View File
@@ -54,6 +54,8 @@
x264 x264
gparted gparted
vlc vlc
iosevka-comfy.comfy
nerd-fonts.jetbrains-mono
]; ];
dconf.settings = { dconf.settings = {
@@ -62,8 +64,21 @@
}; };
}; };
home.pointerCursor = {
enable = true;
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Ice";
size = 22;
gtk.enable = true;
x11.enable = true;
};
gtk = { gtk = {
enable = true; enable = true;
colorScheme = "dark";
gtk2.configLocation = "${config.home.homeDirectory}/.config/.gtkrc-2.0"; # prevents file conflicts between this and other parts of the nix config
gtk2.force = true;
}; };
}; };
} }
modules/components/shells/noctalia.nix
+9 -9
View File
@@ -9,23 +9,23 @@
}; };
}; };
flake.homeModules.graphics = { lib, pkgs, osConfig, ... }: { flake.homeModules.graphics = { lib, pkgs, osConfig, config, ... }: {
config = lib.mkIf ((osConfig.components.shells == "noctalia")||(builtins.elem "noctalia" osConfig.components.shells)) { config = lib.mkIf (builtins.hasAttr "osConfig" self) (lib.mkIf ((osConfig.components.shells == "noctalia")||(builtins.elem "noctalia" osConfig.components.shells)) {
home.activation = { home.activation = {
symlinkNoctaliaState = lib.hm.dag.entryAfter ["writeBoundary"] (osConfig.helpers.mkSymlinkActivationScript { symlinkNoctaliaState = lib.hm.dag.entryAfter ["writeBoundary"] (config.helpers.mkSymlinkActivationScript {
target = ".local/state/noctalia/settings.toml"; target = ".local/state/noctalia/settings.toml";
source = "dotfiles/${osConfig.info.hostName}/noctalia/settings.toml"; source = "dotfiles/${config.info.hostName}/noctalia/settings.toml";
}); });
symlinkNoctaliaStatePlugins = lib.hm.dag.entryAfter ["writeBoundary"] (osConfig.helpers.mkSymlinkActivationScript { symlinkNoctaliaStatePlugins = lib.hm.dag.entryAfter ["writeBoundary"] (config.helpers.mkSymlinkActivationScript {
target = ".local/state/noctalia/plugins"; target = ".local/state/noctalia/plugins";
source = "dotfiles/${osConfig.info.hostName}/noctalia/plugins"; source = "dotfiles/${config.info.hostName}/noctalia/plugins";
isDir = true; isDir = true;
}); });
}; };
xdg.configFile."noctalia/settings.toml".source = "${self}/dotfiles/${osConfig.info.hostName}/noctalia/settings.toml"; xdg.configFile."noctalia/settings.toml".source = "${self}/dotfiles/${config.info.hostName}/noctalia/settings.toml";
xdg.configFile."noctalia/plugins".source = "${self}/dotfiles/${osConfig.info.hostName}/noctalia/plugins"; xdg.configFile."noctalia/plugins".source = "${self}/dotfiles/${config.info.hostName}/noctalia/plugins";
}; });
}; };
} }
modules/components/window-managers/niri.nix
+5 -5
View File
@@ -39,12 +39,12 @@
}; };
}; };
flake.homeModules.graphics = { lib, osConfig, ... }: { flake.homeModules.graphics = { lib, osConfig, config, ... }: {
config = lib.mkIf ((osConfig.components.windowManagers == "niri")||(builtins.elem "niri" osConfig.components.windowManagers)) { config = lib.mkIf (builtins.hasAttr "osConfig" self) (lib.mkIf ((osConfig.components.windowManagers == "niri")||(builtins.elem "niri" osConfig.components.windowManagers)) {
home.activation.symlinkNiriConfig = lib.hm.dag.entryAfter ["writeBoundary"] (osConfig.helpers.mkSymlinkActivationScript { home.activation.symlinkNiriConfig = lib.hm.dag.entryAfter ["writeBoundary"] (config.helpers.mkSymlinkActivationScript {
target = ".config/niri/config.kdl"; target = ".config/niri/config.kdl";
source = "dotfiles/${osConfig.info.hostName}/niri.kdl"; source = "dotfiles/${config.info.hostName}/niri.kdl";
}); });
}; });
}; };
} }
modules/features/applications/cli/fastfetch.nix
+2 -4
View File
@@ -1,10 +1,8 @@
{ inputs, self, ... }: { { inputs, self, ... }: {
flake.nixosModules.global = { lib, config, ... }: { flake.homeModules.global = { pkgs, lib, config, ... }: {
options.features.applications.cli.fastfetch.enable = lib.mkEnableOption "fastfetch"; options.features.applications.cli.fastfetch.enable = lib.mkEnableOption "fastfetch";
};
flake.homeModules.global = { pkgs, lib, osConfig, ... }: { config = lib.mkIf (config.features.applications.cli.fastfetch.enable) ({
config = lib.mkIf (osConfig.features.applications.cli.fastfetch.enable) ({
programs.zsh.initContent = lib.mkOrder 1500 "fastfetch"; programs.zsh.initContent = lib.mkOrder 1500 "fastfetch";
programs.fastfetch.enable = true; programs.fastfetch.enable = true;
}); });
modules/features/applications/gui/equibop.nix
+8 -10
View File
@@ -1,26 +1,24 @@
{ inputs, self, ... }: { { inputs, self, ... }: {
flake.nixosModules.graphics = { pkgs, lib, config, ... }: { flake.homeModules.graphics = { pkgs, lib, config, ... }: {
options.features.applications.gui.equibop.enable = lib.mkEnableOption "equibop"; options.features.applications.gui.equibop.enable = lib.mkEnableOption "equibop";
};
flake.homeModules.graphics = { pkgs, lib, osConfig, ... }: { config = lib.mkIf (config.features.applications.gui.equibop.enable) {
config = lib.mkIf (osConfig.features.applications.gui.equibop.enable) {
programs.equibop.enable = true; programs.equibop.enable = true;
home.activation = { home.activation = {
linkEquibopConfigSettings = lib.hm.dag.entryAfter ["writeBoundary"] (osConfig.helpers.mkSymlinkActivationScript { linkEquibopConfigSettings = lib.hm.dag.entryAfter ["writeBoundary"] (config.helpers.mkSymlinkActivationScript {
target = ".config/equibop/settings.json"; target = ".config/equibop/settings.json";
source = "dotfiles/${osConfig.info.hostName}/equibop/settings.json"; source = "dotfiles/${config.info.hostName}/equibop/settings.json";
}); });
linkEquibopConfigEquicordSettings = lib.hm.dag.entryAfter ["writeBoundary"] (osConfig.helpers.mkSymlinkActivationScript { linkEquibopConfigEquicordSettings = lib.hm.dag.entryAfter ["writeBoundary"] (config.helpers.mkSymlinkActivationScript {
target = ".config/equibop/settings/settings.json"; target = ".config/equibop/settings/settings.json";
source = "dotfiles/${osConfig.info.hostName}/equibop/equicord-settings.json"; source = "dotfiles/${config.info.hostName}/equibop/equicord-settings.json";
}); });
linkEquibopConfigQuickCss = lib.hm.dag.entryAfter ["writeBoundary"] (osConfig.helpers.mkSymlinkActivationScript { linkEquibopConfigQuickCss = lib.hm.dag.entryAfter ["writeBoundary"] (config.helpers.mkSymlinkActivationScript {
target = ".config/equibop/settings/quickCss.css"; target = ".config/equibop/settings/quickCss.css";
source = "dotfiles/${osConfig.info.hostName}/equibop/quickCss.css"; source = "dotfiles/${config.info.hostName}/equibop/quickCss.css";
}); });
}; };
}; };
modules/features/applications/gui/floorp.nix
+194 -197
View File
@@ -1,216 +1,213 @@
{ inputs, self, ... }: { { inputs, self, ... }: {
flake.nixosModules.graphics = { pkgs, config, lib, ... }: { flake.homeModules.graphics = { pkgs, lib, config, osConfig, ... }: {
options.features.applications.gui.floorp.enable = lib.mkEnableOption "floorp"; options.features.applications.gui.floorp.enable = lib.mkEnableOption "floorp";
};
flake.homeModules.graphics = { pkgs, lib, osConfig, ... }: { config = lib.mkIf (config.features.applications.gui.floorp.enable) (
config = lib.mkIf (osConfig.features.applications.gui.floorp.enable) ( let
let firefox-addons = with pkgs; inputs.firefox-addons.packages.${system};
firefox-addons = with pkgs; inputs.firefox-addons.packages.${system}; in {
in { programs.floorp = {
stylix.targets.floorp.profileNames = lib.mkIf (osConfig.features.nixos.stylix.enable) [ "default" ]; enable = true;
nativeMessagingHosts = [
programs.floorp = { pkgs.firefoxpwa
enable = true; ];
nativeMessagingHosts = [ policies = {
pkgs.firefoxpwa AIControls.Default = {
]; Value = "blocked";
policies = { Locked = true;
AIControls.Default = {
Value = "blocked";
Locked = true;
};
AutofillAddressEnabled = false;
AutofillCreditCardEnabled = false;
DisableAppUpdate = true;
DisableFeedbackCommands = true;
DisableFirefoxStudies = true;
DisablePocket = true;
DisableTelemetry = true;
NoDefaultBookmarks = true;
EnableTrackingProtection = {
Value = true;
Locked = true;
Cryptomining = true;
Fingerprinting = true;
};
}; };
profiles.default = { AutofillAddressEnabled = false;
extensions = { AutofillCreditCardEnabled = false;
packages = with firefox-addons; [ DisableAppUpdate = true;
adnauseam DisableFeedbackCommands = true;
bitwarden DisableFirefoxStudies = true;
indie-wiki-buddy DisablePocket = true;
pwas-for-firefox DisableTelemetry = true;
gnome-shell-integration NoDefaultBookmarks = true;
]; EnableTrackingProtection = {
Value = true;
settings = { Locked = true;
${firefox-addons.adnauseam.addonId} = { Cryptomining = true;
force = true; Fingerprinting = true;
settings = { };
"firstInstall" = false; };
"hidingAds" = true; profiles.default = {
"clickingAds" = true; extensions = {
"blockingMalware" = true; packages = with firefox-addons; [
"disableClickingForDNT" = true; adnauseam
"clickProbability" = 0.75; bitwarden
selectedFilterLists = [ indie-wiki-buddy
"user-filters" pwas-for-firefox
"adnauseam-filters" gnome-shell-integration
"eff-dnt-whitelist" ];
"ublock-filters"
"ublock-badware"
"ublock-privacy"
"ublock-quick-fixes"
"ublock-unbreak"
"easylist"
"easyprivacy"
"urlhaus-1"
"fanboy-cookiemonster"
"ublock-cookies-easylist"
"adguard-cookies"
"ublock-cookies-adguard"
"fanboy-ai-suggestions"
"easylist-chat"
"easylist-newsletters"
"easylist-notifications"
"easylist-annoyances"
"adguard-mobile-app-banners"
"adguard-other-annoyances"
"adguard-popup-overlays"
"adguard-widgets"
"ublock-annoyances"
];
};
};
};
};
settings = { settings = {
"signon.rememberSignons" = false; ${firefox-addons.adnauseam.addonId} = {
"signon.autofillForms" = false; force = true;
"floorp.panelSidebar.enabled" = false; settings = {
"floorp.workspaces.enabled" = false; "firstInstall" = false;
"browser.toolbars.bookmarks.visibility" = "newtab"; "hidingAds" = true;
"floorp.browser.welcome.page.shown" = true; "clickingAds" = true;
"browser.newtabpage.activity-stream.feeds.topsites" = false; "blockingMalware" = true;
"browser.newtabpage.activity-stream.feeds.section.topstories" = false; "disableClickingForDNT" = true;
"browser.newtabpage.activity-stream.feeds.adsfeed" = false; "clickProbability" = 0.75;
"browser.newtabpage.activity-stream.feeds.telemetry" = false; selectedFilterLists = [
"browser.newtabpage.activity-stream.feeds.weatherfeed" = false; "user-filters"
"browser.newtabpage.activity-stream.newtabWallpapers.user.enabled" = true; "adnauseam-filters"
"browser.newtabpage.activity-stream.widgets.enabled" = false; "eff-dnt-whitelist"
"browser.newtabpage.activity-stream.discoverystream.enabled" = false; "ublock-filters"
"browser.newtabpage.activity-stream.newtabWallpapers.wallpaper" = "suspension-bridge"; "ublock-badware"
"floorp.design.configs" = { "ublock-privacy"
globalConfigs = { "ublock-quick-fixes"
userInterface = "proton"; "ublock-unbreak"
uiCustomization = { "easylist"
qrCode.disableButton = true; "easyprivacy"
disableFloorpStart = true; "urlhaus-1"
}; "fanboy-cookiemonster"
}; "ublock-cookies-easylist"
}; "adguard-cookies"
"ui.key.menuAccessKeyFocuses" = false; "ublock-cookies-adguard"
"floorp.keyboardshortcut.enabled" = true; "fanboy-ai-suggestions"
"floorp.keyboardshortcut.config" = { "easylist-chat"
enabled = true; "easylist-newsletters"
shortcuts = { "easylist-notifications"
gecko-close-tab = { "easylist-annoyances"
modifiers = { "adguard-mobile-app-banners"
alt = true; "adguard-other-annoyances"
ctrl = false; "adguard-popup-overlays"
meta = false; "adguard-widgets"
shift = false; "ublock-annoyances"
}; ];
key = "Q";
action = "gecko-close-tab";
};
gecko-open-new-tab = {
modifiers = {
alt = true;
ctrl = false;
meta = false;
shift = false;
};
key = "Enter";
action = "gecko-open-new-tab";
};
}; };
}; };
}; };
};
search = {
force = true; settings = {
default = "ddg-noai"; "signon.rememberSignons" = false;
engines = { "signon.autofillForms" = false;
ddg-noai = { "floorp.panelSidebar.enabled" = false;
name = "DuckDuckGo No-AI"; "floorp.workspaces.enabled" = false;
urls = [ "browser.toolbars.bookmarks.visibility" = "newtab";
{ "floorp.browser.welcome.page.shown" = true;
template = "https://noai.duckduckgo.com/?q={searchTerms}"; "browser.newtabpage.activity-stream.feeds.topsites" = false;
} "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
]; "browser.newtabpage.activity-stream.feeds.adsfeed" = false;
icon = "https://duckduckgo.com/favicon.ico"; "browser.newtabpage.activity-stream.feeds.telemetry" = false;
definedAliases = ["@noai"]; "browser.newtabpage.activity-stream.feeds.weatherfeed" = false;
"browser.newtabpage.activity-stream.newtabWallpapers.user.enabled" = true;
"browser.newtabpage.activity-stream.widgets.enabled" = false;
"browser.newtabpage.activity-stream.discoverystream.enabled" = false;
"browser.newtabpage.activity-stream.newtabWallpapers.wallpaper" = "suspension-bridge";
"floorp.design.configs" = {
globalConfigs = {
userInterface = "proton";
uiCustomization = {
qrCode.disableButton = true;
disableFloorpStart = true;
}; };
nixpkgs = { };
name = "nixpkgs packages"; };
urls = [ "ui.key.menuAccessKeyFocuses" = false;
{ "floorp.keyboardshortcut.enabled" = true;
template = "https://search.nixos.org/packages?query={searchTerms}"; "floorp.keyboardshortcut.config" = {
} enabled = true;
]; shortcuts = {
icon = "https://wiki.nixos.org/favicon.ico"; gecko-close-tab = {
definedAliases = ["@np"]; modifiers = {
alt = true;
ctrl = false;
meta = false;
shift = false;
};
key = "Q";
action = "gecko-close-tab";
}; };
nixos-options = { gecko-open-new-tab = {
name = "NixOS options"; modifiers = {
urls = [ alt = true;
{ ctrl = false;
template = "https://search.nixos.org/options?query={searchTerms}"; meta = false;
} shift = false;
]; };
icon = "https://wiki.nixos.org/favicon.ico"; key = "Enter";
definedAliases = ["@no"]; action = "gecko-open-new-tab";
};
nixos-wiki = {
name = "NixOS Wiki";
urls = [
{
template = "https://wiki.nixos.org/w/index.php?search={searchTerms}";
}
];
icon = "https://wiki.nixos.org/favicon.ico";
definedAliases = ["@nw"];
};
noogle = {
name = "Noogle";
urls = [
{
template = "https://noogle.dev/q/?term={searchTerms}";
}
];
icon = "https://noogle.dev/favicon.ico";
definedAliases = ["@ng"];
};
arch-wiki = {
name = "ArchWiki";
urls = [
{
template = "https://wiki.archlinux.org/index.php?search={searchTerms}";
}
];
icon = "https://wiki.archlinux.org/favicon.ico";
definedAliases = ["@aw"];
}; };
}; };
}; };
}; };
search = {
force = true;
default = "ddg-noai";
engines = {
ddg-noai = {
name = "DuckDuckGo No-AI";
urls = [
{
template = "https://noai.duckduckgo.com/?q={searchTerms}";
}
];
icon = "https://duckduckgo.com/favicon.ico";
definedAliases = ["@noai"];
};
nixpkgs = {
name = "nixpkgs packages";
urls = [
{
template = "https://search.nixos.org/packages?query={searchTerms}";
}
];
icon = "https://wiki.nixos.org/favicon.ico";
definedAliases = ["@np"];
};
nixos-options = {
name = "NixOS options";
urls = [
{
template = "https://search.nixos.org/options?query={searchTerms}";
}
];
icon = "https://wiki.nixos.org/favicon.ico";
definedAliases = ["@no"];
};
nixos-wiki = {
name = "NixOS Wiki";
urls = [
{
template = "https://wiki.nixos.org/w/index.php?search={searchTerms}";
}
];
icon = "https://wiki.nixos.org/favicon.ico";
definedAliases = ["@nw"];
};
noogle = {
name = "Noogle";
urls = [
{
template = "https://noogle.dev/q/?term={searchTerms}";
}
];
icon = "https://noogle.dev/favicon.ico";
definedAliases = ["@ng"];
};
arch-wiki = {
name = "ArchWiki";
urls = [
{
template = "https://wiki.archlinux.org/index.php?search={searchTerms}";
}
];
icon = "https://wiki.archlinux.org/favicon.ico";
definedAliases = ["@aw"];
};
};
};
}; };
} };
); }) // lib.optionalAttrs (builtins.hasAttr "osConfig" self) {
stylix.targets.floorp.profileNames = lib.mkIf (config.features.applications.gui.floorp.enable) [ "default" ];
};
}; };
} }
modules/features/applications/gui/kitty.nix
+2 -4
View File
@@ -1,10 +1,8 @@
{ inputs, self, ... }: { { inputs, self, ... }: {
flake.nixosModules.graphics = { pkgs, config, lib, ... }: { flake.homeModules.graphics = { pkgs, config, lib, ... }: {
options.features.applications.gui.kitty.enable = lib.mkEnableOption "kitty"; options.features.applications.gui.kitty.enable = lib.mkEnableOption "kitty";
};
flake.homeModules.graphics = { pkgs, osConfig, lib, ... }: { config = lib.mkIf (config.features.applications.gui.kitty.enable) {
config = lib.mkIf (osConfig.features.applications.gui.kitty.enable) {
programs.kitty = { programs.kitty = {
enable = true; enable = true;
modules/features/applications/gui/nautilus.nix
+4 -4
View File
@@ -19,10 +19,10 @@
}; };
}; };
flake.homeModules.graphics = { pkgs, osConfig, lib, ... }: { flake.homeModules.graphics = { pkgs, osConfig, config, lib, ... }: {
config = lib.mkIf (osConfig.features.applications.gui.nautilus.enable) { config = lib.mkIf (builtins.hasAttr "osConfig" self) (lib.mkIf (osConfig.features.applications.gui.nautilus.enable) {
gtk.gtk3.bookmarks = [ gtk.gtk3.bookmarks = [
"file://${osConfig.info.rootPath} NixOS" "file://${config.info.rootPath} NixOS"
"file:///home/grey/Downloads Downloads" "file:///home/grey/Downloads Downloads"
"file:///home/grey/Documents Documents" "file:///home/grey/Documents Documents"
"file:///home/grey/Pictures Pictures" "file:///home/grey/Pictures Pictures"
@@ -30,6 +30,6 @@
"file:///home/grey/Videos Videos" "file:///home/grey/Videos Videos"
"file:/// Root" "file:/// Root"
]; ];
}; });
}; };
} }
modules/features/applications/gui/remmina.nix
+4 -6
View File
@@ -1,18 +1,16 @@
{ inputs, self, ... }: { { inputs, self, ... }: {
flake.nixosModules.graphics = { pkgs, config, lib, ... }: { flake.homeModules.graphics = { pkgs, config, lib, ... }: {
options.features.applications.gui.remmina.enable = lib.mkEnableOption "remmina"; options.features.applications.gui.remmina.enable = lib.mkEnableOption "remmina";
};
flake.homeModules.graphics = { pkgs, osConfig, lib, ... }: { config = lib.mkIf (config.features.applications.gui.remmina.enable) {
config = lib.mkIf (osConfig.features.applications.gui.remmina.enable) {
home.packages = with pkgs; [ home.packages = with pkgs; [
remmina remmina
freerdp freerdp
]; ];
home.activation.linkRemminaPresets = lib.hm.dag.entryAfter ["writeBoundary"] (osConfig.helpers.mkSymlinkActivationScript { home.activation.linkRemminaPresets = lib.hm.dag.entryAfter ["writeBoundary"] (config.helpers.mkSymlinkActivationScript {
target = ".local/share/remmina"; target = ".local/share/remmina";
source = "dotfiles/${osConfig.info.hostName}/remmina"; source = "dotfiles/${config.info.hostName}/remmina";
isDir = true; isDir = true;
}); });
}; };
modules/features/applications/gui/spotify.nix
+3 -5
View File
@@ -1,25 +1,23 @@
{ inputs, self, ... }: { { inputs, self, ... }: {
flake.nixosModules.graphics = { lib, ... }: { flake.homeModules.graphics = { pkgs, config, lib, ... }: {
options.features.applications.gui.spotify = { options.features.applications.gui.spotify = {
enable = lib.mkEnableOption "spotify"; enable = lib.mkEnableOption "spotify";
spicetify.enable = lib.mkEnableOption "spicetify"; spicetify.enable = lib.mkEnableOption "spicetify";
}; };
};
flake.homeModules.graphics = { pkgs, config, lib, osConfig, ... }: {
imports = [ imports = [
inputs.spicetify.homeManagerModules.default inputs.spicetify.homeManagerModules.default
]; ];
config = { config = {
home.packages = lib.mkIf (with osConfig.features.applications.gui.spotify; enable && !spicetify.enable) (with pkgs; [ home.packages = lib.mkIf (with config.features.applications.gui.spotify; enable && !spicetify.enable) (with pkgs; [
spotify spotify
]); ]);
programs.spicetify = programs.spicetify =
let let
spicePkgs = inputs.spicetify.legacyPackages.${pkgs.stdenv.hostPlatform.system}; spicePkgs = inputs.spicetify.legacyPackages.${pkgs.stdenv.hostPlatform.system};
in lib.mkIf (with osConfig.features.applications.gui.spotify; enable && spicetify.enable) { in lib.mkIf (with config.features.applications.gui.spotify; enable && spicetify.enable) {
enable = true; enable = true;
enabledExtensions = with spicePkgs.extensions; [ enabledExtensions = with spicePkgs.extensions; [
hidePodcasts hidePodcasts
modules/features/applications/gui/vscode.nix
+4 -6
View File
@@ -1,19 +1,17 @@
{ inputs, self, ... }: { { inputs, self, ... }: {
flake.nixosModules.graphics = { pkgs, config, lib, ... }: { flake.homeModules.graphics = { config, pkgs, lib, ... }: {
options.features.applications.gui.vscode.enable = lib.mkEnableOption "vscode"; options.features.applications.gui.vscode.enable = lib.mkEnableOption "vscode";
};
flake.homeModules.graphics = { osConfig, pkgs, lib, ... }: { config = lib.mkIf (config.features.applications.gui.vscode.enable) {
config = lib.mkIf (osConfig.features.applications.gui.vscode.enable) {
home.packages = [ pkgs.vscode ]; home.packages = [ pkgs.vscode ];
home.activation = { home.activation = {
linkVsCodeConfigSettings = lib.hm.dag.entryAfter ["writeBoundary"] (osConfig.helpers.mkSymlinkActivationScript { linkVsCodeConfigSettings = lib.hm.dag.entryAfter ["writeBoundary"] (config.helpers.mkSymlinkActivationScript {
target = ".config/Code/User/settings.json"; target = ".config/Code/User/settings.json";
source = "dotfiles/global/vscode/settings.json"; source = "dotfiles/global/vscode/settings.json";
}); });
linkVsCodeConfigKeybindings = lib.hm.dag.entryAfter ["writeBoundary"] (osConfig.helpers.mkSymlinkActivationScript { linkVsCodeConfigKeybindings = lib.hm.dag.entryAfter ["writeBoundary"] (config.helpers.mkSymlinkActivationScript {
target = ".config/Code/User/keybindings.json"; target = ".config/Code/User/keybindings.json";
source = "dotfiles/global/vscode/keybindings.json"; source = "dotfiles/global/vscode/keybindings.json";
}); });
modules/features/shells/zsh.nix
+8 -3
View File
@@ -12,8 +12,13 @@
}; };
}; };
flake.homeModules.global = { pkgs, osConfig, lib, ... }: { flake.homeModules.global = { pkgs, osConfig, config, lib, ... }: {
config = lib.mkIf (osConfig.features.shells.zsh.enable) { options.features.shells.zsh = {
enable = lib.mkEnableOption "zsh";
antidote.enable = lib.mkEnableOption "antidote";
};
config = (if builtins.hasAttr "osConfig" self then (lib.mkIf (osConfig.features.shells.zsh.enable || config.features.shells.zsh.enable)) else (lib.mkIf (config.features.shells.zsh.enable))) {
home.shell.enableZshIntegration = true; home.shell.enableZshIntegration = true;
programs.kitty.shellIntegration.enableZshIntegration = true; programs.kitty.shellIntegration.enableZshIntegration = true;
@@ -21,7 +26,7 @@
programs.zsh = { programs.zsh = {
enable = true; enable = true;
completionInit = ""; completionInit = "";
antidote = lib.mkIf (osConfig.features.shells.zsh.antidote.enable) { antidote = (if builtins.hasAttr "osConfig" self then (lib.mkIf (osConfig.features.shells.zsh.antidote.enable || config.features.shells.zsh.antidote.enable)) else (lib.mkIf (config.features.shells.zsh.antidote.enable))) {
enable = true; enable = true;
plugins = [ plugins = [
"getantidote/use-omz" "getantidote/use-omz"
modules/global/helpers.nix
+6
View File
@@ -1,5 +1,11 @@
{ inputs, self, ... }: { { inputs, self, ... }: {
flake.nixosModules.global = { pkgs, config, lib, ... }: { flake.nixosModules.global = { pkgs, config, lib, ... }: {
options.helpers = {
# nothing here yet
};
};
flake.homeModules.global = { pkgs, config, lib, ... }: {
options.helpers = { options.helpers = {
mkSymlinkActivationScript = lib.mkOption { mkSymlinkActivationScript = lib.mkOption {
type = lib.types.functionTo lib.types.str; type = lib.types.functionTo lib.types.str;
modules/global/home.nix
+14 -3
View File
@@ -1,5 +1,5 @@
{ inputs, self, ... }: { { inputs, self, ... }: {
flake.homeModules.global = { osConfig, config, pkgs, ... }: { flake.homeModules.global = { config, pkgs, osConfig, ... }: {
nix.gc = { nix.gc = {
automatic = true; automatic = true;
persistent = true; persistent = true;
@@ -7,13 +7,24 @@
}; };
home = { home = {
stateVersion = osConfig.info.stateVersion; stateVersion = config.info.stateVersion;
packages = with pkgs; [ packages = with pkgs; [
speedtest-go speedtest-go
] ++ osConfig.features.applications.extraUserPackages; ] ++ config.features.applications.extraPackages
++ (if !(builtins.hasAttr "osConfig" self) then [
pkgs.home-manager
] else []);
shell.enableBashIntegration = true; shell.enableBashIntegration = true;
username = "grey";
homeDirectory = "/home/${config.home.username}";
};
xdg = {
enable = true;
localBinInPath = !(builtins.hasAttr "osConfig" self);
}; };
programs = { programs = {
modules/global/options.nix
+26 -7
View File
@@ -25,16 +25,35 @@
default = "grub"; default = "grub";
}; };
features.applications = { features.applications.extraPackages = lib.mkOption {
extraPackages = lib.mkOption { type = lib.types.listOf (lib.types.package);
type = lib.types.listOf (lib.types.package); default = [];
default = []; };
};
};
flake.homeModules.global = { pkgs, config, lib, ... }: {
options = {
info = {
rootPath = lib.mkOption {
type = lib.types.str;
default = "/home/grey/nixos";
}; };
extraUserPackages = lib.mkOption { hostName = lib.mkOption {
type = lib.types.listOf (lib.types.package); type = lib.types.str;
default = []; default = "";
}; };
stateVersion = lib.mkOption {
type = lib.types.str;
default = "";
};
};
features.applications.extraPackages = lib.mkOption {
type = lib.types.listOf (lib.types.package);
default = [];
}; };
}; };
}; };
modules/hosts/kitagawa/home/fastfetch.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ inputs, self, ... }: { { inputs, self, ... }: {
flake.homeModules.kitagawa = { pkgs, lib, osConfig, ... }: { flake.homeModules.kitagawa = { pkgs, lib, config, ... }: {
config = lib.mkIf (osConfig.features.applications.cli.fastfetch.enable) ({ config = lib.mkIf (config.features.applications.cli.fastfetch.enable) ({
programs.fastfetch = { programs.fastfetch = {
settings = { settings = {
logo = { logo = {
modules/hosts/kitagawa/kitagawa.nix
+33 -22
View File
@@ -32,39 +32,18 @@
}; };
applications = { applications = {
cli = {
fastfetch.enable = true;
};
gui = { gui = {
spotify = { spotify = {
enable = true; enable = true;
spicetify.enable = true; spicetify.enable = true;
}; };
kitty.enable = true;
vscode.enable = true; vscode.enable = true;
floorp.enable = true;
equibop.enable = true;
remmina.enable = true;
}; };
extraPackages = with pkgs; [ extraPackages = with pkgs; [
github-desktop github-desktop
moonlight-qt moonlight-qt
]; ];
extraUserPackages = with pkgs; [
obsidian
thunderbird
jetbrains.clion
jetbrains.idea
proton-vpn
ente-auth
signal-desktop
xarchiver
kdePackages.filelight
loupe
];
}; };
}; };
@@ -109,6 +88,39 @@
graphics graphics
]; ];
info = {
hostName = "kitagawa";
stateVersion = "26.05";
};
features = {
applications = {
cli = {
fastfetch.enable = true;
};
gui = {
equibop.enable = true;
floorp.enable = true;
kitty.enable = true;
remmina.enable = true;
};
extraPackages = with pkgs; [
obsidian
thunderbird
jetbrains.clion
jetbrains.idea
proton-vpn
ente-auth
signal-desktop
xarchiver
kdePackages.filelight
loupe
];
};
};
/* /*
imports = [ imports = [
#"${global-configs}/gnome.nix" #"${global-configs}/gnome.nix"
@@ -129,7 +141,6 @@
}; };
xdg = { xdg = {
enable = true;
mimeApps.defaultApplications = { mimeApps.defaultApplications = {
"x-scheme-handler/x-github-client" = [ "github-desktop.desktop" ]; "x-scheme-handler/x-github-client" = [ "github-desktop.desktop" ];
"x-scheme-handler/x-github-desktop-dev-auth" = [ "github-desktop.desktop" ]; "x-scheme-handler/x-github-desktop-dev-auth" = [ "github-desktop.desktop" ];
modules/hosts/takamaki/home/zsh.nix
+7
View File
@@ -0,0 +1,7 @@
{ inputs, self, ... }: {
flake.homeModules.takamaki = { config, pkgs, ... }: {
programs.zsh.shellAliases = {
apply-config = "zsh -c 'cd /home/grey/flake; git add .; home-manager switch --flake .#takamaki -b bak'";
};
};
}
modules/hosts/takamaki/takamaki.nix
+72
View File
@@ -0,0 +1,72 @@
{ inputs, self, ... }: {
flake.homeConfigurations.takamaki = inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
modules = with self.homeModules; [
global
graphics
takamaki
];
};
flake.homeModules.takamaki = { pkgs, config, lib, ... }: {
info = {
rootPath = "/home/grey/flake";
hostName = "takamaki";
stateVersion = "26.11";
};
features = {
shells.zsh = {
enable = true;
antidote.enable = true;
};
applications = {
cli = {
fastfetch.enable = true;
};
extraPackages = with pkgs; [
(writeShellScriptBin "switch-os" ''
sudo efibootmgr --bootnext 0000
sudo reboot
'')
(writeShellScriptBin "universal-reboot" ''
sudo reboot
'')
(writeShellScriptBin "universal-shutdown" ''
sudo systemctl poweroff
'')
(writeShellScriptBin "increase-brightness" ''
LOOP_COUNTER=0
DEVICE=$1
PRETTY_NAME=$(sudo ddccontrol dev:$DEVICE 2>&1 >/dev/null | grep -oP "/usr/share/ddccontrol-db/monitor/\K.+\.xml" | sed 's/.xml//')
while
RESULT=$(sudo ddccontrol -r 0x10 -W +5 dev:$DEVICE 2> /dev/null)
WRITTEN=$(echo $RESULT | grep -oP "Writing.+\(\K\d{1,3}\)" | sed 's/)//')
CONTROL=$(echo $RESULT | grep -oP "Control.+\+/\K\d{1,3}/100" | sed 's/\/100//')
LOOP_COUNTER=$(($LOOP_COUNTER + 1))
[[ "$WRITTEN" != "$CONTROL" ]] && [ $LOOP_COUNTER -lt 10 ]
do true; done
noctalia msg notification-show "Set brightness to $WRITTEN for display $PRETTY_NAME"
'')
(writeShellScriptBin "decrease-brightness" ''
LOOP_COUNTER=0
DEVICE=$1
PRETTY_NAME=$(sudo ddccontrol dev:$DEVICE 2>&1 >/dev/null | grep -oP "/usr/share/ddccontrol-db/monitor/\K.+\.xml" | sed 's/.xml//')
while
RESULT=$(sudo ddccontrol -r 0x10 -W -5 dev:$DEVICE 2> /dev/null)
WRITTEN=$(echo $RESULT | grep -oP "Writing.+\(\K\d{1,3}\)" | sed 's/)//')
CONTROL=$(echo $RESULT | grep -oP "Control.+\+/\K\d{1,3}/100" | sed 's/\/100//')
LOOP_COUNTER=$(($LOOP_COUNTER + 1))
[[ "$WRITTEN" != "$CONTROL" ]] && [ $LOOP_COUNTER -lt 10 ]
do true; done
noctalia msg notification-show "Set brightness to $WRITTEN for display $PRETTY_NAME"
'')
];
};
};
};
}