From 22d94a5ea4f57edfe44d70041049831d5d49ba0a Mon Sep 17 00:00:00 2001 From: Kate Adkins Date: Tue, 26 Nov 2024 17:39:37 -0700 Subject: [PATCH] nix: rework dotfiles to be spec'd in nixos/dotfiles --- flake.nix | 9 ++-- nixos/configs/dotfiles/hm.nix | 48 ------------------ nixos/configs/gui/default.nix | 3 +- nixos/configs/syncthing.nix | 1 + nixos/configs/virt-host.nix | 5 -- nixos/{configs => }/dotfiles/default.nix | 0 nixos/{configs => }/dotfiles/droid.nix | 0 nixos/{configs => }/dotfiles/git.hm.nix | 0 nixos/dotfiles/hm.nix | 47 +++++++++++++++++ .../{configs => }/dotfiles/kakoune-lsp.hm.nix | 6 +-- nixos/{configs => }/dotfiles/kakoune-lsp.nix | 0 nixos/{configs => }/dotfiles/kakoune.hm.nix | 4 +- nixos/{configs => }/dotfiles/kakoune.nix | 0 nixos/{configs => }/dotfiles/neovim-ide.nix | 0 nixos/{configs => }/dotfiles/neovim-line.nix | 0 nixos/{configs => }/dotfiles/neovim-lsp.nix | 0 nixos/{configs => }/dotfiles/neovim.nix | 0 .../dotfiles/talon-community-logo.png | Bin nixos/{configs => }/dotfiles/talon.hm.nix | 2 +- nixos/{configs => }/dotfiles/vscode.hm.nix | 0 nixos/{configs => }/dotfiles/vscode.nix | 0 nixos/hosts/miko.nix | 2 +- 22 files changed, 62 insertions(+), 65 deletions(-) delete mode 100644 nixos/configs/dotfiles/hm.nix rename nixos/{configs => }/dotfiles/default.nix (100%) rename nixos/{configs => }/dotfiles/droid.nix (100%) rename nixos/{configs => }/dotfiles/git.hm.nix (100%) create mode 100644 nixos/dotfiles/hm.nix rename nixos/{configs => }/dotfiles/kakoune-lsp.hm.nix (90%) rename nixos/{configs => }/dotfiles/kakoune-lsp.nix (100%) rename nixos/{configs => }/dotfiles/kakoune.hm.nix (98%) rename nixos/{configs => }/dotfiles/kakoune.nix (100%) rename nixos/{configs => }/dotfiles/neovim-ide.nix (100%) rename nixos/{configs => }/dotfiles/neovim-line.nix (100%) rename nixos/{configs => }/dotfiles/neovim-lsp.nix (100%) rename nixos/{configs => }/dotfiles/neovim.nix (100%) rename nixos/{configs => }/dotfiles/talon-community-logo.png (100%) rename nixos/{configs => }/dotfiles/talon.hm.nix (97%) rename nixos/{configs => }/dotfiles/vscode.hm.nix (100%) rename nixos/{configs => }/dotfiles/vscode.nix (100%) diff --git a/flake.nix b/flake.nix index 1185366..a336413 100644 --- a/flake.nix +++ b/flake.nix @@ -117,10 +117,11 @@ commonModuleSet = [ ./nixos/packages + ./nixos/dotfiles + ./nixos/configs/stylix ./nixos/configs/lix.nix ./nixos/configs/nix.nix - ./nixos/configs/dotfiles ./nixos/configs/calendar.nix ./nixos/configs/syncthing.nix ./nixos/configs/include-conf.nix @@ -154,6 +155,8 @@ waveforms.nixosModule nix-flatpak.nixosModules.nix-flatpak + ./nixos/dotfiles/vscode.nix + ./nixos/packages/gui.nix ./nixos/packages/wine.nix ./nixos/packages/flatpak.nix @@ -163,7 +166,6 @@ ./nixos/configs/flatpak.nix ./nixos/configs/fonts-linux.nix ./nixos/configs/music-server.nix - ./nixos/configs/dotfiles/vscode.nix #./nixos/overlays/fixup-signal ./nixos/overlays/fixup-imhex.nix @@ -409,9 +411,10 @@ ./nixos/hosts/design.nix ./nixos/configuration.droid.nix + ./nixos/dotfiles/droid.nix + ./nixos/configs/nix.droid.nix ./nixos/configs/droid-gui.nix - ./nixos/configs/dotfiles/droid.nix ./nixos/configs/flake-registry.nix ./nixos/packages/droid.nix diff --git a/nixos/configs/dotfiles/hm.nix b/nixos/configs/dotfiles/hm.nix deleted file mode 100644 index c88505f..0000000 --- a/nixos/configs/dotfiles/hm.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ ... }: -{ - home.username = "deprekated"; - home.homeDirectory = "/home/deprekated"; - - # Tie our configruation to the version it was written for. - home.stateVersion = "24.05"; - - # - # "Raw file" dotfiles. - # These aren't generated by Nix, specifically so we can use them on Windows as well. - # - - # xonsh - xdg.configFile.xonsh.source = ../../../xonsh; - - # wezterm - xdg.configFile.wezterm.source = ../../../wezterm; - - # calendar / contact sync - xdg.configFile.khal.source = ../../../khal; - xdg.configFile.vdirsyncer.source = ../../../vdirsyncer; - - # looking-glass - xdg.configFile.looking-glass.source = ../../../looking-glass; - - # neovim - xdg.configFile.nvim.source = ../../../nvim; - - # tmux - xdg.configFile.tmux.source = ../../../tmux; - - # espanso - xdg.configFile.espanso.source = ../../../espanso; - - # kakoune - #xdg.configFile."kak/autoload".source = ../../../kak/autoload; - xdg.configFile."kak/wezterm-tab.kak".source = ../../../kak/wezterm-tab.kak; - xdg.configFile."kak/sudo-write.kak".source = ../../../kak/sudo-write.kak; - - # taskwarrior - xdg.configFile."task/taskrc".source = ../../../taskwarrior/taskrc; - xdg.dataFile."task/hooks".source = ../../../taskwarrior/hooks; - - # talon - home.file.".talon/user".source = ../../../talon; - -} diff --git a/nixos/configs/gui/default.nix b/nixos/configs/gui/default.nix index 4b6bc4e..79ea687 100644 --- a/nixos/configs/gui/default.nix +++ b/nixos/configs/gui/default.nix @@ -49,7 +49,6 @@ wtype wl-clipboard brightnessctl - sddm-chili-theme nirilock-fancy xdg-desktop-portal-gtk @@ -136,7 +135,7 @@ enable = true; autoNumlock = true; #wayland.enable = true; - theme = "chili"; + #theme = "chili"; }; }; diff --git a/nixos/configs/syncthing.nix b/nixos/configs/syncthing.nix index f9dd4cd..f7e25a4 100644 --- a/nixos/configs/syncthing.nix +++ b/nixos/configs/syncthing.nix @@ -10,6 +10,7 @@ let "trailblazer" = { id = "JASHWW7-AYYTQLN-QZ6OEOX-EZK4GPA-OYW5IZS-5KAIIVR-MMXMCHL-OERDBQ2"; }; "aigis" = { id = "VKRQ6Q4-CCLJR2I-ECOWXRE-TANA2QZ-BJIAPCN-FFVJSB4-GYJNS4R-Z3LLHQ5"; }; "hinata" = { id = "2SFRG2A-AZ3XPMN-H3RK2Z6-UXPBPIN-DJN7AMN-JBOY23D-EZGFYNR-HRBI2AY"; }; + "miko" = { id = "BTJ3C7W-DBPNTTV-NBKNLNM-SYSGFRZ-VG7ODVU-66RQTO7-XXHYXEY-HX323A6"; }; }; in { diff --git a/nixos/configs/virt-host.nix b/nixos/configs/virt-host.nix index 468e460..e8a2ec2 100644 --- a/nixos/configs/virt-host.nix +++ b/nixos/configs/virt-host.nix @@ -10,11 +10,6 @@ # Enable USB passthrough. virtualisation.spiceUSBRedirection.enable = true; - # Set our system to use libvirt, too. - boot.kernelModules = [ - "kvm-amd" - "kvm-intel" - ]; environment.systemPackages = with pkgs; [ libvirt virtiofsd diff --git a/nixos/configs/dotfiles/default.nix b/nixos/dotfiles/default.nix similarity index 100% rename from nixos/configs/dotfiles/default.nix rename to nixos/dotfiles/default.nix diff --git a/nixos/configs/dotfiles/droid.nix b/nixos/dotfiles/droid.nix similarity index 100% rename from nixos/configs/dotfiles/droid.nix rename to nixos/dotfiles/droid.nix diff --git a/nixos/configs/dotfiles/git.hm.nix b/nixos/dotfiles/git.hm.nix similarity index 100% rename from nixos/configs/dotfiles/git.hm.nix rename to nixos/dotfiles/git.hm.nix diff --git a/nixos/dotfiles/hm.nix b/nixos/dotfiles/hm.nix new file mode 100644 index 0000000..22433b7 --- /dev/null +++ b/nixos/dotfiles/hm.nix @@ -0,0 +1,47 @@ +{ config, lib, ... }: +{ + home.username = "deprekated"; + home.homeDirectory = "/home/deprekated"; + + # Tie our configruation to the version it was written for. + home.stateVersion = "24.05"; + + # + # "Raw file" dotfiles. + # These aren't generated by Nix, specifically so we can use them on Windows as well. + # + + # xonsh + xdg.configFile.xonsh.source = ../../xonsh; + + # wezterm + xdg.configFile.wezterm.source = ../../wezterm; + + # calendar / contact sync + xdg.configFile.khal.source = ../../khal; + xdg.configFile.vdirsyncer.source = ../../vdirsyncer; + + # looking-glass + xdg.configFile.looking-glass.source = ../../looking-glass; + + # neovim + xdg.configFile.nvim.source = ../../nvim; + + # tmux + xdg.configFile.tmux.source = ../../tmux; + + # espanso + xdg.configFile.espanso.source = ../../espanso; + + # kakoune + #xdg.configFile."kak/autoload".source = ../../../kak/autoload; + xdg.configFile."kak/wezterm-tab.kak".source = ../../kak/wezterm-tab.kak; + xdg.configFile."kak/sudo-write.kak".source = ../../kak/sudo-write.kak; + + # taskwarrior + xdg.configFile."task/taskrc".source = ../../taskwarrior/taskrc; + xdg.dataFile."task/hooks".source = ../../taskwarrior/hooks; + + # place our gtk2-rc in a place where it won't conflict + gtk.gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; +} diff --git a/nixos/configs/dotfiles/kakoune-lsp.hm.nix b/nixos/dotfiles/kakoune-lsp.hm.nix similarity index 90% rename from nixos/configs/dotfiles/kakoune-lsp.hm.nix rename to nixos/dotfiles/kakoune-lsp.hm.nix index fa54a49..83ab3f4 100644 --- a/nixos/configs/dotfiles/kakoune-lsp.hm.nix +++ b/nixos/dotfiles/kakoune-lsp.hm.nix @@ -4,9 +4,9 @@ { ... }: { # General LSP configuration. - xdg.configFile."kak-lsp/kak-lsp.toml".source = ../../../kak/kak-lsp.toml; - xdg.configFile."kak-tree-sitter/config.toml".source = ../../../kak/kak-tree-sitter.toml; - xdg.configFile."kak/colors".source = ../../../kak/colors; + xdg.configFile."kak-lsp/kak-lsp.toml".source = ../../kak/kak-lsp.toml; + xdg.configFile."kak-tree-sitter/config.toml".source = ../../kak/kak-tree-sitter.toml; + xdg.configFile."kak/colors".source = ../../kak/colors; programs.kakoune.config = { diff --git a/nixos/configs/dotfiles/kakoune-lsp.nix b/nixos/dotfiles/kakoune-lsp.nix similarity index 100% rename from nixos/configs/dotfiles/kakoune-lsp.nix rename to nixos/dotfiles/kakoune-lsp.nix diff --git a/nixos/configs/dotfiles/kakoune.hm.nix b/nixos/dotfiles/kakoune.hm.nix similarity index 98% rename from nixos/configs/dotfiles/kakoune.hm.nix rename to nixos/dotfiles/kakoune.hm.nix index 131b56e..5335b19 100644 --- a/nixos/configs/dotfiles/kakoune.hm.nix +++ b/nixos/dotfiles/kakoune.hm.nix @@ -134,7 +134,7 @@ colorscheme solarized-darker # Use wezterm when possible, and tmux otherwise. - source ${../../../kak/wezterm-tab.kak} + source ${../../kak/wezterm-tab.kak} set global windowing_modules 'wezterm-tab' 'tmux' # Enable auotmatic hovering. @@ -161,7 +161,7 @@ } # Misc plugins. - source ${../../../kak/sudo-write.kak} + source ${../../kak/sudo-write.kak} ''; plugins = with pkgs.kakounePlugins; [ diff --git a/nixos/configs/dotfiles/kakoune.nix b/nixos/dotfiles/kakoune.nix similarity index 100% rename from nixos/configs/dotfiles/kakoune.nix rename to nixos/dotfiles/kakoune.nix diff --git a/nixos/configs/dotfiles/neovim-ide.nix b/nixos/dotfiles/neovim-ide.nix similarity index 100% rename from nixos/configs/dotfiles/neovim-ide.nix rename to nixos/dotfiles/neovim-ide.nix diff --git a/nixos/configs/dotfiles/neovim-line.nix b/nixos/dotfiles/neovim-line.nix similarity index 100% rename from nixos/configs/dotfiles/neovim-line.nix rename to nixos/dotfiles/neovim-line.nix diff --git a/nixos/configs/dotfiles/neovim-lsp.nix b/nixos/dotfiles/neovim-lsp.nix similarity index 100% rename from nixos/configs/dotfiles/neovim-lsp.nix rename to nixos/dotfiles/neovim-lsp.nix diff --git a/nixos/configs/dotfiles/neovim.nix b/nixos/dotfiles/neovim.nix similarity index 100% rename from nixos/configs/dotfiles/neovim.nix rename to nixos/dotfiles/neovim.nix diff --git a/nixos/configs/dotfiles/talon-community-logo.png b/nixos/dotfiles/talon-community-logo.png similarity index 100% rename from nixos/configs/dotfiles/talon-community-logo.png rename to nixos/dotfiles/talon-community-logo.png diff --git a/nixos/configs/dotfiles/talon.hm.nix b/nixos/dotfiles/talon.hm.nix similarity index 97% rename from nixos/configs/dotfiles/talon.hm.nix rename to nixos/dotfiles/talon.hm.nix index 5ffa0fa..577eee0 100644 --- a/nixos/configs/dotfiles/talon.hm.nix +++ b/nixos/dotfiles/talon.hm.nix @@ -2,7 +2,7 @@ { # talon configuration home.file.".talon/user" = { - source = ../../../talon; + source = ../../talon; recursive = true; }; diff --git a/nixos/configs/dotfiles/vscode.hm.nix b/nixos/dotfiles/vscode.hm.nix similarity index 100% rename from nixos/configs/dotfiles/vscode.hm.nix rename to nixos/dotfiles/vscode.hm.nix diff --git a/nixos/configs/dotfiles/vscode.nix b/nixos/dotfiles/vscode.nix similarity index 100% rename from nixos/configs/dotfiles/vscode.nix rename to nixos/dotfiles/vscode.nix diff --git a/nixos/hosts/miko.nix b/nixos/hosts/miko.nix index 7f5b14b..5f5f512 100644 --- a/nixos/hosts/miko.nix +++ b/nixos/hosts/miko.nix @@ -36,7 +36,7 @@ # # Hardware configuration. # - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "apple-bce" "appletbdrm" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ];