From 6ac66d48090f1e4c5a2bc2bcb56ec1830e2c20d0 Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Mon, 3 Jul 2023 14:32:30 +0200 Subject: [PATCH] trezor udev, emacs changes --- home/features/coding/emacs.nix | 113 +----------------------------- home/features/desktop/crypto.nix | 2 +- home/features/desktop/default.nix | 3 + home/users/m3tam3re/m3-nix.nix | 2 +- hosts/m3-nix/services/default.nix | 1 + hosts/m3-nix/services/udev.nix | 9 --- 6 files changed, 7 insertions(+), 123 deletions(-) diff --git a/home/features/coding/emacs.nix b/home/features/coding/emacs.nix index 462956e..627419a 100644 --- a/home/features/coding/emacs.nix +++ b/home/features/coding/emacs.nix @@ -1,115 +1,4 @@ { pkgs, ... }: { services.emacs.enable = true; - programs.emacs = { # 310 - enable = true; - extraPackages = epkgs: [ - epkgs.all-the-icons - epkgs.all-the-icons-dired - epkgs.calfw - epkgs.calfw-org - epkgs.calfw-ical - epkgs.command-log-mode - epkgs.company - epkgs.company-box - epkgs.consult - epkgs.counsel - epkgs.counsel-projectile - epkgs.consult-org-roam - epkgs.dart-mode - epkgs.dashboard - epkgs.deft - epkgs.dired-hide-dotfiles - epkgs.dired-open - epkgs.dired-single - epkgs.direnv - epkgs.docker - epkgs.docker-compose-mode - epkgs.dockerfile-mode - epkgs.docker-tramp - epkgs.doom-themes - epkgs.doom-modeline - epkgs.elfeed - epkgs.elfeed-web - epkgs.elfeed-tube - epkgs.elfeed-tube-mpv - epkgs.elfeed-org - epkgs.embark - epkgs.embark-consult - epkgs.ement - epkgs.emmet-mode - epkgs.envrc - epkgs.evil - epkgs.evil-collection - epkgs.evil-lispy - epkgs.evil-nerd-commenter - epkgs.exec-path-from-shell - epkgs.forge - epkgs.fontawesome - epkgs.general - epkgs.geiser - epkgs.geiser-guile - epkgs.flycheck-guile - epkgs.go-mode - epkgs.graphql-mode - epkgs.helpful - epkgs.helm - epkgs.helm-lsp - epkgs.helm-descbinds - epkgs.helm-rg - epkgs.helm-c-yasnippet - epkgs.highlight-indent-guides - epkgs.hydra - epkgs.ivy - epkgs.ivy-prescient - epkgs.ivy-rich - epkgs.json-mode - #epkgs.khalel - epkgs.lispy - epkgs.lsp-dart - epkgs.lsp-ivy - epkgs.lsp-mode - epkgs.lsp-ui - epkgs.lsp-treemacs - epkgs.magit - epkgs.marginalia - epkgs.mastodon - epkgs.mermaid-mode - epkgs.nix-mode - epkgs.no-littering - epkgs.ob-mermaid - epkgs.ob-nix - epkgs.org - epkgs.org-auto-tangle - epkgs.org-bullets - epkgs.org-download - epkgs.org-gcal - epkgs.org-ql - epkgs.org-present - epkgs.org-roam - epkgs.org-roam-ui - epkgs.pass - epkgs.pdf-tools - epkgs.projectile - epkgs.pyenv-mode - epkgs.python-mode - epkgs.rainbow-delimiters - epkgs.request - epkgs.restclient - epkgs.rustic - epkgs.smartparens - epkgs.sqlite3 - epkgs.svelte-mode - epkgs.todoist - epkgs.typescript-mode - epkgs.use-package - epkgs.visual-fill-column - epkgs.vue-mode - epkgs.vterm - epkgs.web-mode - epkgs.which-key - epkgs.yasnippet - epkgs.yasnippet-snippets - epkgs.zetteldeft - ]; - }; + programs.emacs = { enable = true; }; } diff --git a/home/features/desktop/crypto.nix b/home/features/desktop/crypto.nix index ffb0150..7fb027b 100644 --- a/home/features/desktop/crypto.nix +++ b/home/features/desktop/crypto.nix @@ -9,6 +9,6 @@ in { options.features.desktop.crypto.enable = mkEnableOption "Enable Crypto"; config = mkIf cfg.enable { - home.packages = with pkgs; [ bisq-desktop monero-gui trezord trezor-suite ]; + home.packages = with pkgs; [ bisq-desktop monero-gui trezor-suite ]; }; } diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix index 31bdbed..9a1128f 100644 --- a/home/features/desktop/default.nix +++ b/home/features/desktop/default.nix @@ -55,6 +55,7 @@ brightnessctl clipman distrobox + eww-wayland flameshot firefox fuzzel @@ -71,8 +72,10 @@ nyxt qt5ct rustdesk + socat tor-browser-bundle-bin transmission-gtk + trayer ungoogled-chromium unrar unzip diff --git a/home/users/m3tam3re/m3-nix.nix b/home/users/m3tam3re/m3-nix.nix index 3599314..0fd0951 100644 --- a/home/users/m3tam3re/m3-nix.nix +++ b/home/users/m3tam3re/m3-nix.nix @@ -32,5 +32,5 @@ }; services = { }; }; - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } diff --git a/hosts/m3-nix/services/default.nix b/hosts/m3-nix/services/default.nix index 5a20005..9b16264 100644 --- a/hosts/m3-nix/services/default.nix +++ b/hosts/m3-nix/services/default.nix @@ -19,4 +19,5 @@ services.sabnzbd.enable = true; services.i2p.enable = true; services.gvfs.enable = true; + services.trezord.enable = true; } diff --git a/hosts/m3-nix/services/udev.nix b/hosts/m3-nix/services/udev.nix index 21ca259..24b1e9a 100644 --- a/hosts/m3-nix/services/udev.nix +++ b/hosts/m3-nix/services/udev.nix @@ -2,14 +2,5 @@ { services.udev.extraRules = '' - # Trezor - SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" - KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl" - # Trezor v2 - SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" - SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" - KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl" - ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="intel_backlight", MODE="0666", GROUP="users", RUN+="${pkgs.coreutils}/bin/chmod a+w /sys/class/backlight/%k/brightness" - ACTION=="add", SUBSYSTEM=="thunderbolt", ATTR{authorized}=="0", ATTR{authorized}="1" ''; }