From 69cc04848dafcbe6aaa8e8ae873e824b20cd923f Mon Sep 17 00:00:00 2001 From: mehbark Date: Tue, 7 Jan 2025 19:10:27 -0500 Subject: [PATCH] numbat, emacs, upgrade --- configuration.nix | 2 +- flake.lock | 172 +++++++++++++++++++++++++++++--------------- home.nix | 19 +++-- init.el.nix | 40 +++-------- nvim.conf.nix | 6 +- vscode-settings.nix | 2 +- 6 files changed, 141 insertions(+), 100 deletions(-) diff --git a/configuration.nix b/configuration.nix index 5843aae..58e2d74 100644 --- a/configuration.nix +++ b/configuration.nix @@ -124,7 +124,7 @@ in # Enable CUPS to print documents. services.printing.enable = true; - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/flake.lock b/flake.lock index 54d60ea..f0f1df8 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1731774881, - "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=", + "lastModified": 1734906446, + "narHash": "sha256-6OWluVE2A8xi+8V3jN9KA72RCgJjYdyyuLBUjxZ2q2U=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "b31a6a4da8199ae3489057db7d36069a70749a56", + "rev": "eecb74dc79bb6752a2a507e6edee3042390a6091", "type": "github" }, "original": { @@ -61,12 +61,12 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1730931274, - "narHash": "sha256-QFlNSjrXU4vdiAYylS4UmDmaOcqcz9ujo0mkj4LStAo=", - "rev": "46c28563e3025b7d9fe3598c9ff07c700cce07ff", - "revCount": 642, + "lastModified": 1733503187, + "narHash": "sha256-EepDB25iZ8li+fGwhqOqg7XipFBishv4SvcDE2FE+is=", + "rev": "47747e4d3948aecca3f9728f95a2184031382ae7", + "revCount": 649, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.19/0193038e-7bda-7db1-954f-cbb2e2963d0f/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.21/01939cd9-0100-787a-b2e7-3c5db5c31b04/source.tar.gz" }, "original": { "type": "tarball", @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1731968878, - "narHash": "sha256-+hTCwETOE9N8voTAaF+IzdUZz28Ws3LDpH90FWADrEE=", + "lastModified": 1736089250, + "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", "owner": "nix-community", "repo": "home-manager", - "rev": "a42fa14b53ceab66274a21da480c9f8e06204173", + "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", "type": "github" }, "original": { @@ -178,11 +178,11 @@ ] }, "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", + "lastModified": 1734906540, + "narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", + "rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", "type": "github" }, "original": { @@ -191,11 +191,42 @@ "type": "github" } }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734906236, + "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, "hyprland": { "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", @@ -205,11 +236,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1731978971, - "narHash": "sha256-iwELdS0z0Yr8e3zRIBw07ug451T0rkEfGo3+vA5/Gg0=", + "lastModified": 1736115553, + "narHash": "sha256-nFagWe+VST+UL+Y/sp4P007PoMpsm6iW+PrWw1VH/Xk=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "67cee430061626ccd73dc6d30eed9db289053608", + "rev": "f390f48a07d117e24acec59dcf6791bcb3a81110", "type": "github" }, "original": { @@ -230,11 +261,11 @@ ] }, "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "lastModified": 1735734474, + "narHash": "sha256-9OV4lOqrEJVLdOrpNN/9msNwAhI6FQTu4N7fufilG08=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "rev": "271df559dd30e4bc5ec6af02d017ac0aaabd63a7", "type": "github" }, "original": { @@ -243,6 +274,35 @@ "type": "github" } }, + "hyprland-qtutils": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734906472, + "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -259,11 +319,11 @@ ] }, "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", + "lastModified": 1734906259, + "narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", + "rev": "0404833ea18d543df44df935ebf1b497310eb046", "type": "github" }, "original": { @@ -284,11 +344,11 @@ ] }, "locked": { - "lastModified": 1731702627, - "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=", + "lastModified": 1735316583, + "narHash": "sha256-AiiUwHWHfEdpFzXy7l1x3zInCUa1xcRMrbZ1XRSkzwU=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1", + "rev": "8f15d45b120b33712f6db477fe5ffb18034d0ea8", "type": "github" }, "original": { @@ -309,11 +369,11 @@ ] }, "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "lastModified": 1734793513, + "narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61", "type": "github" }, "original": { @@ -349,11 +409,11 @@ ] }, "locked": { - "lastModified": 1731885500, - "narHash": "sha256-ZrztYfSOS33J+ewq5alBOSdnIyZ0/sr1iy7FyBe9zIg=", + "lastModified": 1736085891, + "narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c60b5c924c6188a0b3ca2e139ead3d0f92ae5db5", + "rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c", "type": "github" }, "original": { @@ -364,11 +424,11 @@ }, "nixlib": { "locked": { - "lastModified": 1731805462, - "narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=", + "lastModified": 1734829460, + "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734", + "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c", "type": "github" }, "original": { @@ -385,11 +445,11 @@ ] }, "locked": { - "lastModified": 1731892054, - "narHash": "sha256-BJtD9NGUWaBe4OZ1JO77w8qBP9yHDJJUjsxkG/milFc=", + "lastModified": 1734915500, + "narHash": "sha256-A7CTIQ8SW0hfbhKlwK+vSsu4pD+Oaelw3v6goX6go+U=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "15a87ccb45e06d24a9fd5f99a49782efe11b23f0", + "rev": "051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4", "type": "github" }, "original": { @@ -400,16 +460,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", - "revCount": 696158, + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", + "revCount": 710050, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.696158%2Brev-2768c7d042a37de65bb1b5b3268fc987e534c49d/0192bd28-d6c0-735c-ab86-8ab9d12f7d62/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2411.710050%2Brev-62c435d93bf046a5396f3016472e8f7c8e2aed65/01938188-9ae4-7095-9c6e-c6e2ce4adf18/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.650378.tar.gz" + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2411.%2A.tar.gz" } }, "nixpkgs-stable": { @@ -430,11 +490,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { @@ -446,11 +506,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "lastModified": 1735915915, + "narHash": "sha256-Q4HuFAvoKAIiTRZTUxJ0ZXeTC7lLfC9/dggGHNXNlCw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5083ec887760adfe12af64830a66807423a859a7", + "rev": "a27871180d30ebee8aa6b11bf7fef8a52f024733", "type": "github" }, "original": { @@ -492,11 +552,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -592,11 +652,11 @@ ] }, "locked": { - "lastModified": 1731703417, - "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", + "lastModified": 1734907020, + "narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8070f36deec723de71e7557441acb17e478204d3", + "rev": "d7f18dda5e511749fa1511185db3536208fb1a63", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index dec9c33..ce26e7c 100644 --- a/home.nix +++ b/home.nix @@ -83,7 +83,7 @@ in htop pv helix - # numbat + numbat hyperfine libnotify @@ -96,7 +96,7 @@ in obsidian - (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) + nerd-fonts.jetbrains-mono lmmath julia-mono ] ++ more-packages @@ -135,7 +135,6 @@ in libsForQt5.krunner-symbols libsForQt5.khotkeys libsForQt5.kio - lmms helm cargo clippy @@ -248,6 +247,7 @@ in #vim-rubocop zig-vim vim-elixir + gruvbox ]; extraConfig = import ./nvim.conf.nix; @@ -346,8 +346,12 @@ in enable = true; }; - # services.emacs.client.enable = true; - # not working right now + # services.emacs = { + # enable = true; + # client.enable = true; + # startWithUserSession = true; + # }; + programs.emacs = { enable = true; package = pkgs.emacs29-pgtk; @@ -360,6 +364,7 @@ in clojure-mode haskell-mode zig-mode + python-mode quack @@ -367,7 +372,8 @@ in all-the-icons-ivy bind-key counsel - gruvbox-theme + doom-themes + paren-face avy consult embark @@ -424,6 +430,5 @@ in services.syncthing = { enable = true; - tray.enable = !darwin; }; } diff --git a/init.el.nix b/init.el.nix index 6e59b58..c434fdd 100644 --- a/init.el.nix +++ b/init.el.nix @@ -46,7 +46,7 @@ pkgs: '(custom-safe-themes '("871b064b53235facde040f6bdfa28d03d9f4b966d8ce28fb1725313731a2bcc8" "a5270d86fac30303c5910be7403467662d7601b821af2ff0c4eb181153ebfc0a" "98ef36d4487bf5e816f89b1b1240d45755ec382c7029302f36ca6626faf44bbd" "ba323a013c25b355eb9a0550541573d535831c557674c8d59b9ac6aa720c21d3" "046a2b81d13afddae309930ef85d458c4f5d278a69448e5a5261a5c78598e012" "d445c7b530713eac282ecdeea07a8fa59692c83045bf84dd112dd738c7bcad1d" default)) '(package-selected-packages - '(idris-mode evil-leader geiser-racket macrostep-geiser geiser-chez srfi erc-hl-nicks scheme-complete evil-commentary evil-surround evil-goggles evil paredit org-roam evil-org gruvbox-theme lsp-scheme counsel general all-the-icons-ivy frog-jump-buffer chess rainbow-delimiters which-key))) + '(idris-mode evil-leader geiser-racket macrostep-geiser geiser-chez srfi erc-hl-nicks scheme-complete evil-commentary evil-surround evil-goggles evil paredit org-roam evil-org lsp-scheme counsel general all-the-icons-ivy frog-jump-buffer chess rainbow-delimiters which-key))) ;; create the autosave dir if necessary, since emacs won't. (make-directory "~/.emacs.d/autosaves/" t) @@ -247,7 +247,7 @@ If the new path's directories does not exist, create them." (use-package emacs :config - (load-theme 'gruvbox-dark-soft)) + (load-theme 'doom-gruvbox t)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; @@ -299,9 +299,6 @@ If the new path's directories does not exist, create them." (use-package counsel :ensure t) -(use-package gruvbox-theme - :ensure t) - ;; (set-fringe-mode 'minimal) (use-package general @@ -821,6 +818,12 @@ If the new path's directories does not exist, create them." ;(define-key sly-prefix-map (kbd "") 'sly-next-completion) ) +(defun toggle-parens () + "toggle between rainbow and dim parens" + (interactive) + (rainbow-delimiters-mode) + (paren-face-mode)) + (add-hook 'sly-db-hook 'turn-off-evil-mode) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -836,33 +839,6 @@ If the new path's directories does not exist, create them." ;; ;; ;; ;; ;; ;;;;;; ;; ;;;;;; ;;;;;; - ; lisp sucks, scheme rulez -;; (defun make-file-opener (filename) -;; (lambda () -;; (interactive (concat "sopen " filename " for editing")) -;; (find-file filename))) - -(defun open-init.el () - (interactive) - (find-file "/etc/nixos/init.el")) -;; (defun open-vim-like.el () -;; (interactive) -;; (find-file "~/.emacs.d/extras/vim-like.el")) -;; (defun open-scheme.el () -;; (interactive) -;; (find-file "~/.emacs.d/extras/scheme.el")) -; emacs lisp really is a pain, but even this makes me appreciate the POWA -; pretty unnecessary lel -; (defun scheme-set-up-two-panels-with-repl-and-editor () -; (interactive) -; (geiser ;needs-arg -; ) -; (geiser-mode)) - -(defun join-libera.chat () - (interactive) - ()) - (use-package evil :ensure t diff --git a/nvim.conf.nix b/nvim.conf.nix index 168972c..01213c1 100644 --- a/nvim.conf.nix +++ b/nvim.conf.nix @@ -11,7 +11,7 @@ let g:ConqueGdb_GdbExe = 'arm-none-eabi-gdb' "===== Code Completion =====" -autocmd BufEnter * call ncm2#enable_for_buffer() +" autocmd BufEnter * call ncm2#enable_for_buffer() set completeopt=noinsert,menuone,noselect " tab to select " and don't hijack my enter key @@ -70,9 +70,9 @@ filetype plugin on au BufRead,BufNewFile *.ml,*.mli compiler ocaml " different color schemes depending on the file type +set t_Co=256 syntax enable -"let g:rehash256 = 1 -colorscheme gruvbox +" colorscheme gruvbox "===== NERDTree =====" diff --git a/vscode-settings.nix b/vscode-settings.nix index a7dddca..9c3e4b8 100644 --- a/vscode-settings.nix +++ b/vscode-settings.nix @@ -59,7 +59,7 @@ "editor.cursorSmoothCaretAnimation" = "on"; "editor.cursorStyle" = "line"; "editor.defaultFormatter" = "denoland.vscode-deno"; - "editor.fontFamily" = "JetBrainsMono Nerd Font"; + "editor.fontFamily" = "JuliaMono"; "editor.fontLigatures" = true; "editor.fontSize" = 16; "editor.formatOnSave" = true;