From 82115af2528ce1b1cfc9c26998766a6fa19a9e47 Mon Sep 17 00:00:00 2001 From: Till Date: Thu, 5 Mar 2026 09:11:17 +0100 Subject: [PATCH] prep arielle --- flake.nix | 4 +--- home/desktop-full.nix | 15 --------------- home/devel.nix | 9 ++------- home/fish.nix | 2 -- home/nvim/config.vim | 7 ------- home/nvim/default.nix | 2 +- home/profiles/desktop-full.nix | 15 +++++++++++++++ home/{ => profiles}/desktop-slim.nix | 15 ++++++++------- home/{ => profiles}/minimal.nix | 15 +++++++-------- home/{ => profiles}/on-server.nix | 0 hosts/arielle/default.nix | 2 +- .../{hardware.nix => hardware-configuration.nix} | 0 hosts/nova/default.nix | 3 --- 13 files changed, 35 insertions(+), 54 deletions(-) delete mode 100644 home/desktop-full.nix create mode 100644 home/profiles/desktop-full.nix rename home/{ => profiles}/desktop-slim.nix (64%) rename home/{ => profiles}/minimal.nix (85%) rename home/{ => profiles}/on-server.nix (100%) rename hosts/arielle/{hardware.nix => hardware-configuration.nix} (100%) diff --git a/flake.nix b/flake.nix index 31617a5..2c06763 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,7 @@ till = { imports = [ - ./home/on-server.nix + ./home/minimal.nix ./users/till/home.nix ]; }; @@ -62,9 +62,7 @@ nova = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; modules = [ - ./hosts/nova - home-manager.nixosModules.home-manager { home-manager = { extraSpecialArgs = { inherit inputs; }; diff --git a/home/desktop-full.nix b/home/desktop-full.nix deleted file mode 100644 index 3ff2da1..0000000 --- a/home/desktop-full.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ ... }: - -{ - imports = [ - ./desktop-slim.nix - - ./messaging.nix - ./r.nix - ./tex.nix - ./mail - ./office-gui.nix - ./office-cli.nix - ./aichat.nix - ]; -} diff --git a/home/devel.nix b/home/devel.nix index 0ff875b..27817b2 100644 --- a/home/devel.nix +++ b/home/devel.nix @@ -6,13 +6,8 @@ ''; home.packages = with pkgs; [ - bundler - bundix nodejs - yarn-berry - yq - duckdb - tippecanoe - pmtiles ]; + + programs.direnv.enable = true; } diff --git a/home/fish.nix b/home/fish.nix index b8fd587..16997a5 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -1,7 +1,6 @@ { config, ... }: { - home.shellAliases = { top = "btm --battery"; du = "dust"; @@ -13,7 +12,6 @@ }; programs.fish = { - enable = true; interactiveShellInit = "fish_add_path ${config.xdg.dataHome}/npm/packages/bin"; diff --git a/home/nvim/config.vim b/home/nvim/config.vim index 166132d..94efc9a 100644 --- a/home/nvim/config.vim +++ b/home/nvim/config.vim @@ -60,10 +60,3 @@ endfunction function Diary() execute "VimwikiMakeDiaryNote" endfunction - -" function CreateNote(title) -" execute "file ~/notes/" . strftime("%Y-%m-%d") . "_" . join(split(tolower(a:title)), "_") . ".md" -" execute "set ft=markdown" -" execute "normal! i" . a:title -" execute "normal V\yaml_note\" -" endfunction diff --git a/home/nvim/default.nix b/home/nvim/default.nix index f7e9cfc..e982334 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -136,7 +136,7 @@ { plugin = papercolor-theme; config = '' - " set background=light + set background=light colorscheme PaperColor ''; } diff --git a/home/profiles/desktop-full.nix b/home/profiles/desktop-full.nix new file mode 100644 index 0000000..c786f38 --- /dev/null +++ b/home/profiles/desktop-full.nix @@ -0,0 +1,15 @@ +{ ... }: + +{ + imports = [ + ./desktop-slim.nix + + ../messaging.nix + ../r.nix + ../tex.nix + ../mail + ../office-gui.nix + ../office-cli.nix + ../aichat.nix + ]; +} diff --git a/home/desktop-slim.nix b/home/profiles/desktop-slim.nix similarity index 64% rename from home/desktop-slim.nix rename to home/profiles/desktop-slim.nix index 66f0da4..15dac09 100644 --- a/home/desktop-slim.nix +++ b/home/profiles/desktop-slim.nix @@ -4,13 +4,14 @@ imports = [ ./minimal.nix - ./devel.nix - ./firefox.nix - ./fonts.nix - ./foot.nix - ./media.nix - # ./plasma.nix - ./user-dirs.nix + ../devel.nix + ../firefox.nix + ../fonts.nix + ../foot.nix + ../media.nix + ../user-dirs.nix + ../gpg.nix + ../password-store.nix ]; home.packages = with pkgs; [ diff --git a/home/minimal.nix b/home/profiles/minimal.nix similarity index 85% rename from home/minimal.nix rename to home/profiles/minimal.nix index a33684c..6fbf2a8 100644 --- a/home/minimal.nix +++ b/home/profiles/minimal.nix @@ -10,23 +10,22 @@ fastfetch fzf jq + nh nix-search progress rename silver-searcher tldr tmux + yq ]; imports = [ - ./fish.nix - ./vifm.nix - ./nvim - - ./tmux.nix - ./gpg.nix - ./ssh.nix - ./password-store.nix + ../fish.nix + ../vifm.nix + ../nvim + ../tmux.nix + ../ssh.nix ]; programs.nix-index = { diff --git a/home/on-server.nix b/home/profiles/on-server.nix similarity index 100% rename from home/on-server.nix rename to home/profiles/on-server.nix diff --git a/hosts/arielle/default.nix b/hosts/arielle/default.nix index 1c6bee4..0503bda 100644 --- a/hosts/arielle/default.nix +++ b/hosts/arielle/default.nix @@ -5,7 +5,7 @@ networking.domain = "ktiu.net"; imports = [ - ./hardware + ./hardware-configuration.nix ../system ../system/web-server ../system/mail-server diff --git a/hosts/arielle/hardware.nix b/hosts/arielle/hardware-configuration.nix similarity index 100% rename from hosts/arielle/hardware.nix rename to hosts/arielle/hardware-configuration.nix diff --git a/hosts/nova/default.nix b/hosts/nova/default.nix index 1ffb75e..482b1bf 100644 --- a/hosts/nova/default.nix +++ b/hosts/nova/default.nix @@ -11,9 +11,6 @@ ../../system/desktop ../../system/desktop/ergodox-udev.nix # ../../system/desktop/gnome.nix - # ../../system/desktop/hyprland.nix - # ../../system/desktop/cast.nix - # ../../system/desktop/plasma.nix ../../system/desktop/cosmic.nix ../../system/desktop/steam.nix ../../system/desktop/yubikey-pam.nix