diff --git a/flake.lock b/flake.lock index 36fba9b..4fe6990 100644 --- a/flake.lock +++ b/flake.lock @@ -31,11 +31,11 @@ ] }, "locked": { - "lastModified": 1739380580, - "narHash": "sha256-wGtGEfdooudj74wn59Vu5Z2DLsrX9cxdGTFc9sJrP9M=", + "lastModified": 1739787548, + "narHash": "sha256-Gt4yc0nM4l63NIBgSznxriZQtrE1Xk6NlZauGiMmJ/4=", "owner": "aylur", "repo": "astal", - "rev": "956b74fd9ff8c607b6683b404860c4e6b30ffe2b", + "rev": "cbfe69a9c22f3b0e59c6e09fffbe0b7af4f543d1", "type": "github" }, "original": { @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1739634831, - "narHash": "sha256-xFnU+uUl48Icas2wPQ+ZzlL2O3n8f6J2LrzNK9f2nng=", + "lastModified": 1739841949, + "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", "owner": "nix-community", "repo": "disko", - "rev": "fa5746ecea1772cf59b3f34c5816ab3531478142", + "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", "type": "github" }, "original": { @@ -115,11 +115,11 @@ ] }, "locked": { - "lastModified": 1739271045, - "narHash": "sha256-02+HKJ3izgR4jPOEQE9NnOGEEzXJCCeC30JKNFS5mhU=", + "lastModified": 1739845242, + "narHash": "sha256-rNMXpDubNWGLTs45MuoH9YHtXfXye/fn2u4YMSTPt9I=", "owner": "karaolidis", "repo": "home-manager", - "rev": "6b4318aba9df23942593931dae1da39d5e963b85", + "rev": "5cfbf5cc37a3bd1da07ae84eea1b828909c4456b", "type": "github" }, "original": { @@ -131,11 +131,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739278786, - "narHash": "sha256-QpthHTHPRUrPx94Ztxgmv82BhvMPzNbDQBuhH7G3XPM=", + "lastModified": 1739870578, + "narHash": "sha256-qyqT2uWe3RgUivggVZavLRVybJzCUzYpYFiwnVl1xlo=", "owner": "karaolidis", "repo": "nixpkgs", - "rev": "c8ebcc73bb583ea45ec0f0f116aba587b471020e", + "rev": "e218d9413c9e4d6ebbd0a887daaadb34c4309311", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1739724221, - "narHash": "sha256-hu0SN4bqS1NDT70qUzDmBxpdQFeKYH1VH3ZKPABmJhc=", + "lastModified": 1739868628, + "narHash": "sha256-+EZ2ISNFFnTQvY11irgaIidxcXDrQdBoyr/AyxU3yi0=", "owner": "nix-community", "repo": "NUR", - "rev": "9b067eebe1e32f625fb43e218155ca60072a3a20", + "rev": "dfbf53ec75e21fa05e1635ebee68eab14af3abe2", "type": "github" }, "original": { @@ -238,11 +238,11 @@ ] }, "locked": { - "lastModified": 1739278675, - "narHash": "sha256-7sqrkaNAf3pNNk97ivLUqqsHRUJjsTRh4gBF+6UHdz0=", + "lastModified": 1739870849, + "narHash": "sha256-FonprUB9oHn4BPBWpLPU18yu0QH0tRaworCiB3T1qF4=", "owner": "karaolidis", "repo": "spicetify-nix", - "rev": "cc6aa601c01c3402624abcb61bce290ee5078faf", + "rev": "984d59248f4100327953048ea2710633cd87332c", "type": "github" }, "original": { @@ -275,11 +275,11 @@ ] }, "locked": { - "lastModified": 1738953846, - "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", "type": "github" }, "original": { diff --git a/hosts/common/configs/user/console/nixpkgs/default.nix b/hosts/common/configs/user/console/nixpkgs/default.nix index db10234..1666a52 100644 --- a/hosts/common/configs/user/console/nixpkgs/default.nix +++ b/hosts/common/configs/user/console/nixpkgs/default.nix @@ -2,9 +2,14 @@ user ? throw "user argument is required", home ? throw "home argument is required", }: -{ inputs, ... }: +{ + config, + lib, + inputs, + ... +}: { home-manager.users.${user} = { - imports = [ inputs.nur.modules.homeManager.default ]; + imports = lib.lists.optional (!config.home-manager.useGlobalPkgs) inputs.nur.modules.homeManager.default; }; } diff --git a/hosts/common/configs/user/gui/firefox/default.nix b/hosts/common/configs/user/gui/firefox/default.nix index 32751a6..aab1bcb 100644 --- a/hosts/common/configs/user/gui/firefox/default.nix +++ b/hosts/common/configs/user/gui/firefox/default.nix @@ -39,7 +39,7 @@ profiles.default = { settings."extensions.autoDisableScopes" = 0; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ languagetool bitwarden darkreader diff --git a/hosts/common/configs/user/gui/obsidian/default.nix b/hosts/common/configs/user/gui/obsidian/default.nix index 4929b56..6f1b27b 100644 --- a/hosts/common/configs/user/gui/obsidian/default.nix +++ b/hosts/common/configs/user/gui/obsidian/default.nix @@ -20,7 +20,7 @@ in programs.obsidian = { enable = true; - sharedSettings = { + defaultSettings = { app = { defaultViewMode = "preview"; livePreview = false; diff --git a/hosts/common/configs/user/gui/obsidian/options.nix b/hosts/common/configs/user/gui/obsidian/options.nix index 848ea1b..89a9ec3 100644 --- a/hosts/common/configs/user/gui/obsidian/options.nix +++ b/hosts/common/configs/user/gui/obsidian/options.nix @@ -46,7 +46,7 @@ in enable = mkEnableOption "obsidian"; package = mkPackageOption pkgs "obsidian" { }; - sharedSettings = { + defaultSettings = { app = mkOption { description = "Settings to write to app.json."; type = raw; @@ -138,13 +138,13 @@ in app = mkOption { description = "Settings to write to app.json."; type = attrsOf anything; - default = cfg.sharedSettings.app; + default = cfg.defaultSettings.app; }; appearance = mkOption { description = "Settings to write to appearance.json."; type = attrsOf anything; - default = cfg.sharedSettings.appearance; + default = cfg.defaultSettings.appearance; }; corePlugins = @@ -175,7 +175,7 @@ in mkOption { description = "Core plugins to activate."; type = listOf (coercedTo (enum corePlugins) (p: { name = p; }) (submodule corePluginsOptions)); - default = cfg.sharedSettings.corePlugins; + default = cfg.defaultSettings.corePlugins; }; communityPlugins = @@ -206,7 +206,7 @@ in mkOption { description = "Community plugins to install and activate."; type = listOf (coercedTo package (p: { pkg = p; }) (submodule communityPluginsOptions)); - default = cfg.sharedSettings.communityPlugins; + default = cfg.defaultSettings.communityPlugins; }; cssSnippets = @@ -250,12 +250,11 @@ in type = listOf ( coercedTo (addCheck path checkCssPath) (p: { source = p; }) (submodule cssSnippetsOptions) ); - default = cfg.sharedSettings.cssSnippets; + default = cfg.defaultSettings.cssSnippets; }; themes = let - themesOptions = { config, ... }: { @@ -276,7 +275,7 @@ in mkOption { description = "Themes to install."; type = listOf (coercedTo package (p: { pkg = p; }) (submodule themesOptions)); - default = cfg.sharedSettings.themes; + default = cfg.defaultSettings.themes; }; hotkeys = @@ -301,7 +300,7 @@ in mkOption { description = "Hotkeys to configure."; type = attrsOf (listOf (submodule hotkeysOptions)); - default = cfg.sharedSettings.hotkeys; + default = cfg.defaultSettings.hotkeys; }; extraFiles = @@ -335,7 +334,7 @@ in mkOption { description = "Extra files to link to the vault directory."; type = attrsOf (submodule extraFilesOptions); - default = cfg.sharedSettings.extraFiles; + default = cfg.defaultSettings.extraFiles; }; }; }; diff --git a/submodules/home-manager b/submodules/home-manager index 6b4318a..5cfbf5c 160000 --- a/submodules/home-manager +++ b/submodules/home-manager @@ -1 +1 @@ -Subproject commit 6b4318aba9df23942593931dae1da39d5e963b85 +Subproject commit 5cfbf5cc37a3bd1da07ae84eea1b828909c4456b diff --git a/submodules/nixpkgs b/submodules/nixpkgs index c8ebcc7..e218d94 160000 --- a/submodules/nixpkgs +++ b/submodules/nixpkgs @@ -1 +1 @@ -Subproject commit c8ebcc73bb583ea45ec0f0f116aba587b471020e +Subproject commit e218d9413c9e4d6ebbd0a887daaadb34c4309311 diff --git a/submodules/spicetify-nix b/submodules/spicetify-nix index cc6aa60..984d592 160000 --- a/submodules/spicetify-nix +++ b/submodules/spicetify-nix @@ -1 +1 @@ -Subproject commit cc6aa601c01c3402624abcb61bce290ee5078faf +Subproject commit 984d59248f4100327953048ea2710633cd87332c