From 9c99fae0b89d131997c9f713ff364040221b7c99 Mon Sep 17 00:00:00 2001 From: ozpv <39195175+ozpv@users.noreply.github.com> Date: Wed, 20 May 2026 15:26:33 -0500 Subject: updates --- apps/firefox.nix | 45 ++++++++++++++++++++----------------- apps/nixvim.nix | 66 ++++++++++++++++++++++++++---------------------------- apps/powermenu.nix | 4 ++-- apps/spicetify.nix | 20 ----------------- 4 files changed, 59 insertions(+), 76 deletions(-) delete mode 100644 apps/spicetify.nix (limited to 'apps') diff --git a/apps/firefox.nix b/apps/firefox.nix index c1d86a4..07f3ea2 100644 --- a/apps/firefox.nix +++ b/apps/firefox.nix @@ -1,35 +1,35 @@ { pkgs, ... }: { programs.firefox = { enable = true; - + profiles.ozpv = { - userChrome = '' + userChrome = '' :root[tabsintitlebar][sizemode="normal"]{ --uc-window-drag-space-width: 24px; } :root[uidensity="compact"]{ --tab-block-margin: 2px !important; } - + #navigator-toolbox{ --uc-navigationbar-width: 40vw; --uc-toolbar-height: 40px; --uc-urlbar-min-width: 50vw; } - + #scrollbutton-up, #scrollbutton-down{ border-block-width: 2px !important; } - + :root[uidensity="compact"] #navigator-toolbox{ --uc-toolbar-height: 34px; } :root[uidensity="touch"] #navigator-toolbox{ --uc-toolbar-height: 44px; } - + @media screen and (max-width: 1500px){ #urlbar-container{ min-width: 300px !important; flex-shrink: 1 !important; } } - + #TabsToolbar{ margin-left: var(--uc-navigationbar-width); --tabs-navbar-shadow-size: 0px; @@ -37,16 +37,16 @@ #tabbrowser-tabs{ --tab-min-height: calc(var(--uc-toolbar-height) - 2 * var(--tab-block-margin,0px)) !important; } - + .titlebar-spacer[type="pre-tabs"]{ display: none } - + #navigator-toolbox > #nav-bar{ margin-right:calc(100vw - var(--uc-navigationbar-width)); margin-top: calc(0px - var(--uc-toolbar-height)); } - + :root[tabsintitlebar="true"] #nav-bar{ padding-left: var(--uc-window-drag-space-width) !important } - + @media (-moz-gtk-csd-reversed-placement), (-moz-platform: macos){ .titlebar-buttonbox-container{ @@ -62,13 +62,13 @@ @media (-moz-platform: macos){ :root[tabsintitlebar="true"] #nav-bar{ padding-inline: calc(var(--uc-window-drag-space-width,0px) + 72px) 0px !important; } } - + .tab-close-button{ margin-top: 0 !important } - + #urlbar[open]:focus-within{ min-width: var(--uc-urlbar-min-width,none) !important; } - + #urlbar-container:not(:hover) .urlbar-history-dropmarker{ margin-inline-start: -28px; } - + #customization-panelWrapper > .panel-arrowbox > .panel-arrow{ margin-inline-end: initial !important; } ''; @@ -107,7 +107,8 @@ "browser.newtabpage.activity-stream.telemetry" = false; "browser.newtabpage.activity-stream.feeds.snippets" = false; "browser.newtabpage.activity-stream.feeds.section.topstories" = false; - "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = + false; "browser.newtabpage.activity-stream.showSponsored" = false; "browser.newtabpage.activity-stream.feeds.discoverystreamfeed" = false; "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; @@ -181,7 +182,8 @@ "extensions.webservice.discoverURL" = ""; "extensions.webextensions.restrictedDomains" = ""; "extensions.postDownloadThirdPartyPrompt" = false; - "geo.provider.network.url" = "https://location.services.mozilla.com/v1/geolocat"; + "geo.provider.network.url" = + "https://location.services.mozilla.com/v1/geolocat"; "geo.provider.ms-windows-location" = false; "geo.provider.use_gpsd" = false; "geo.provider.use_geoclue" = false; @@ -230,8 +232,10 @@ "privacy.donottrackheader.value" = 1; "privacy.firstparty.isolate" = true; "privacy.partition.serviceWorkers" = true; - "privacy.partition.always_partition_third_party_non_cookie_storage" = true; - "privacy.partition.always_partition_third_party_non_cookie_storage.exempt_sessionstorage" = true; + "privacy.partition.always_partition_third_party_non_cookie_storage" = + true; + "privacy.partition.always_partition_third_party_non_cookie_storage.exempt_sessionstorage" = + true; "privacy.query_stripping" = true; "privacy.resistFingerprinting" = true; "privacy.trackingprotection.cryptomining.enabled" = true; @@ -244,7 +248,8 @@ "privacy.window.maxInnerHeight" = 900; "privacy.resistFingerprinting.block_mozAddonManager" = true; "security.ssl.disable_session_identifiers" = true; - "services.sync.prefs.sync.browser.newtabpage.activity-stream.showSponsoredTopSite" = false; + "services.sync.prefs.sync.browser.newtabpage.activity-stream.showSponsoredTopSite" = + false; "signon.autofillForms" = false; "toolkit.telemetry.archive.enabled" = false; "toolkit.telemetry.bhrPing.enabled" = false; diff --git a/apps/nixvim.nix b/apps/nixvim.nix index 87a0dbe..9be4721 100644 --- a/apps/nixvim.nix +++ b/apps/nixvim.nix @@ -7,15 +7,16 @@ enable = true; # fix rust_analyzer error - extraConfigLua = "for _, method in ipairs({ 'textDocument/diagnostic', 'workspace/diagnostic' }) do - local default_diagnostic_handler = vim.lsp.handlers[method] - vim.lsp.handlers[method] = function(err, result, context, config) - if err ~= nil and err.code == -32802 then - return - end - return default_diagnostic_handler(err, result, context, config) - end -end"; + extraConfigLua = '' + for _, method in ipairs({ 'textDocument/diagnostic', 'workspace/diagnostic' }) do + local default_diagnostic_handler = vim.lsp.handlers[method] + vim.lsp.handlers[method] = function(err, result, context, config) + if err ~= nil and err.code == -32802 then + return + end + return default_diagnostic_handler(err, result, context, config) + end + end''; keymaps = [ { @@ -71,16 +72,13 @@ end"; lua_ls.enable = true; bashls.enable = true; html.enable = true; - pyright.enable = true; jsonls.enable = true; - java_language_server.enable = true; cmake.enable = true; sqls.enable = true; nixd.enable = true; tailwindcss.enable = true; - # svelte.enable = true; rust_analyzer = { - enable = true; + enable = false; installRustc = true; installCargo = true; }; @@ -89,36 +87,37 @@ end"; lspkind.enable = true; - luasnip.enable = true; - cmp = { enable = true; autoEnableSources = true; - + settings = { - snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end"; - + snippet.expand = + "function(args) require('luasnip').lsp_expand(args.body) end"; + mapping = { "" = "cmp.mapping.confirm({ select = true })"; - "" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})"; + "" = + "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})"; }; - + sources = [ - {name = "path";} - {name = "nvim_lsp";} - {name = "luasnip";} - {name = "crates";} - {name = "buffer";} + { name = "path"; } + { name = "nvim_lsp"; } + { + name = "luasnip"; + } + # the worst thing in existence + # {name = "crates";} + { name = "buffer"; } ]; }; }; - + rustaceanvim = { - enable = false; - - settings = { - tools.enable_clippy = true; - }; + enable = true; + + settings = { tools.enable_clippy = true; }; }; web-devicons.enable = true; @@ -126,15 +125,14 @@ end"; lualine.enable = true; }; - colorschemes.catppuccin = { + colorschemes.gruvbox = { enable = true; settings = { - flavour = "latte"; integrations = { cmp = true; treesitter = true; }; - term_colors = true; + terminal_colors = true; }; }; diff --git a/apps/powermenu.nix b/apps/powermenu.nix index 97fc97d..07de48d 100644 --- a/apps/powermenu.nix +++ b/apps/powermenu.nix @@ -1,9 +1,9 @@ -{ pkgs ? import {}, stdenv ? pkgs.stdenv }: +{ pkgs ? import { }, stdenv ? pkgs.stdenv }: stdenv.mkDerivation rec { pname = "powermenu"; version = "1.0"; - + src = fetchGit { url = "https://github.com/ozpv/powermenu.git"; rev = "e5a826b6db2941c992912e940b7da37ae276b144"; diff --git a/apps/spicetify.nix b/apps/spicetify.nix deleted file mode 100644 index 4177b47..0000000 --- a/apps/spicetify.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs, lib, inputs, ... }: - -{ - imports = [ inputs.spicetify-nix.homeManagerModules.default ]; - - programs.spicetify = - let - spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; - in - { - enable = true; - enabledExtensions = with spicePkgs.extensions; [ - adblock - hidePodcasts - # shuffle # shuffle+ (special characters are sanitized out of extension names) - ]; - theme = spicePkgs.themes.starryNight; - # colorScheme = ""; - }; -} -- cgit v1.2.3