diff --git a/config/emacs/doom/config.el b/config/emacs/doom/config.el index 3b11fe7..060ab9d 100644 --- a/config/emacs/doom/config.el +++ b/config/emacs/doom/config.el @@ -116,25 +116,28 @@ (setq mu4e-confirm-quit nil) (setq mu4e-attachment-dir "~/.mail/.attachments") -(require 'mu4e-alert) + (require 'mu4e-alert) -(setq mu4e-alert-interesting-mail-query "flag:unread AND maildir:/gmail-main/Inbox") + (setq mu4e-alert-interesting-mail-query "flag:unread AND maildir:/gmail-main/Inbox") -(mu4e-alert-enable-mode-line-display) + (mu4e-alert-enable-mode-line-display) -(defun refresh-mu4e-alert-mode-line () -(interactive) -(mu4e~proc-kill) -(async-shell-command "mbsync -a") -(mu4e-alert-enable-mode-line-display) -(mu4e-alert-enable-notifications) + (defun refresh-mu4e-alert-mode-line () + (interactive) + (mu4e~proc-kill) + (async-shell-command "mbsync -a") + (mu4e-alert-enable-mode-line-display) + (mu4e-alert-enable-notifications) + ) + + (run-with-timer 0 60 'refresh-mu4e-alert-mode-line) ) -(run-with-timer 0 60 'refresh-mu4e-alert-mode-line) +(after! projectile + (setq projectile-require-project-root nil) + (setq projectile-project-search-path '("~/projects")) ) -(setq projectile-require-project-root nil) -(setq projectile-project-search-path '("~/projects")) - (after! meson-mode - (add-hook 'meson-mode-hook 'company-mode)) + (add-hook 'meson-mode-hook 'company-mode) +) diff --git a/config/emacs/doom/init.el b/config/emacs/doom/init.el index 61520d4..77226f5 100644 --- a/config/emacs/doom/init.el +++ b/config/emacs/doom/init.el @@ -56,7 +56,7 @@ (evil +everywhere); come to the dark side, we have cookies file-templates ; auto-snippets for empty files fold ; (nigh) universal code folding - ;;(format +onsave) ; automated prettiness + format ;;(format +onsave) ; automated prettiness ;;god ; run Emacs commands without modifier keys ;;lispy ; vim for lisp, for people who don't like vim ;;multiple-cursors ; editing in many places at once @@ -140,7 +140,7 @@ ;;(haskell +lsp) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python ;;idris ; a language you can depend on - ;;json ; At least it ain't XML + json ; At least it ain't XML ;;(java +lsp) ; the poster child for carpal tunnel syndrome ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) ;;julia ; a better, faster MATLAB @@ -157,7 +157,7 @@ ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;purescript ; javascript, but functional - python ; beautiful is better than ugly + (python +lsp +pyright) ; beautiful is better than ugly ;;qt ; the 'cutest' gui framework ever ;;racket ; a DSL for DSLs ;;raku ; the artist formerly known as perl6 diff --git a/flake.lock b/flake.lock index da190bc..3678c1b 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1686133476, - "narHash": "sha256-RCkGMdQ9oivH4bdEwQDyFEIP7bQmdPahTFtBw5rVuyk=", + "lastModified": 1687317349, + "narHash": "sha256-fj+4afP27luddlVlkukSvl3YP3x15k1tohloSseM34Y=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d80c21d639094ecc95f5ea437a141090499384d0", + "rev": "67bc8a38d8517ee1b9c8e2e850ad27b8923b4d0e", "type": "github" }, "original": { @@ -78,11 +78,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1687171271, + "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1686142265, - "narHash": "sha256-IP0xPa0VYqxCzpqZsg3iYGXarUF+4r2zpkhwdHy9WsM=", + "lastModified": 1687301540, + "narHash": "sha256-vFbCrE9WlOSVpyAT5VNR3bqMB7W7sDzMNDcO6JqtmBw=", "owner": "rycee", "repo": "home-manager", - "rev": "39c7d0a97a77d3f31953941767a0822c94dc01f5", + "rev": "9a76fb9a852fdf9edd3b0aabc119efa1d618f969", "type": "github" }, "original": { @@ -176,11 +176,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1684899633, - "narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=", + "lastModified": 1686838567, + "narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "4cc688ee711159b9bcb5a367be44007934e1a49d", + "rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89", "type": "github" }, "original": { @@ -239,11 +239,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1685952468, - "narHash": "sha256-YCOr9kttCqoa9IZMjHxX6SlwenTg7FsSmG9TaT76mSE=", + "lastModified": 1687193290, + "narHash": "sha256-3bknptEbd9LLlCiFRFkMwmciHB+QXET41gH/RX+Nr1A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70f7275b32f49bc67ae3532b758b80cb6c27f98a", + "rev": "ad157fe26e74211e7dde0456cb3fd9ab78b6e552", "type": "github" }, "original": { @@ -255,11 +255,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1686089707, - "narHash": "sha256-LTNlJcru2qJ0XhlhG9Acp5KyjB774Pza3tRH0pKIb3o=", + "lastModified": 1687274257, + "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "af21c31b2a1ec5d361ed8050edd0303c31306397", + "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", "type": "github" }, "original": { @@ -270,11 +270,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1685931219, - "narHash": "sha256-8EWeOZ6LKQfgAjB/USffUSELPRjw88A+xTcXnOUvO5M=", + "lastModified": 1686960236, + "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7409480d5c8584a1a83c422530419efe4afb0d19", + "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1685931219, - "narHash": "sha256-8EWeOZ6LKQfgAjB/USffUSELPRjw88A+xTcXnOUvO5M=", + "lastModified": 1686960236, + "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7409480d5c8584a1a83c422530419efe4afb0d19", + "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", "type": "github" }, "original": { @@ -301,11 +301,11 @@ }, "nur": { "locked": { - "lastModified": 1686143635, - "narHash": "sha256-BmsQRuHNoOIQl9Zv/aettlJUt366HoRW1xQnI8n3C64=", + "lastModified": 1687322502, + "narHash": "sha256-Xof4hZTleIF/rmhZNPHCTt/wKJ7Ex/hVZ7QaZAn1epA=", "owner": "nix-community", "repo": "NUR", - "rev": "b54d94d6eb99231590921225e1601705b97aa968", + "rev": "6e3daaa6f11e491556306e4422bd957de24f05a9", "type": "github" }, "original": { diff --git a/modules/desktop/documents/default.nix b/modules/desktop/documents/default.nix index 4f1f359..b334760 100644 --- a/modules/desktop/documents/default.nix +++ b/modules/desktop/documents/default.nix @@ -12,6 +12,7 @@ in { user.packages = with pkgs; [ onlyoffice-bin tectonic + biber ]; }; } diff --git a/modules/desktop/gnome.nix b/modules/desktop/gnome.nix index 5c26175..9dc9d9d 100644 --- a/modules/desktop/gnome.nix +++ b/modules/desktop/gnome.nix @@ -11,19 +11,18 @@ in { config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ - gnomeExtensions.containers + #gnomeExtensions.containers gnomeExtensions.tray-icons-reloaded ]; services.xserver = { enable = true; + # TODO: unable to login with xorg, only wayland works displayManager.gdm.enable = false; - displayManager.lightdm.enable = true; displayManager.gdm.wayland = false; + displayManager.lightdm.enable = true; desktopManager.gnome.enable = true; - #autorun = false; - #displayManager.startx.enable = true; }; }; diff --git a/modules/desktop/media/recording.nix b/modules/desktop/media/recording.nix index c8a0790..0892c70 100644 --- a/modules/desktop/media/recording.nix +++ b/modules/desktop/media/recording.nix @@ -20,6 +20,7 @@ in { (if cfg.video.enable then [ unstable.obs-studio + unstable.obs-studio-plugins.obs-vkcapture unstable.handbrake ffmpeg ] else []); diff --git a/modules/editors/emacs.nix b/modules/editors/emacs.nix index 2899a42..e480621 100644 --- a/modules/editors/emacs.nix +++ b/modules/editors/emacs.nix @@ -41,9 +41,10 @@ in { # :tools lookup & :lang org +roam sqlite # :lang latex & :lang org (latex previews) - texlive.combined.scheme-medium + texlive.combined.scheme-full # :lang nix nixfmt + rnix-lsp ]; env.PATH = [ "$XDG_CONFIG_HOME/emacs/bin" ]; diff --git a/modules/hardware/audio.nix b/modules/hardware/audio.nix index fc974bb..5e1cd74 100644 --- a/modules/hardware/audio.nix +++ b/modules/hardware/audio.nix @@ -22,20 +22,20 @@ in { easyeffects ]; - hardware.pulseaudio.enable = false; + hardware.pulseaudio.enable = false; # HACK Prevents ~/.esd_auth files by disabling the esound protocol module # for pulseaudio, which I likely don't need. Is there a better way? hardware.pulseaudio.configFile = - let - inherit (pkgs) runCommand pulseaudio; - paConfigFile = runCommand "disablePulseaudioEsoundModule" - { buildInputs = [ pulseaudio ]; } '' - mkdir "$out" - cp ${pulseaudio}/etc/pulse/default.pa "$out/default.pa" - sed -i -e 's|load-module module-esound-protocol-unix|# ...|' "$out/default.pa" - ''; - in - mkIf config.hardware.pulseaudio.enable "${paConfigFile}/default.pa"; + let + inherit (pkgs) runCommand pulseaudio; + paConfigFile = runCommand "disablePulseaudioEsoundModule" + { buildInputs = [ pulseaudio ]; } '' + mkdir "$out" + cp ${pulseaudio}/etc/pulse/default.pa "$out/default.pa" + sed -i -e 's|load-module module-esound-protocol-unix|# ...|' "$out/default.pa" + ''; + in + mkIf config.hardware.pulseaudio.enable "${paConfigFile}/default.pa"; user.extraGroups = [ "audio" ]; };