another one

home/desktop/window-managers/niri.nix

@@ -75,10 +75,11 @@ binds {
 	  ${modifier}+${osConfig.keybinds.hotkeys.terminal} { spawn "${osConfig.terminal.binary}";}
     ${modifier}+Left {focus-column-left; }
     ${modifier}+Right {focus-column-right; }
-    ${modifier}+${osConfig.keybinds.hotkeys.browser} { spawn "zen";}
-    ${modifier}+${osConfig.keybinds.hotkeys.launcher} { spawn "walker";}
+    ${modifier}+${osConfig.keybinds.hotkeys.browser} { spawn "${osConfig.apps.browser.default}";}
+    ${modifier}+${osConfig.keybinds.hotkeys.launcher} { spawn "${osConfig.desktop.window-managers.shell.launcher.default}";}
     Print { screenshot;}
-    ${modifier}+Shift+Q { close-window; }
+    ${modifier}+Shift+${osConfig.keybinds.hotkeys.close-window} { close-window; }
+    ${modifier}+Shift+${osConfig.keybinds.hotkeys.editor} { spawn "${osConfig.apps.development.editor.default}";}
 }
 
 spawn-at-startup "elephant"

home/modules/connectivity/default.nix

@@ -1,15 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [
-    ./internet
-    ./bluetooth
-    ./mounts
-    ./social-media
-  ];
-}

home/modules/defaults/default.nix

@@ -1,60 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  lib,
-  ...
-}:
-
-{
-  options = {
-    device = {
-      type = {
-        laptop = lib.mkEnableOption "laptop";
-        desktop = lib.mkEnableOption "desktop";
-        server = lib.mkEnableOption "server";
-      };
-    };
-  };
-  imports = [
-    ./laptop.nix
-    ./desktop.nix
-    ./server.nix
-  ];
-  config = {
-    development = lib.mkDefault {
-      git.enable = true;
-    };
-    terminal = lib.mkDefault {
-      ranger.enable = true;
-    };
-    misc = lib.mkDefault {
-      bitwarden.enable = true;
-    };
-    internet.tor.enable = true;
-    syncthing = lib.mkDefault {
-      devices = {
-        marty-pc = {
-          id = "6PJZD52-EEWIO7U-MZMJJ5B-33DGNSU-O7DJVRT-GAE7QZG-ZY3VIMV-VSMBDQP";
-          autoAcceptFolder = true;
-        };
-        marty-server = {
-          id = "UDMXEKZ-HYIFI5S-VAKE75O-K3C65QV-LS43QA5-3JTHWKL-CI5C3Y6-P4NSQQM";
-          autoAcceptFolders = true;
-        };
-        marty-latitude = {
-          id = "SOAWHKA-BCQGO5G-IJ24WTO-RDETP5M-LNTVO66-MHIOUU2-NNQ57P6-FFKNSA6";
-          autoAcceptFolders = true;
-        };
-        marty-pixel = {
-          id = "GSBXOGW-6SYLDUQ-HPH7FBJ-CKHWQIK-K5YORB4-CYKGYT6-DLCVSAK-LA2RMAK";
-          autoAcceptFolders = true;
-        };
-        marty-fairphone = {
-          id = "2ISVWQV-4USY5IA-2OU55CE-Q7VLPD7-4RVQ5WX-FXQSJMY-2ES4EZG-IGFB7QG";
-          autoAcceptFolders = true;
-        };
-      };
-    };
-  };
-}

home/modules/defaults/desktop.nix

@@ -1,58 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  lib,
-  ...
-}:
-
-{
-  config = lib.mkIf config.device.type.desktop {
-    development = lib.mkDefault {
-      vscodium.enable = true;
-      godot.enable = true;
-      python.enable = true;
-    };
-    terminal = lib.mkDefault {
-      kitty.enable = true;
-    };
-    desktop = lib.mkDefault {
-      hyprland = {
-        enable = true;
-        numlock = true;
-      };
-      # waybar.enable = true;
-      walker.enable = true;
-      wallpaper.enable = true;
-      grimblast.enable = true;
-      audio.enable = true;
-      noctalia.enable = true;
-    };
-    messaging.enable = true;
-    internet = lib.mkDefault {
-      browsers = {
-        zen-browser = {
-          enable = true;
-        };
-        tor-browser = {
-          enable = true;
-        };
-      };
-      mail = {
-        enable = true;
-        providers.protonmail.enable = true;
-      };
-      rss.enable = true;
-    };
-    bluetooth.enable = true;
-    media = {
-      images.enable = true;
-      video.enable = true;
-      audio.enable = true;
-      threeD.enable = true;
-    };
-    misc = {
-      obsidian.enable = true;
-    };
-  };
-}

home/modules/defaults/laptop.nix

@@ -1,51 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  lib,
-  ...
-}:
-
-{
-  config = lib.mkIf config.device.type.laptop {
-    home.packages = with pkgs; [
-      light
-    ];
-    development = lib.mkDefault {
-      vscodium.enable = true;
-    };
-    terminal = lib.mkDefault {
-      kitty.enable = true;
-    };
-    desktop = lib.mkDefault {
-      hyprland = {
-        enable = true;
-      };
-      # waybar.enable = true;
-      walker.enable = true;
-      wallpaper.enable = true;
-      grimblast.enable = true;
-      audio.enable = true;
-      noctalia.enable = true;
-    };
-    messaging.enable = true;
-    internet = lib.mkDefault {
-      browsers = {
-        zen-browser = {
-          enable = true;
-        };
-      };
-      mail = {
-        enable = true;
-        providers.protonmail.enable = true;
-      };
-      rss.enable = true;
-    };
-    bluetooth.enable = true;
-    media = {
-      images.nomacs.enable = true;
-      video.mpv.enable = true;
-      video.tsukimi.enable = true;
-    };
-  };
-}

home/modules/defaults/server.nix

@@ -1,11 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  lib,
-  ...
-}:
-
-{
-  
-}

home/modules/misc/secrets.nix

@@ -1,17 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  home.packages = with pkgs; [
-    pass
-    gnome-keyring
-    seahorse
-    libsecret
-    gcr
-  ];
-  services.gnome-keyring.enable = true;
-}