From f64c0e35bf10a64f46f450154c8d251e9b6188f3 Mon Sep 17 00:00:00 2001 From: prescientmoon Date: Fri, 11 Oct 2024 12:40:05 +0200 Subject: [PATCH] Fix lapetus again - remove lapetus home manager usage - try to fix nixos hardware import error --- home/calypso.nix | 18 +++++++++--------- home/features/neovim/default.nix | 1 + home/lapetus.nix | 4 ---- hosts/nixos/lapetus/hardware/default.nix | 1 - 4 files changed, 10 insertions(+), 14 deletions(-) delete mode 100644 home/lapetus.nix diff --git a/home/calypso.nix b/home/calypso.nix index f747a64..d21cb2f 100644 --- a/home/calypso.nix +++ b/home/calypso.nix @@ -3,19 +3,19 @@ imports = [ ./global.nix - ./features/desktop/zathura.nix - ./features/desktop/spotify.nix - ./features/desktop/obsidian.nix - ./features/desktop/foot.nix - ./features/desktop/steam.nix - ./features/desktop/edopro.nix - ./features/desktop/firefox - ./features/desktop/discord - ./features/cli/productivity ./features/cli/catgirl.nix ./features/cli/lazygit.nix ./features/cli/nix-index.nix + ./features/cli/productivity ./features/cli/zellij.nix + ./features/desktop/discord + ./features/desktop/edopro.nix + ./features/desktop/firefox + ./features/desktop/foot.nix + ./features/desktop/obsidian.nix + ./features/desktop/spotify.nix + ./features/desktop/steam.nix + ./features/desktop/zathura.nix ./features/wayland/hyprland ./features/neovim ]; diff --git a/home/features/neovim/default.nix b/home/features/neovim/default.nix index dd5a7d3..8603085 100644 --- a/home/features/neovim/default.nix +++ b/home/features/neovim/default.nix @@ -51,6 +51,7 @@ let list = false; # I don't want to show things like tabs cmdheight = 0; # Hide command line when it's not getting used spell = true; # Spell checker + signcolumn = "yes"; # Keeps the sign column of a consistent width # tcqj are there by default, and "r" automatically continues comments on enter formatoptions = "tcqjr"; diff --git a/home/lapetus.nix b/home/lapetus.nix deleted file mode 100644 index 9001202..0000000 --- a/home/lapetus.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - imports = [ ./global.nix ]; - home.stateVersion = "23.05"; -} diff --git a/hosts/nixos/lapetus/hardware/default.nix b/hosts/nixos/lapetus/hardware/default.nix index c0a42e8..107fa49 100644 --- a/hosts/nixos/lapetus/hardware/default.nix +++ b/hosts/nixos/lapetus/hardware/default.nix @@ -2,7 +2,6 @@ { imports = with inputs.nixos-hardware.nixosModules; [ common-cpu-intel - common-gpu-intel common-pc-laptop common-pc-laptop-hdd common-pc-hdd