diff --git a/flake.lock b/flake.lock index 5012afd..0571ddf 100755 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,22 @@ "type": "github" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1688139015, + "narHash": "sha256-d7Sxp4MHQNCKPA4jSwcs+N9CS+QNBYDnHIlXex4KkMs=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "c2466b9363d040b32d29e6cd87d9021cdab0f768", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -134,6 +150,7 @@ }, "root": { "inputs": { + "firefox-gnome-theme": "firefox-gnome-theme", "home-manager": "home-manager", "nixpkgs": "nixpkgs", "programsdb": "programsdb", diff --git a/flake.nix b/flake.nix index 6c42f7c..83c0053 100755 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,11 @@ { inputs = { - nixpkgs.url = "github:NixOs/nixpkgs/nixos-unstable"; stylix.url = "github:danth/stylix"; + nixpkgs.url = "github:NixOs/nixpkgs/nixos-unstable"; + firefox-gnome-theme = { + url = "github:rafaelmardojai/firefox-gnome-theme"; + flake = false; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home-manager/_firefox.nix b/home-manager/_firefox.nix new file mode 100644 index 0000000..9495458 --- /dev/null +++ b/home-manager/_firefox.nix @@ -0,0 +1,29 @@ +{inputs, ...}: { + home.file.".mozilla/firefox/quadradical/chrome/firefox-gnome-theme".source = inputs.firefox-gnome-theme; + + programs.firefox = { + enable = true; + profiles.quadradical = { + userChrome = '' + @import "firefox-gnome-theme/userChrome.css"; + ''; + userContent = '' + @import "firefox-gnome-theme/userContent.css"; + ''; + + search.engines = { + "Rabbit Search" = { + urls = [{template = "https://rabbitsearch.org/search?q={searchTerms}";}]; + iconUpdateURL = "https://rabbit-company.com/images/logo.png"; + updateInterval = 7 * 24 * 60 * 60 * 1000; # One week + }; + }; + settings = { + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + "browser.uidensity" = 0; + "svg.context-properties.content.enabled" = true; + "browser.theme.dark-private-windows" = false; + }; + }; + }; +} diff --git a/home-manager/gtk.nix b/home-manager/gtk.nix index 2951d6e..191c192 100644 --- a/home-manager/gtk.nix +++ b/home-manager/gtk.nix @@ -8,8 +8,8 @@ }; # cursorTheme = { - # name = "GoogleDot-Blue"; - # package = pkgs.nordzy-cursor-theme; + # name = "Bibata-Modern-Classic"; + # package = pkgs.bibata-cursors; # }; }; } diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix index 52b1ed8..432a504 100755 --- a/home-manager/vscode.nix +++ b/home-manager/vscode.nix @@ -2,17 +2,18 @@ programs.vscode = { enable = true; package = pkgs.vscodium; - extensions = [ - pkgs.vscode-extensions.eamodio.gitlens - pkgs.vscode-extensions.usernamehw.errorlens - pkgs.vscode-extensions.timonwong.shellcheck - pkgs.vscode-extensions.ritwickdey.liveserver - pkgs.vscode-extensions.dbaeumer.vscode-eslint - pkgs.vscode-extensions.esbenp.prettier-vscode - pkgs.vscode-extensions.oderwat.indent-rainbow - pkgs.vscode-extensions.astro-build.astro-vscode - pkgs.vscode-extensions.streetsidesoftware.code-spell-checker - pkgs.vscode-extensions.arcticicestudio.nord-visual-studio-code + extensions = with pkgs.vscode-extensions; [ + eamodio.gitlens + usernamehw.errorlens + timonwong.shellcheck + ritwickdey.liveserver + dbaeumer.vscode-eslint + esbenp.prettier-vscode + oderwat.indent-rainbow + astro-build.astro-vscode + vscode-icons-team.vscode-icons + streetsidesoftware.code-spell-checker + arcticicestudio.nord-visual-studio-code ]; keybindings = [ { diff --git a/quadraticpc/configuration.nix b/quadraticpc/configuration.nix index e3c3f12..56ccc61 100755 --- a/quadraticpc/configuration.nix +++ b/quadraticpc/configuration.nix @@ -37,6 +37,11 @@ }; services = { + earlyoom = { + enable = true; + enableNotifications = true; + }; + xserver = { enable = true; displayManager.gdm.enable = true; @@ -63,6 +68,7 @@ }; sessionVariables = { + MANGOHUD = "1"; XDG_DATA_HOME = "$HOME/.local/share"; EDITOR = "micro"; VISUAL = "micro"; @@ -70,22 +76,34 @@ fish_greeting = ""; }; - systemPackages = with pkgs; [ - heroic - killall - armcord - hyfetch - libreoffice - gnomeExtensions.caffeine - gnomeExtensions.pop-shell - gnomeExtensions.appindicator - gnomeExtensions.search-light - gnomeExtensions.aylurs-widgets - gnomeExtensions.just-perfection - gnomeExtensions.burn-my-windows - gnomeExtensions.fullscreen-avoider - gnomeExtensions.compiz-windows-effect - ]; + systemPackages = with pkgs; ([ + tldr + tuba + kooha + heroic + nodejs + killall + armcord + hyfetch + inkscape + r2modman + libreoffice + nodePackages.pnpm + hunspellDicts.en_CA-large + wineWowPackages.stagingFull + ] + ++ (with gnomeExtensions; [ + caffeine + pop-shell + app-hider + appindicator + search-light + aylurs-widgets + just-perfection + burn-my-windows + fullscreen-avoider + compiz-windows-effect + ])); }; programs = { @@ -101,7 +119,20 @@ fish.interactiveShellInit = "neowofetch"; }; + zramSwap = { + enable = true; + memoryPercent = 100; + }; + + system = { + autoUpgrade = { + enable = true; + flake = "/home/quadradical/.config/nixos/flake.nix"; + operation = "boot"; + }; + stateVersion = "23.05"; + }; + sound.enable = true; - system.stateVersion = "23.05"; hardware.pulseaudio.enable = false; } diff --git a/quadraticpc/home-manager.nix b/quadraticpc/home-manager.nix index 94a0c1c..ba81212 100755 --- a/quadraticpc/home-manager.nix +++ b/quadraticpc/home-manager.nix @@ -1,6 +1,7 @@ -{ +{inputs, ...}: { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = {inherit inputs;}; home-manager.users.quadradical = { home = { username = "quadradical";