From 993a7f04f2cf63a8efdff2b21980e56ccab6525f Mon Sep 17 00:00:00 2001 From: spl3g Date: Thu, 11 Jan 2024 22:16:35 +0300 Subject: final commit? --- home-manager/general/default.nix | 4 +- home-manager/general/programs/emacs/config.org | 52 ++++++++++++++--------- home-manager/general/programs/emacs/init.el | 58 +++++++++++++------------- home-manager/general/programs/fish/default.nix | 16 ++++--- pkgs/default.nix | 2 + pkgs/green-tunnel/default.nix | 16 +++++++ pkgs/spoofDPI/default.nix | 15 +++++++ pkgs/spoofDPI/default.nix~ | 13 ++++++ 8 files changed, 119 insertions(+), 57 deletions(-) create mode 100644 pkgs/green-tunnel/default.nix create mode 100644 pkgs/spoofDPI/default.nix create mode 100644 pkgs/spoofDPI/default.nix~ diff --git a/home-manager/general/default.nix b/home-manager/general/default.nix index 4f1326e..b66d114 100644 --- a/home-manager/general/default.nix +++ b/home-manager/general/default.nix @@ -42,11 +42,11 @@ let osu-lazer-bin easyeffects ]; + fonts = with pkgs; [ rubik - source-code-pro material-design-icons - font-awesome + source-code-pro ]; imports = builtins.concatMap import [ ./programs diff --git a/home-manager/general/programs/emacs/config.org b/home-manager/general/programs/emacs/config.org index 5cbd3b1..5650bb1 100644 --- a/home-manager/general/programs/emacs/config.org +++ b/home-manager/general/programs/emacs/config.org @@ -52,7 +52,7 @@ - [[#flymake][Flymake]] - [[#dired][Dired]] - [[#bindings][Bindings]] - - [[#dired-filter][Dired filter]] + - [[#dired-hacks][Dired hacks]] - [[#additional-apps][Additional apps]] - [[#telegram-lol][Telegram lol]] - [[#magit][Magit]] @@ -231,21 +231,21 @@ #+begin_src emacs-lisp (setq default-frame-alist '((font . "Source Code Pro"))) (set-face-attribute 'default nil - :font "Source Code Pro" - :height 110 - :weight 'medium) + :font "Source Code Pro" + :height 110 + :weight 'medium) (set-face-attribute 'fixed-pitch nil - :font "Source Code Pro" - :height 110 - :weight 'medium) + :font "Source Code Pro" + :height 110 + :weight 'medium) (set-face-attribute 'variable-pitch nil - :font "Rubik" - :height 110 - :weight 'medium) + :font "Rubik" + :height 110 + :weight 'medium) (set-face-attribute 'font-lock-comment-face nil - :slant 'italic) + :slant 'italic) (set-face-attribute 'font-lock-keyword-face nil - :weight 'bold) + :weight 'bold) #+end_src ** Display line numbers #+begin_src emacs-lisp @@ -332,6 +332,8 @@ #+end_src * Org mode #+begin_src emacs-lisp + (use-package org + :defer t) (add-hook 'org-mode-hook 'org-indent-mode) (require 'org-tempo) #+end_src @@ -637,10 +639,10 @@ #+end_src *** Consult fish completions #+begin_src emacs-lisp - (use-package consult-fish-completions - :load-path "~/prog/elisp/fish-completions/consult-fish-completions.el" - :hook (eshell-mode . (lambda () - (keymap-set eshell-mode-map "M-" 'consult-fish-completions)))) + ;; (use-package consult-fish-completions + ;; :load-path "~/prog/elisp/fish-completions/consult-fish-completions.el" + ;; :hook (eshell-mode . (lambda () + ;; (keymap-set eshell-mode-map "M-" 'consult-fish-completions)))) #+end_src ** Eat #+begin_src emacs-lisp @@ -818,13 +820,23 @@ ** Bindings #+begin_src emacs-lisp (use-package dired + :ensure nil + :commands (dired dired-jump) :custom (dired-listing-switches "-al --group-directories-first")) - #+end_src -** Dired filter -#+begin_src emacs-lisp - +** Dired hacks +#+begin_src emacs-lisp + (use-package dired-ranger + :bind (:map dired-mode-map + ("r c" . dired-ranger-copy) + ("r m" . dired-ranger-move) + ("r p" . dired-ranger-paste) + ("\\" . dired-ranger-bookmark) + ("`" . dired-ranger-bookmark-visit))) + (use-package dired-narrow + :bind (:map dired-mode-map + ("n" . dired-narrow))) #+end_src * Additional apps ** Telegram lol diff --git a/home-manager/general/programs/emacs/init.el b/home-manager/general/programs/emacs/init.el index f1a4f90..1b67775 100644 --- a/home-manager/general/programs/emacs/init.el +++ b/home-manager/general/programs/emacs/init.el @@ -150,21 +150,21 @@ (setq default-frame-alist '((font . "Source Code Pro"))) (set-face-attribute 'default nil - :font "Source Code Pro" - :height 110 - :weight 'medium) + :font "Source Code Pro" + :height 110 + :weight 'medium) (set-face-attribute 'fixed-pitch nil - :font "Source Code Pro" - :height 110 - :weight 'medium) + :font "Source Code Pro" + :height 110 + :weight 'medium) (set-face-attribute 'variable-pitch nil - :font "Rubik" - :height 110 - :weight 'medium) + :font "Rubik" + :height 110 + :weight 'medium) (set-face-attribute 'font-lock-comment-face nil - :slant 'italic) + :slant 'italic) (set-face-attribute 'font-lock-keyword-face nil - :weight 'bold) + :weight 'bold) (add-hook 'prog-mode-hook 'display-line-numbers-mode) (visual-line-mode 1) @@ -227,6 +227,8 @@ (save-place-mode t) (defalias 'yes-or-no #'y-or-n-p) +(use-package org + :defer t) (add-hook 'org-mode-hook 'org-indent-mode) (require 'org-tempo) @@ -488,10 +490,10 @@ (use-package fish-completion :hook (eshell-mode . fish-completion-mode)) -(use-package consult-fish-completions - :load-path "~/prog/elisp/fish-completions/" - :hook (eshell-mode . (lambda () - (keymap-set eshell-mode-map "M-" 'consult-fish-completions)))) +;; (use-package consult-fish-completions +;; :load-path "~/prog/elisp/fish-completions/consult-fish-completions.el" +;; :hook (eshell-mode . (lambda () +;; (keymap-set eshell-mode-map "M-" 'consult-fish-completions)))) (use-package eat :hook (eshell-mode . eat-eshell-mode) @@ -633,10 +635,21 @@ ("C-c s f p" . flymake-show-project-diagnostics))) (use-package dired + :ensure nil + :commands (dired dired-jump) :custom (dired-listing-switches "-al --group-directories-first")) - +(use-package dired-ranger + :bind (:map dired-mode-map + ("r c" . dired-ranger-copy) + ("r m" . dired-ranger-move) + ("r p" . dired-ranger-paste) + ("\\" . dired-ranger-bookmark) + ("`" . dired-ranger-bookmark-visit))) +(use-package dired-narrow + :bind (:map dired-mode-map + ("n" . dired-narrow))) ;; (add-to-list 'load-path "~/telega.el") ;; (require 'telega) @@ -660,16 +673,3 @@ (setq gc-cons-threshold (* 2 1000 1000)) (setq read-process-output-max (* 1024 1024)) -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(package-selected-packages - '(dired web-mode vertico use-package treesit-auto tree-sitter-langs toc-org smartparens rust-mode rainbow-delimiters py-autopep8 org-download org-bullets org-auto-tangle orderless no-littering nix-mode move-text mood-line marginalia magit lsp-pyright js2-mode indent-guide helpful good-scroll general flycheck-rust fish-mode fish-completion eglot eat direnv dashboard crux corfu copilot consult catppuccin-theme cape all-the-icons snow meow))) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) diff --git a/home-manager/general/programs/fish/default.nix b/home-manager/general/programs/fish/default.nix index fc91367..dbd1e3b 100644 --- a/home-manager/general/programs/fish/default.nix +++ b/home-manager/general/programs/fish/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, config, ... }: let nixPlugins = [ @@ -13,9 +13,14 @@ let set fish_greeting pokemon-colorscripts -r --no-title ''; - # loginShellInit = '' - # Hyprland - # ''; + + # loginShellInit = + # if config.networking.hostName == "ltrr-mini" + # then + # "Hyprland" + # else + # "startx"; + functions = { ranger_func = '' ranger $argv @@ -29,7 +34,6 @@ let shellAliases = { rn = "ranger_func"; ls = "ls --hyperlink=auto --color=auto"; - iamatomic = "sudo nixos-rebuild switch --flake ~/nixfiles#ltrr"; }; in @@ -41,6 +45,6 @@ in programs.fish = { enable = true; - inherit plugins interactiveShellInit functions shellAliases; + inherit plugins interactiveShellInit functions shellAliases; }; } diff --git a/pkgs/default.nix b/pkgs/default.nix index fa41c73..b206caf 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -6,4 +6,6 @@ g-ls = pkgs.callPackage ./g-ls { }; draw = pkgs.callPackage ./draw { }; tdlib = pkgs.callPackage ./tdlib { }; + spoofDPI = pkgs.callPackage ./spoofDPI { }; + green-tunnel = pkgs.callPackage ./green-tunnel { }; } diff --git a/pkgs/green-tunnel/default.nix b/pkgs/green-tunnel/default.nix new file mode 100644 index 0000000..02ef398 --- /dev/null +++ b/pkgs/green-tunnel/default.nix @@ -0,0 +1,16 @@ +{ buildNpmPackage, fetchFromGitHub, lib }: + +buildNpmPackage rec { + name = "GreenTunnel"; + version = "1.8.3"; + + src = fetchFromGitHub { + repo = name; + owner = "SadeghHayeri"; + rev = "v${version}"; + sha256 = "06c90x2ykm350v2fd1zny0bh5s7hbchx457n916lgcbzzdq7yr6r"; + }; + + npmDepsHash = "sha256-Z+oJ0ZySQA2rFz/l6HSY0QzZodKxQ9jm8h+D6m3JzV0="; + dontNpmBuild = true; +} diff --git a/pkgs/spoofDPI/default.nix b/pkgs/spoofDPI/default.nix new file mode 100644 index 0000000..33b10f6 --- /dev/null +++ b/pkgs/spoofDPI/default.nix @@ -0,0 +1,15 @@ +{ fetchFromGitHub, buildGoModule, lib }: + +buildGoModule rec { + name = "SpoofDPI"; + version = "0.8"; + + src = fetchFromGitHub { + repo = name; + owner = "xvzc"; + rev = "363f022c91773acd62f306ba9bae5bfae4913c2a"; + sha256 = "0gyp4411brdfa9wybgn2z4ljnylid0r4xx6ydy0v56vqk4wrvw4h"; + }; + + vendorHash = "sha256-ib9xRklkLfrDCuLf7zDkJE8lJiNiUMPZ01MDxvqho6o="; +} diff --git a/pkgs/spoofDPI/default.nix~ b/pkgs/spoofDPI/default.nix~ new file mode 100644 index 0000000..ca3f71d --- /dev/null +++ b/pkgs/spoofDPI/default.nix~ @@ -0,0 +1,13 @@ +{ fetchFromGitHub, buildGoModule, lib }: + +buildGoModule rec { + name = "SpoofDPI"; + version = "0.8"; + + src = fetchFromGitHub { + repo = name; + owner = "xvzc"; + rev = "363f022c91773acd62f306ba9bae5bfae4913c2a"; + sha256 = "https://github.com/xvzc/SpoofDPI/tags"; + }; +} -- cgit v1.2.3