unify desktop and shodan

home-manager/desktop/default.nix

@@ -150,7 +150,6 @@
       direnv
       git
       git-credential-manager
-      git-credential-manager
       ruff
       devtoolbox
 
@@ -203,7 +202,6 @@
 
       # Web browsing:
       firefoxpwa
-      firefoxpwa
       ungoogled-chromium
     ];
   };

home-manager/hosts/shodan/lillian.nix

@@ -12,13 +12,8 @@
     # You can also split up your configuration and import pieces of it here:
     # ./nvim.nix
 
-    ../../desktop/package-configs/plasma-desktop
-    ../../desktop/package-configs/firefox
-    ../../desktop/package-configs/konsole
-    ../../desktop/package-configs/foot
-    ../../desktop/package-configs/freetube
-    ../../desktop/package-configs/vesktop
     ../../shared
+    ../../desktop
   ];
   nixpkgs = {
     # You can add overlays here
@@ -33,93 +28,14 @@
       #   });
       # })
     ];
-    # Configure your nixpkgs instance
-    config = {
-      # Disable if you don't want unfree packages
-      allowUnfree = true;
-    };
-  };
-
-  home = {
-    username = "lillian";
-    homeDirectory = "/home/lillian";
   };
 
   home.packages = with pkgs; [
-    #Chat:
-    vesktop
-
     #Gaming:
-    # prismlauncher
+    prismlauncher
     r2modman
     ryubing
-
-    # Multimedia:
-    freetube
-    obs-studio
-    vlc
-    fcast-receiver
-    fcast-client
-
-    # System tools:
-    rage
-    flameshot
-    fzf
-    nextcloud-client
-    # nitrokey-app
-    # protonvpn-gui
-    sops
-    #watchmate
-    qbittorrent
-    zsh
-
-    # Theming:
-    catppuccin-cursors
-    (catppuccin-kde.override {
-      flavour = ["macchiato"];
-      accents = ["mauve"];
-    })
-    catppuccin-plymouth
-    catppuccin-sddm-corners
-
-    # Web browsing:
-    firefox
-    ungoogled-chromium
   ];
-  programs = {
-    # # Automount services for user
-    # programs.bashmount.enable = true;
-    # services.udiskie = {
-    #   enable = true;
-    #   automount = true;
-    #   notify = false;
-    #   tray = "never";
-    # };
-
-    # Enable home-manager and git
-    home-manager.enable = true;
-    git = {
-      enable = true;
-      settings = {
-        user = {
-          name = "Lillian-Violet";
-          email = "git@lillianviolet.dev";
-        };
-        init = {
-          defaultBranch = "main";
-        };
-      };
-      ignores = [
-        "*.direnv"
-        "*.vscode"
-        ".envrc"
-        "venv"
-        "venv"
-      ];
-      signing.format = "ssh";
-    };
-  };
-
   # Make the kde screenlock not require a password :)
   programs.plasma.kscreenlocker.passwordRequired = false;