diff options
| -rw-r--r-- | flake.lock | 42 | ||||
| -rw-r--r-- | home.nix | 58 | ||||
| -rwxr-xr-x | system-build.sh | 16 |
3 files changed, 76 insertions, 40 deletions
@@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1715563999, - "narHash": "sha256-DDXZOKK0C5YeZ/GTUj7HiT+oqYIt8+qTsldaDvhWHFc=", + "lastModified": 1717032306, + "narHash": "sha256-s3Sis+M1qTSVIehHrEKBzHBpqprIFJli5V6WojkJnYE=", "owner": "nix-community", "repo": "disko", - "rev": "e972a78f4a49cd92075d64b6feeef64d26bf2996", + "rev": "8ea5bcccc03111bdedaeaae9380dfab61e9deb33", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1715381426, - "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", + "lastModified": 1716729592, + "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", "owner": "nix-community", "repo": "home-manager", - "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", + "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", "type": "github" }, "original": { @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1716769173, + "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1715458492, - "narHash": "sha256-q0OFeZqKQaik2U8wwGDsELEkgoZMK7gvfF6tTXkpsqE=", + "lastModified": 1716655032, + "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8e47858badee5594292921c2668c11004c3b0142", + "rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715413075, - "narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=", + "lastModified": 1716651315, + "narHash": "sha256-iMgzIeedMqf30TXZ439zW3Yvng1Xm9QTGO+ZwG1IWSw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d", + "rev": "c5187508b11177ef4278edf19616f44f21cc8c69", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nur": { "locked": { - "lastModified": 1715640329, - "narHash": "sha256-63UqbFOGu3TuYs2cfFElcmAYIQXZG5mfUNwZ2mRK0xs=", + "lastModified": 1717033543, + "narHash": "sha256-NPi7ALqH4zqQhO3SGfch6n4BgnA+uom/RhWjKvpqt50=", "owner": "nix-community", "repo": "NUR", - "rev": "12c94e6547b7432466087c3698795dcea329dfdb", + "rev": "c02be2dfaed084a9a0d1cae4d313e681f003971f", "type": "github" }, "original": { @@ -136,11 +136,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1715482972, - "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=", + "lastModified": 1716692524, + "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e", + "rev": "962797a8d7f15ed7033031731d0bb77244839960", "type": "github" }, "original": { @@ -12,7 +12,6 @@ cowsay ffmpeg grim - acpilight light gnupg (pass.withExtensions (ext: with ext; [ pass-audit pass-otp pass-import pass-genphrase pass-update pass-tomb])) @@ -37,33 +36,32 @@ pavucontrol swww fswebcam - nmap mpc-cli python3 ghostscript - hyprpaper pipes cmatrix inkscape nixfmt-rfc-style podman-desktop - monero-gui + #monero-gui electrum fluffychat iamb - veracrypt + #veracrypt imagemagick tor-browser qsynth poetry vesktop nixd + graphviz + vscode-langservers-extracted + alsa-scarlett-gui + (aspellWithDicts + (dicts: with dicts; [ en en-computers en-science ])) (nerdfonts.override { fonts = [ "Iosevka" ]; }) -# (discord.override { -# withOpenASAR = true; -# withVencord = true; -# }) - python311Packages.python-lsp-server + nodePackages.pyright ]; fonts.fontconfig.enable = true; xsession.enable = true; @@ -125,11 +123,14 @@ }; programs.chromium = { + package = pkgs.chromium; enable = true; extensions = [ "ddkjiahejlhfcafbddmgiahcphecmpfh" # ublock-origin lite "dbepggeogbaibhgnhhndojpepiihcmeb" # vimium "eimadpbcbfnmbkopoojfekhnkhdbieeh" # dark reader + "oicakdoenlelpjnkoljnaakdofplkgnd" # tree style tabs + "nkbihfbeogaeaoehlefnkodbefgpgknn" # metamask ]; }; @@ -869,7 +870,7 @@ source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh ''; localVariables = { - EDITOR = "emacsclient -n --alternate-editor=vim"; + EDITOR = "emacsclient --create-frame --alternate-editor=vim"; INPUT_METHOD = "fcitx"; QT_IM_MODULE = "fcitx"; GTK_IM_MODULE = "fcitx"; @@ -925,6 +926,7 @@ fi epkgs.counsel epkgs.mu4e epkgs.yasnippet + epkgs.yasnippet-snippets epkgs.company epkgs.pinentry epkgs.pdf-tools @@ -943,11 +945,21 @@ fi epkgs.ellama epkgs.latex-preview-pane epkgs.treemacs + epkgs.treemacs-projectile + epkgs.treemacs-evil + epkgs.treemacs-magit epkgs.treesit-auto epkgs.gptel epkgs.elpher epkgs.lyrics-fetcher epkgs.password-store + epkgs.org-roam-ui + epkgs.websocket + epkgs.simple-httpd + epkgs.f + epkgs.org-fragtog + epkgs.enwc + epkgs.writegood-mode ]; }; @@ -955,8 +967,8 @@ fi enable = true; extraConfig = '' IMAPAccount prestonpan - Host mail.nullring.xyz - User preston + Host imap.gmail.com + User ret2pop@gmail.com PassCmd "pass Mail" Port 993 SSLType IMAPS @@ -967,8 +979,8 @@ fi Account prestonpan MaildirStore prestonpan-local - Path ~/email/mbsyncmail/ - Inbox ~/email/mbsyncmail/INBOX + Path ~/email/ret2pop/ + Inbox ~/email/ret2pop/INBOX SubFolders Verbatim Channel prestonpan @@ -995,10 +1007,10 @@ fi # Gmail account preston - host mail.nullring.xyz - port 465 - from preston@nullring.xyz - user preston + host smtp.gmail.com + port 587 + from ret2pop@gmail.com + user ret2pop@gmail.com passwordeval "pass Mail" @@ -1043,6 +1055,8 @@ fi "fcitx5-remote -r" "fcitx5 -d --replace" "fcitx5-remote -r" + "emacs" + "chromium" ]; blurls = [ "waybar" @@ -1129,6 +1143,12 @@ fi kb_options = "caps:swapescape"; repeat_delay = 300; repeat_rate = 50; + natural_scroll = true; + touchpad = { + natural_scroll = true; + disable_while_typing = true; + tap-to-click = true; + }; }; misc = { force_default_wallpaper = 0; diff --git a/system-build.sh b/system-build.sh new file mode 100755 index 0000000..986a3e4 --- /dev/null +++ b/system-build.sh @@ -0,0 +1,16 @@ +#!/bin/sh +sudo nixos-rebuild switch +cd /home/preston/src/hyprnixmacs +git add "./" +git commit -m "$1" +git push origin main +cd /home/preston/org/website +git add "./" +git commit -m "$2" +git push origin main +rsync -azvP ~/website_html/ root@nullring.xyz:/usr/share/nginx/ret2pop/ +aspell -d en dump master | aspell -l en expand > ~/.local/share/my.dict +#cd /home/preston/org/website/ +#git add . +#git commit "$2" +#git push origin main |