prep arielle

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; };

home/desktop-full.nix

@@ -1,15 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./desktop-slim.nix
-
-    ./messaging.nix
-    ./r.nix
-    ./tex.nix
-    ./mail
-    ./office-gui.nix
-    ./office-cli.nix
-    ./aichat.nix
-  ];
-}

home/devel.nix

@@ -6,13 +6,8 @@
   '';
 
   home.packages = with pkgs; [
-    bundler
-    bundix
     nodejs
-    yarn-berry
-    yq
-    duckdb
-    tippecanoe
-    pmtiles
   ];
+
+  programs.direnv.enable = true;
 }

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";

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\<tab>yaml_note\<tab>"
-" endfunction

home/nvim/default.nix

@@ -136,7 +136,7 @@
       {
         plugin = papercolor-theme;
         config = ''
-          " set background=light
+          set background=light
           colorscheme PaperColor
         '';
       }

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
+  ];
+}

home/profiles/desktop-slim.nix

@@ -4,13 +4,14 @@
   imports = [
     ./minimal.nix
 
-    ./devel.nix
+    ../devel.nix
-    ./firefox.nix
+    ../firefox.nix
-    ./fonts.nix
+    ../fonts.nix
-    ./foot.nix
+    ../foot.nix
-    ./media.nix
+    ../media.nix
-    # ./plasma.nix
+    ../user-dirs.nix
-    ./user-dirs.nix
+    ../gpg.nix
+    ../password-store.nix
   ];
 
   home.packages = with pkgs; [

home/profiles/minimal.nix

@@ -10,23 +10,22 @@
     fastfetch
     fzf
     jq
+    nh
     nix-search
     progress
     rename
     silver-searcher
     tldr
     tmux
+    yq
   ];
 
   imports = [
-    ./fish.nix
+    ../fish.nix
-    ./vifm.nix
+    ../vifm.nix
-    ./nvim
+    ../nvim
-
+    ../tmux.nix
-    ./tmux.nix
+    ../ssh.nix
-    ./gpg.nix
-    ./ssh.nix
-    ./password-store.nix
   ];
 
   programs.nix-index = {

hosts/arielle/default.nix

@@ -5,7 +5,7 @@
   networking.domain = "ktiu.net";
 
   imports = [
-    ./hardware
+    ./hardware-configuration.nix
     ../system
     ../system/web-server
     ../system/mail-server

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