From e0a9283d2ec8c65ddacb3575cca1ea512d40c550 Mon Sep 17 00:00:00 2001 From: Amneesh Singh Date: Sun, 25 Feb 2024 17:13:21 +0530 Subject: [PATCH] home/natto: yearly update Signed-off-by: Amneesh Singh --- home/modules/zsh.nix | 2 +- home/natto/config/emacs/config.org | 17 ++++++++--------- home/natto/config/hypr/hyprland.conf | 14 ++++++++------ home/natto/git.nix | 2 +- home/natto/gtk.nix | 2 +- home/natto/pkgs.nix | 4 ++-- home/natto/secrets/.gitconfig.age | Bin 1174 -> 0 bytes home/natto/secrets/gitconfig.age | Bin 0 -> 1215 bytes .../secrets/{.zshenv_secret => zshenv_secret} | 0 home/natto/wayland.nix | 2 -- home/natto/zsh.nix | 2 +- 11 files changed, 22 insertions(+), 23 deletions(-) delete mode 100644 home/natto/secrets/.gitconfig.age create mode 100644 home/natto/secrets/gitconfig.age rename home/natto/secrets/{.zshenv_secret => zshenv_secret} (100%) diff --git a/home/modules/zsh.nix b/home/modules/zsh.nix index ffd2a31..6b62cba 100644 --- a/home/modules/zsh.nix +++ b/home/modules/zsh.nix @@ -10,7 +10,7 @@ }; enableAutosuggestions = true; enableCompletion = true; - enableSyntaxHighlighting = true; + syntaxHighlighting.enable = true; prezto = { enable = true; prompt.theme = "pure"; diff --git a/home/natto/config/emacs/config.org b/home/natto/config/emacs/config.org index 97ec245..fdebefd 100644 --- a/home/natto/config/emacs/config.org +++ b/home/natto/config/emacs/config.org @@ -1,5 +1,5 @@ -# #+TITLE: My Emacs Configuration -# #+AUTHOR: Amneesh Singh +#+TITLE: My Emacs Configuration +#+AUTHOR: Amneesh Singh #+PROPERTY: header-args:emacs-lisp :tangle yes * Settings @@ -23,6 +23,9 @@ (setq ring-bell-function 'ignore gc-cons-threshold most-positive-fixnum initial-major-mode 'fundamental-mode) +(unless (display-graphic-p) + (require 'evil-terminal-cursor-changer) + (evil-terminal-cursor-changer-activate)) #+end_src ** Setting some variables @@ -132,6 +135,8 @@ Add selectrum-prescient To undo and redo easily like vi #+begin_src emacs-lisp (use-package undo-tree + :init + (setq undo-tree-history-directory-alist '(("." . "~/.emacs.d/undo"))) :config (global-undo-tree-mode 1)) #+end_src @@ -199,8 +204,7 @@ For autocomplete :after lsp-mode :config (add-to-list 'company-backends 'company-dabbrev) - (setq company-backends (cons 'company-files (remove 'company-files company-backends))) - (add-to-list 'company-backends 'company-emoji) + (setq company-backends (append '(company-files) (remove 'company-files company-backends))) (company-mode 1)) #+end_src @@ -210,11 +214,6 @@ For autocomplete :hook (company-mode . company-quickhelp-mode)) #+end_src -*** Extra company packages -#+begin_src emacs-lisp -(use-package company-emoji) -#+end_src - ** Treesitter #+begin_src emacs-lisp (use-package tree-sitter-langs :defer t) diff --git a/home/natto/config/hypr/hyprland.conf b/home/natto/config/hypr/hyprland.conf index c07381a..927f78e 100644 --- a/home/natto/config/hypr/hyprland.conf +++ b/home/natto/config/hypr/hyprland.conf @@ -35,13 +35,15 @@ general { decoration { rounding = 1 - blur = yes - blur_size = 5 - blur_passes = 1 - blur_new_optimizations = on - blur_xray = yes - drop_shadow = yes inactive_opacity = 0.8 + drop_shadow = true + + blur { + enabled = true + size = 5 + new_optimizations = true + xray = true + } } animations { diff --git a/home/natto/git.nix b/home/natto/git.nix index 6b38e63..5fa52cf 100644 --- a/home/natto/git.nix +++ b/home/natto/git.nix @@ -10,7 +10,7 @@ }; age.secrets.gitconfig = { - file = ./secrets/.gitconfig.age; + file = ./secrets/gitconfig.age; path = "${config.home.homeDirectory}/.gitconfig"; }; } diff --git a/home/natto/gtk.nix b/home/natto/gtk.nix index b5a90f7..333b56a 100644 --- a/home/natto/gtk.nix +++ b/home/natto/gtk.nix @@ -3,7 +3,7 @@ gtk = { enable = true; theme = { - name = "Catppuccin-Mocha-Standard-Teal-dark"; + name = "Catppuccin-Mocha-Standard-Teal-Dark"; package = pkgs.catppuccin-gtk.override { accents = [ "teal" ]; variant = "mocha"; diff --git a/home/natto/pkgs.nix b/home/natto/pkgs.nix index 2d2ef58..7a5b846 100644 --- a/home/natto/pkgs.nix +++ b/home/natto/pkgs.nix @@ -50,13 +50,14 @@ gnome.zenity # Wine and games and stuff + lutris wineWowPackages.stable steam lutris winetricks flake.packages.${pkgs.system}.tlauncher mangohud - inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin + # inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin # Programming and dev stuff (texlive.combine { @@ -86,7 +87,6 @@ ghc nodejs rust-bin.nightly.latest.default - clang-tools openjdk # Misc diff --git a/home/natto/secrets/.gitconfig.age b/home/natto/secrets/.gitconfig.age deleted file mode 100644 index 63e00d09260f43e9295ce6a3cff707ffe81b6701..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1174 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCU7_RKbo3RFmnNcQ*4 zOO0}>%t_X zZW&xySe|8=pOsTpkrwJ2=~||*o$KN4S8igK78vCb;Z&^c?c$P@QdFMp=n|Hro$Fi` z=v}~7Rg&%-6d364?U$e8RveM%=iyZ4?NL%%k{D2CR8(S_S>}{q?(XU9Waw%hP?i%A zo}O1y?qcYk>RVn`USg2XRpeuqo}FiG80O|x;G>@$7;50_ACPV4S`b{8=$M=69~6~o zXH-a@0FG1;o_egR+y3z&Sg}TVUliOp`Tjn<&_dWOBoaYk|Twv^? z?V42N78;VD9~tRf?qnS45*3kDUKHh8>Fe#~RHX_{A9c*q=T3}KcQel+IRppXi?vw24RN@lqVV+!AT;fw!8Sav3teu~d8DSCW990$J z|~H?6q#({5w35TZtj=l zpO~JJYHX5QmR4yRq@CmwQf3+HA7bgAo9I%mpK2UXU|Q}}o|tBsX37Oh8p_2*=5>a- zzPjl}sfop@3c;>+N-oh{Dej@AWhMIFUixm?!8sLWrp_LrnGvSm8LlDbQ2_>Ay1Kdw z5v7JX;a=I{Rat>m0a2BHr52F|mMPvwX?||0KKX8r5f&vm8E(F1ZjR+#f+x*Bt+d&* zmHSV!_lLuWSLCFoHgeP-_ItMRr~QL%nJN1-nvDMkiO-00{jsm+g!sIpH^0a2n-OMs zujzm6RlQ#u8Ya9gI~%a}C0p)kKchQg^8KcT4k5KA(=*vO9h&#FM|Y;y=r`ZjK z9;K{|<8Re2PEGe0j>!D6)^OghJvTT{S?`(uY{7x-nJO>NeAwan=EnWrPEB>k(~GrR zPp5PU2`>_P@uP>Q%zlE-C*6gmy?d7J>sLzQP<^K>JMqBEZ}|=h{$^XHWt=vAp8H(t z;9i|BqXj*Oud%8n>Rc*}un29-dr)P%uRKMv(xNuX&{}!=jW(X0kr8@M|5h*V)j3mn zT8C5NyxOWQ2~W@N>DzwxrgWeDE@^d^!__}{-1<|VmYYw_?dN^*cBAhylXofBx7Pku z<+;6M*->$Zg+FhKX6hbX7OhqoAh@|k?17tL|MR7juEw3?Us>>4CSvKNnFdb+{_9<8 zXv?s0kThF6KXUoZ@FtTFQyL%s3>HpRnZmYsbqrtos;_~yC(ge;vT(%$AulrkTj<6{ diff --git a/home/natto/secrets/gitconfig.age b/home/natto/secrets/gitconfig.age new file mode 100644 index 0000000000000000000000000000000000000000..a4a565a86e1926f537031abfa895ddd2431483df GIT binary patch literal 1215 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCU7_RKbo3RDQrurRj_ z4GeZKF3rkwPcsQ~GA?j5@lErs^eMIQDfjUY&r2!Q*N$>D3gq&r40O#+Om#Pm3i6H6 z4mU5T2v3PHE6Ft|Ew8L9b#}>3PfRLFOAj^iwt(4IRGg@gljm*hm(CSs8e);|m}+E} z=VDw{S`ZKslIdQ5fVMSrF;rQsrJySgsx5p6(u4 z;O@`mr0wgMTUnTxXK0pO8InK&QIugE zVB%p?;h3Rq?io;#XW@<`?D^DXqcO8S(aGn9Il;X=~-YN6y%s! z6jtn!7nK@fS)LT?9pUH`Y!qOel^2xa;aunu<>*&xZf+Kt7?I)bm&%o9W?5XBV&+<4 zP!#T;W18oiTp5s}om(017wi*ksUMPP7+xNnW)S4)XPz3Oosm@%ZeVPb=H`=WSmj!j z@9W4_Zs}T(m}(eSkd&8I>{8~P;o%t)9AR0MY3No^80=N(9_(&WS`l9ATIwI^;gS}S zmgbgW>=Wqi80DCm=a%Zlm6ul%QRHk~Y3ZfyZQ}0}92SyLKm}pq!<7Sp;T4Cgz zQSRvCZxS4yRgvLhkzrb3VPWB<9cAnkRFvUv=;|2i9T;vNbmJgsfop@3RyL3iCpIXm2LqcWv1CVmMK2kZeDGs{+x^5gx zc1UY{d7_c-Ev;j7Cn7P)`qy^DJ(c?;KL#30t@b&rtY`7vRpjdH=Whi9mK@o>y; zozgPjF8u88;>Ayle*aS`o-bG$*lWMf2q~_@6K4|w4}^q-(xMF{DZGT>=OC- zyflA&TDbgajZ57Bd;B#&J}~q|)cm>nSI1Q-#c@^*>sAZJxDD!C&#AWv?RdCiZ|=;+$w=K6Vm2zfU@^(!MA%af!{MS=Q39*+u=D;)Rt>3IZ*@4RU#|M~E;j;-mX zTF#%IiJjAFXMG&`YWf=UU6T^(W(ORpefi}4hZi2pzAkm|uz$wto*7=T*?ifix> nX^nyle{a0fZnxvkmE7RcUenngv#f3|G`0O6@s#<^YB^* literal 0 HcmV?d00001 diff --git a/home/natto/secrets/.zshenv_secret b/home/natto/secrets/zshenv_secret similarity index 100% rename from home/natto/secrets/.zshenv_secret rename to home/natto/secrets/zshenv_secret diff --git a/home/natto/wayland.nix b/home/natto/wayland.nix index 2dc5042..6e47aea 100644 --- a/home/natto/wayland.nix +++ b/home/natto/wayland.nix @@ -9,9 +9,7 @@ enable = true; xwayland = { enable = true; - hidpi = true; }; - nvidiaPatches = true; extraConfig = (builtins.readFile ./config/hypr/hyprland.conf) + (with config.home.pointerCursor; '' exec-once=hyprctl setcursor ${name} ${toString size} diff --git a/home/natto/zsh.nix b/home/natto/zsh.nix index 7ef720d..132c98e 100644 --- a/home/natto/zsh.nix +++ b/home/natto/zsh.nix @@ -9,7 +9,7 @@ in ''; age.secrets.zshenv_secret = { - file = ./secrets/.zshenv_secret; + file = ./secrets/zshenv_secret; path = secretPath; mode = "660"; };