From 859036ba7c81bd730dc84ac060d6853322a4ffbb Mon Sep 17 00:00:00 2001 From: lulusilly Date: Fri, 13 Mar 2026 10:57:48 -0400 Subject: [PATCH] Added Emacs nix module and modified things here and there. --- nix/flake.nix | 4 +- nix/hosts/common.nix | 2 +- nix/hosts/dotfiles/.emacs.d/init.el | 2 + nix/hosts/dotfiles/ghostty/config | 15 ++++++- nix/hosts/hilbert/configuration.nix | 27 ------------ nix/hosts/hilbert/hardware-configuration.nix | 41 ------------------- nix/hosts/home.nix | 14 +++---- nix/hosts/kirigiri/configuration.nix | 17 ++++++++ nix/hosts/kirigiri/hardware-configuration.nix | 33 +++++++++++++++ nix/modules/emacs.nix | 12 ++++++ 10 files changed, 85 insertions(+), 82 deletions(-) delete mode 100644 nix/hosts/hilbert/configuration.nix delete mode 100644 nix/hosts/hilbert/hardware-configuration.nix create mode 100644 nix/hosts/kirigiri/configuration.nix create mode 100644 nix/hosts/kirigiri/hardware-configuration.nix create mode 100644 nix/modules/emacs.nix diff --git a/nix/flake.nix b/nix/flake.nix index 0f53a39..46f2ce1 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -9,12 +9,12 @@ }; outputs = { self, nixpkgs, ... }@inputs: { nixosConfigurations = { - hilbert = nixpkgs.lib.nixosSystem { + kirigiri = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit inputs;}; modules = [ ./hosts/common.nix - ./hosts/hilbert/configuration.nix + ./hosts/kirigiri/configuration.nix ]; }; cantor = nixpkgs.lib.nixosSystem { diff --git a/nix/hosts/common.nix b/nix/hosts/common.nix index e30a877..655fff2 100644 --- a/nix/hosts/common.nix +++ b/nix/hosts/common.nix @@ -57,7 +57,7 @@ # Browser programs.firefox.enable = true; # Flatpak - services.flatpak.enable = true; + # services.flatpak.enable = true; # Tailscale services.tailscale.enable = true; # GPG diff --git a/nix/hosts/dotfiles/.emacs.d/init.el b/nix/hosts/dotfiles/.emacs.d/init.el index fe9ec38..befb419 100644 --- a/nix/hosts/dotfiles/.emacs.d/init.el +++ b/nix/hosts/dotfiles/.emacs.d/init.el @@ -14,6 +14,7 @@ ) ;; Set default tab width (in spaces) (setq-default tab-width 2) +(setq-default standard-indent 2) ;; Store customizations in a separate file (setq custom-file (expand-file-name "custom.el" user-emacs-directory)) ;; Load it if the file exists @@ -64,6 +65,7 @@ (use-package gruvbox-theme) ;; Gruvbox is comfy (load-theme 'gruvbox-dark-hard) ;; Dark because I'm a parasite ; For Unix-like operating systems only running the GUI. +(set-frame-parameter nil 'alpha-background 80) (add-to-list 'default-frame-alist '(alpha-background . 80)) (use-package doom-modeline :ensure t diff --git a/nix/hosts/dotfiles/ghostty/config b/nix/hosts/dotfiles/ghostty/config index 77991fb..71d27de 100644 --- a/nix/hosts/dotfiles/ghostty/config +++ b/nix/hosts/dotfiles/ghostty/config @@ -1,10 +1,21 @@ -font-family = "Miracode" +font-family = "Monocraft" background-opacity = 0.8 theme = "IC_Orange_PPL" mouse-hide-while-typing = true -keybind = ctrl+n=new_window +keybind = ctrl+shift+r=reload_config + +keybind = ctrl+w=close_surface +keybind = ctrl+shift+f=toggle_fullscreen + +keybind = global:ctrl+q=toggle_quick_terminal + +keybind = ctrl+t=new_tab +keybind = ctrl+n=next_tab +keybind = ctrl+p=previous_tab + +keybind = ctrl+shift+n=new_window keybind = ctrl+h=goto_split:left keybind = ctrl+j=goto_split:down keybind = ctrl+k=goto_split:up diff --git a/nix/hosts/hilbert/configuration.nix b/nix/hosts/hilbert/configuration.nix deleted file mode 100644 index c53b041..0000000 --- a/nix/hosts/hilbert/configuration.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ config, pkgs, inputs, ... }: - -{ - imports = - [ - ./hardware-configuration.nix - ../../modules/kanata/kanata.nix - ../../modules/efi.nix - ../../modules/laptop.nix - ../../modules/hypr.nix - ../../modules/virt.nix - ]; - - fileSystems."/media/music" = { - device = "/dev/disk/by-uuid/dcd8c4de-96af-4d71-badb-5ed63b7c2c39"; - fsType = "xfs"; - }; - - fileSystems."/media/vm" = { - device = "/dev/disk/by-uuid/9678bbf2-bf4d-43bb-b0e4-d7cb68915da1"; - fsType = "xfs"; - }; - - networking.hostName = "hilbert"; - - system.stateVersion = "25.11"; -} diff --git a/nix/hosts/hilbert/hardware-configuration.nix b/nix/hosts/hilbert/hardware-configuration.nix deleted file mode 100644 index 68587e1..0000000 --- a/nix/hosts/hilbert/hardware-configuration.nix +++ /dev/null @@ -1,41 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/28c806ac-9082-40fc-8bd3-da38f4c12ae5"; - fsType = "xfs"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/12CE-A600"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/44fbfcf1-382f-4224-ae4c-60c3379f2daf"; } - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/nix/hosts/home.nix b/nix/hosts/home.nix index 2f7fe63..bbdd3f0 100644 --- a/nix/hosts/home.nix +++ b/nix/hosts/home.nix @@ -55,7 +55,7 @@ oh-my-zsh = { enable = true; plugins = [ "git" ]; - theme = "lambda"; + theme = "half-life"; }; }; @@ -64,7 +64,7 @@ userName = "lulusilly"; userEmail = "lunita@puppygirl.onl"; aliases = { - ci = "commit -m"; + c = "commit -m"; co = "checkout"; s = "status"; pu = "push origin master"; @@ -105,15 +105,13 @@ sxiv # Minimal image viewer mpv # Media player zathura # PDF/CBZ/EPUB/DJVU reader - tmux # Tride and true terminal multiplexer obsidian # For epic note taking (really just mediocre journaling) keepassxc # Secure password manager - syncthing # File syncing ghostty # Terminal emulator irssi # Terminal IRC client - nyxt # Customizable browser - cmus # C Music Player (TUI) - deadbeef # Closest thing to foobar2000 native on Linux + qutebrowser # Neat browser with vim keybindings + # nyxt # Customizable browser + fooyin # Closest thing to foobar2000 native on Linux nicotine-plus # FOSS client for SoulSeek kdePackages.dolphin # GUI File Manager # Fonts @@ -132,8 +130,6 @@ ".emacs.d/init.el" .source = dotfiles/.emacs.d/init.el; # MPV ".config/mpv/mpv.conf" .source = dotfiles/mpv/mpv.conf; - # Btop - # ".config/btop/btop.conf" .source = dotfiles/btop/btop.conf; # Neofetch ".config/neofetch/config.conf" .source = dotfiles/neofetch/config.conf; # Hyprland diff --git a/nix/hosts/kirigiri/configuration.nix b/nix/hosts/kirigiri/configuration.nix new file mode 100644 index 0000000..4769f33 --- /dev/null +++ b/nix/hosts/kirigiri/configuration.nix @@ -0,0 +1,17 @@ +{ config, pkgs, inputs, ... }: + +{ + imports = + [ + ./hardware-configuration.nix + ../../modules/kanata/kanata.nix + ../../modules/efi.nix + ../../modules/laptop.nix + ../../modules/hypr.nix + ../../modules/emacs.nix + ]; + + networking.hostName = "kirigiri"; + + system.stateVersion = "25.11"; +} diff --git a/nix/hosts/kirigiri/hardware-configuration.nix b/nix/hosts/kirigiri/hardware-configuration.nix new file mode 100644 index 0000000..48864dd --- /dev/null +++ b/nix/hosts/kirigiri/hardware-configuration.nix @@ -0,0 +1,33 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/1cf9f882-6a8b-4f41-b6d2-c4533b2de98c"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/12CE-A600"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/33ef7c7f-5728-423a-a27b-810381c2b968"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/nix/modules/emacs.nix b/nix/modules/emacs.nix new file mode 100644 index 0000000..494d7ea --- /dev/null +++ b/nix/modules/emacs.nix @@ -0,0 +1,12 @@ +{ config, lib, pkgs, inputs, ...}: + +{ + programs.emacs = { + enable = true; + package = pkgs.emacs-gtk; + extraPackages = epkgs: [ + epkgs.nix-mode + epkgs.nixfmt + ]; + }; +}