diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..92b2793 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.direnv diff --git a/configuration.nix b/configuration.nix index 74c4683..683b1b3 100644 --- a/configuration.nix +++ b/configuration.nix @@ -52,7 +52,7 @@ services.mullvad-vpn.package = pkgs.mullvad-vpn; # Set your time zone. - time.timeZone = "Europe/Berlin"; + time.timeZone = "America/Los_Angeles"; # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; @@ -260,6 +260,7 @@ vim docker docker-compose + nh ]; environment.variables.EDITOR = "helix"; @@ -294,23 +295,6 @@ name = "docker"; }; - # Enable SearXNG metasearch engine - services.searx = { - enable = true; - redisCreateLocally = true; - environmentFile = "/etc/searxng/searxng.env"; - # Use custom settings.yml file from nix-config - settingsFile = ./config/settings.yml; - # Override specific settings via NixOS options (these take precedence) - settings = { - server = { - bind_address = "127.0.0.1"; - port = 8888; - # secret_key is set via environmentFile to avoid exposing it in nix store - }; - }; - }; - # https://wiki.nixos.org/wiki/Appimage#Register_AppImage_files_as_a_binary_type_to_binfmt_misc programs.appimage = { enable = true; @@ -339,20 +323,11 @@ # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "25.05"; # Did you read the comment? - # Create SearXNG environment file with secret key - system.activationScripts.searxng-env.text = '' - mkdir -p /etc/searxng - if [ ! -f /etc/searxng/searxng.env ]; then - echo 'SEARXNG_SECRET=78db11dc49971aa8e3c378cd9d05398f9e42c2f4ca5c2cc206183bf0ace4f237' > /etc/searxng/searxng.env - chmod 600 /etc/searxng/searxng.env - fi - ''; - # Set user profile picture for GNOME system.activationScripts.script.text = '' mkdir -p /var/lib/AccountsService/{icons,users} - if [ -f /home/jet/Documents/nixos-config/cat.png ]; then - cp /home/jet/Documents/nixos-config/cat.png /var/lib/AccountsService/icons/jet + if [ -f /home/jet/Documents/nix-config/cat.png ]; then + cp /home/jet/Documents/nix-config/cat.png /var/lib/AccountsService/icons/jet echo -e "[User]\nIcon=/var/lib/AccountsService/icons/jet\n" > /var/lib/AccountsService/users/jet chown root:root /var/lib/AccountsService/users/jet chmod 0600 /var/lib/AccountsService/users/jet diff --git a/home.nix b/home.nix index fa7c64c..3ce65d6 100644 --- a/home.nix +++ b/home.nix @@ -1,7 +1,7 @@ { config, pkgs, inputs, lib, ... }: { - imports = [ inputs.zen-browser.homeModules.twilight-official ]; + imports = [ inputs.zen-browser.homeModules.default ]; home.username = "jet"; home.stateVersion = "23.05"; @@ -19,9 +19,9 @@ }; "org/gnome/desktop/background" = { picture-uri = - "file:///home/jet/Documents/nixos-config/cat.png"; + "file:///home/jet/Documents/nix-config/cat.png"; picture-uri-dark = - "file:///home/jet/Documents/nixos-config/cat.png"; + "file:///home/jet/Documents/nix-config/cat.png"; picture-options = "wallpaper"; }; "org/gnome/settings-daemon/plugins/power" = { @@ -41,6 +41,9 @@ enabled-extensions = [ "hidetopbar@mathieu.bidon.ca" "wifiqrcode@glerro.pm.me" + "system-monitor@paradoxxx.zero.gmail.com" + "clipboard-indicator@tudmotu.com" + "emoji-copy@felipeftn" ]; }; }; @@ -57,7 +60,6 @@ nerd-fonts.commit-mono qbittorrent-enhanced gimp3 - obs-studio inkscape bat zoxide @@ -67,25 +69,24 @@ direnv gnomeExtensions.hide-top-bar gnomeExtensions.wifi-qrcode + gnomeExtensions.system-monitor-next + gnomeExtensions.clipboard-indicator + gnomeExtensions.emoji-copy signal-desktop tree - figma-agent - figma-linux google-chrome - tor-browser mullvad-vpn font-manager - handbrake steam appimage-run gh beeper antigravity-fhs - prusa-slicer - printrun mkp224o - libreoffice-qt-fresh claude-code + logseq + element-desktop + zulip ]; @@ -188,7 +189,7 @@ jn = "jj new"; jdiff = "jj diff"; jsq = "jj squash"; - ns = "sudo nixos-rebuild switch --flake ~/Documents/nix-config#jet"; + nhs = "nh os switch ."; nd = "nix develop"; h = "hx"; vanity = "mkp224o-amd64-64-24k -d noisebridgevanitytor noisebridge{2..7}"; @@ -218,6 +219,7 @@ programs.jujutsu = { enable = true; settings = { + remotes.origin.auto-track-bookmarks = "glob:*"; user = { email = "jetthomaspham@gmail.com"; name = "Jet Pham"; @@ -231,7 +233,6 @@ git = { sign-on-push = true; - push-new-bookmarks = true; }; ui = { default-command = "log"; @@ -249,20 +250,6 @@ "zen.theme.border-radius" = 0; "zen.theme.content-element-separation" = 0; }; - # Add SearXNG as default search engine - SearchEngines = { - Default = "SearXNG"; - Add = [ - { - Name = "SearXNG"; - URLTemplate = "http://127.0.0.1:8888/search?q={searchTerms}"; - Method = "GET"; - IconURL = "http://127.0.0.1:8888/static/themes/simple/img/searxng.png"; - Alias = "sx"; - Description = "SearXNG - Privacy-respecting metasearch engine"; - } - ]; - }; }; }; @@ -282,7 +269,7 @@ enable = true; entries = [ "${pkgs.kitty}/share/applications/kitty.desktop" - "${config.programs.zen-browser.package}/share/applications/zen-twilight.desktop" + "${config.programs.zen-browser.package}/share/applications/zen.desktop" "${pkgs.beeper}/share/applications/beepertexts.desktop" ];